Skip to content

Commit 53ca24d

Browse files
TimWollakocsismate
andauthored
Improve phrasing in argument value errors in ext/random (php#9206)
This rephrases the error message for argument errors to be a proper English sentence. Co-authored-by: Máté Kocsis <[email protected]>
1 parent b3b21ed commit 53ca24d

6 files changed

+6
-6
lines changed

ext/random/engine_mt19937.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ PHP_METHOD(Random_Engine_Mt19937, __construct)
273273
state->mode = MT_RAND_PHP;
274274
break;
275275
default:
276-
zend_argument_value_error(2, "mode must be MT_RAND_MT19937 or MT_RAND_PHP");
276+
zend_argument_value_error(2, "must be either MT_RAND_MT19937 or MT_RAND_PHP");
277277
RETURN_THROWS();
278278
}
279279

ext/random/engine_pcgoneseq128xslrr64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, __construct)
165165
}
166166
seed128(engine->status, php_random_uint128_constant(t[0], t[1]));
167167
} else {
168-
zend_argument_value_error(1, "state strings must be 16 bytes");
168+
zend_argument_value_error(1, "must be a 16 byte (128 bit) string");
169169
RETURN_THROWS();
170170
}
171171
} else {

ext/random/engine_xoshiro256starstar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct)
225225
}
226226
seed256(engine->status, t[0], t[1], t[2], t[3]);
227227
} else {
228-
zend_argument_value_error(1, "state strings must be 32 bytes");
228+
zend_argument_value_error(1, "must be a 32 byte (256 bit) string");
229229
RETURN_THROWS();
230230
}
231231
} else {

ext/random/tests/02_engine/mt19937_error.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111

1212
?>
1313
--EXPECT--
14-
Random\Engine\Mt19937::__construct(): Argument #2 ($mode) mode must be MT_RAND_MT19937 or MT_RAND_PHP
14+
Random\Engine\Mt19937::__construct(): Argument #2 ($mode) must be either MT_RAND_MT19937 or MT_RAND_PHP

ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ for ($i = 0; $i < 1000; $i++) {
3030
?>
3131
--EXPECTF--
3232
Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) must be of type string|int|null, float given
33-
Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) state strings must be 16 bytes
33+
Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) must be a 16 byte (128 bit) string
3434
object(Random\Engine\PcgOneseq128XslRr64)#%d (%d) {
3535
["__states"]=>
3636
array(2) {

ext/random/tests/02_engine/xoshiro256starstar_seed.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ for ($i = 0; $i < 1000; $i++) {
3030
?>
3131
--EXPECTF--
3232
Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) must be of type string|int|null, float given
33-
Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) state strings must be 32 bytes
33+
Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) must be a 32 byte (256 bit) string
3434
object(Random\Engine\Xoshiro256StarStar)#%d (%d) {
3535
["__states"]=>
3636
array(4) {

0 commit comments

Comments
 (0)