fix Randomizer::getBytes(0) and other PR feedback

Author: divinity76

ext/random/randomizer.c

@@ -278,8 +278,8 @@ PHP_METHOD(Random_Randomizer, getBytes)
 		Z_PARAM_LONG(length)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (length < 1) {
-		zend_argument_value_error(1, "must be greater than 0");
+	if (length < 0) {
+		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -390,13 +390,13 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 	const size_t source_length = ZSTR_LEN(source);
 	const size_t max_offset = source_length - 1;
 
-	if (source_length < 1) {
-		zend_argument_value_error(1, "cannot be empty");
+	if (source_length < 1 && length > 0) {
+		zend_argument_value_error(1, "cannot be empty when argument #2 ($length) is greater than 0");
 		RETURN_THROWS();
 	}
 
-	if (length < 1) {
-		zend_argument_value_error(2, "must be greater than 0");
+	if (length < 0) {
+		zend_argument_value_error(2, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 

ext/random/tests/01_functions/random_bytes.phpt

@@ -4,6 +4,8 @@ Test normal operation of random_bytes()
 <?php
 //-=-=-=-
 
+var_dump(strlen(random_bytes(0)));
+
 var_dump(strlen(bin2hex(random_bytes(16))));
 
 var_dump(is_string(random_bytes(10)));
@@ -12,6 +14,7 @@ var_dump(is_string(random_bytes(257)));
 
 ?>
 --EXPECT--
+int(0)
 int(32)
 bool(true)
 bool(true)

ext/random/tests/01_functions/random_bytes_error.phpt

@@ -3,7 +3,7 @@ Test error operation of random_bytes()
 --FILE--
 <?php
 //-=-=-=-
-var_dump(random_bytes(0));
+
 try {
     $bytes = random_bytes();
 } catch (TypeError $e) {
@@ -18,6 +18,5 @@ try {
 
 ?>
 --EXPECT--
-string(0) ""
 random_bytes() expects exactly 1 argument, 0 given
 random_bytes(): Argument #1 ($length) must be greater than or equal to 0

ext/random/tests/03_randomizer/methods/getBytesFromString.phpt

@@ -27,6 +27,7 @@ foreach ($engines as $engine) {
     $randomizer = new Randomizer($engine);
     var_dump($randomizer->getBytesFromString('a', 10));
     var_dump($randomizer->getBytesFromString(str_repeat('a', 256), 5));
+    var_dump($randomizer->getBytesFromString('', 0));
 
     for ($i = 1; $i < 250; $i++) {
         $output = $randomizer->getBytesFromString(str_repeat('ab', $i), 500);
@@ -48,19 +49,25 @@ Deprecated: The MT_RAND_PHP variant of Mt19937 is deprecated in %s on line %d
 Random\Engine\Mt19937
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 Random\Engine\Mt19937
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 Random\Engine\PcgOneseq128XslRr64
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 Random\Engine\Xoshiro256StarStar
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 Random\Engine\Secure
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 Random\Engine\Test\TestShaEngine
 string(10) "aaaaaaaaaa"
 string(5) "aaaaa"
+string(0) ""
 success

ext/random/tests/03_randomizer/methods/getBytesFromString_error.phpt

@@ -17,12 +17,12 @@ try {
 }
 
 try {
-    var_dump(randomizer()->getBytesFromString("abc", 0));
+    var_dump(randomizer()->getBytesFromString("abc", -1));
 } catch (ValueError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 ?>
---EXPECTF--
-Random\Randomizer::getBytesFromString(): Argument #1 ($string) cannot be empty
-Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than 0
+--EXPECT--
+Random\Randomizer::getBytesFromString(): Argument #1 ($string) cannot be empty when argument #2 ($length) is greater than 0
+Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than or equal to 0