From 88f08714d8296f425e7425b377e318eb8adde001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 30 Jul 2022 16:26:12 +0200 Subject: [PATCH 1/3] [ci skip] Improve phrasing in argument value errors in ext/random This rephrases the error message for argument errors to be a proper English sentence. --- ext/random/engine_mt19937.c | 2 +- ext/random/engine_pcgoneseq128xslrr64.c | 2 +- ext/random/engine_xoshiro256starstar.c | 2 +- ext/random/tests/02_engine/mt19937_error.phpt | 2 +- ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt | 2 +- ext/random/tests/02_engine/xoshiro256starstar_seed.phpt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c index 602977a6adcdf..2b3b646c27d36 100644 --- a/ext/random/engine_mt19937.c +++ b/ext/random/engine_mt19937.c @@ -273,7 +273,7 @@ PHP_METHOD(Random_Engine_Mt19937, __construct) state->mode = MT_RAND_PHP; break; default: - zend_argument_value_error(2, "mode must be MT_RAND_MT19937 or MT_RAND_PHP"); + zend_argument_value_error(2, "must be MT_RAND_MT19937 or MT_RAND_PHP"); RETURN_THROWS(); } diff --git a/ext/random/engine_pcgoneseq128xslrr64.c b/ext/random/engine_pcgoneseq128xslrr64.c index 19030a7c12360..62ba65de76da5 100644 --- a/ext/random/engine_pcgoneseq128xslrr64.c +++ b/ext/random/engine_pcgoneseq128xslrr64.c @@ -165,7 +165,7 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, __construct) } seed128(engine->status, php_random_uint128_constant(t[0], t[1])); } else { - zend_argument_value_error(1, "state strings must be 16 bytes"); + zend_argument_value_error(1, "must be a 16 byte (128 bit) string"); RETURN_THROWS(); } } else { diff --git a/ext/random/engine_xoshiro256starstar.c b/ext/random/engine_xoshiro256starstar.c index 4d81239807563..f964146b2e68a 100644 --- a/ext/random/engine_xoshiro256starstar.c +++ b/ext/random/engine_xoshiro256starstar.c @@ -225,7 +225,7 @@ PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct) } seed256(engine->status, t[0], t[1], t[2], t[3]); } else { - zend_argument_value_error(1, "state strings must be 32 bytes"); + zend_argument_value_error(1, "must be a 32 byte (256 bit) string"); RETURN_THROWS(); } } else { diff --git a/ext/random/tests/02_engine/mt19937_error.phpt b/ext/random/tests/02_engine/mt19937_error.phpt index 0b9468b698dbf..83ee692e1aab4 100644 --- a/ext/random/tests/02_engine/mt19937_error.phpt +++ b/ext/random/tests/02_engine/mt19937_error.phpt @@ -11,4 +11,4 @@ try { ?> --EXPECT-- -Random\Engine\Mt19937::__construct(): Argument #2 ($mode) mode must be MT_RAND_MT19937 or MT_RAND_PHP +Random\Engine\Mt19937::__construct(): Argument #2 ($mode) must be MT_RAND_MT19937 or MT_RAND_PHP diff --git a/ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt b/ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt index 8b8c50d84c1c1..af5ea33f24d0b 100644 --- a/ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt +++ b/ext/random/tests/02_engine/pcgoneseq128xslrr64_seed.phpt @@ -30,7 +30,7 @@ for ($i = 0; $i < 1000; $i++) { ?> --EXPECTF-- Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) must be of type string|int|null, float given -Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) state strings must be 16 bytes +Random\Engine\PcgOneseq128XslRr64::__construct(): Argument #1 ($seed) must be a 16 byte (128 bit) string object(Random\Engine\PcgOneseq128XslRr64)#%d (%d) { ["__states"]=> array(2) { diff --git a/ext/random/tests/02_engine/xoshiro256starstar_seed.phpt b/ext/random/tests/02_engine/xoshiro256starstar_seed.phpt index b495ea008eee3..2bf107dd5da85 100644 --- a/ext/random/tests/02_engine/xoshiro256starstar_seed.phpt +++ b/ext/random/tests/02_engine/xoshiro256starstar_seed.phpt @@ -30,7 +30,7 @@ for ($i = 0; $i < 1000; $i++) { ?> --EXPECTF-- Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) must be of type string|int|null, float given -Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) state strings must be 32 bytes +Random\Engine\Xoshiro256StarStar::__construct(): Argument #1 ($seed) must be a 32 byte (256 bit) string object(Random\Engine\Xoshiro256StarStar)#%d (%d) { ["__states"]=> array(4) { From f405f012a8bff81c7b5debd6488e8156b35bab79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 30 Jul 2022 18:44:14 +0200 Subject: [PATCH 2/3] [ci skip] Improve phrasing for invalid $mode in Mt19937 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Máté Kocsis --- ext/random/engine_mt19937.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c index 2b3b646c27d36..609efae861b25 100644 --- a/ext/random/engine_mt19937.c +++ b/ext/random/engine_mt19937.c @@ -273,7 +273,7 @@ PHP_METHOD(Random_Engine_Mt19937, __construct) state->mode = MT_RAND_PHP; break; default: - zend_argument_value_error(2, "must be MT_RAND_MT19937 or MT_RAND_PHP"); + zend_argument_value_error(2, "must be either MT_RAND_MT19937 or MT_RAND_PHP"); RETURN_THROWS(); } From fd80122454c90a3ddd0c10eb1e2a2e9a8cdb085b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 30 Jul 2022 18:45:06 +0200 Subject: [PATCH 3/3] [ci skip] Fix test assertions --- ext/random/tests/02_engine/mt19937_error.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/random/tests/02_engine/mt19937_error.phpt b/ext/random/tests/02_engine/mt19937_error.phpt index 83ee692e1aab4..bdbea8df8d8e6 100644 --- a/ext/random/tests/02_engine/mt19937_error.phpt +++ b/ext/random/tests/02_engine/mt19937_error.phpt @@ -11,4 +11,4 @@ try { ?> --EXPECT-- -Random\Engine\Mt19937::__construct(): Argument #2 ($mode) must be MT_RAND_MT19937 or MT_RAND_PHP +Random\Engine\Mt19937::__construct(): Argument #2 ($mode) must be either MT_RAND_MT19937 or MT_RAND_PHP