Rename getBytesFromAlphabet to getBytesFromString

Author: joshuaruesweg

ext/random/random.stub.php

@@ -137,7 +137,7 @@ public function getInt(int $min, int $max): int {}
 
         public function getBytes(int $length): string {}
 
-        public function getBytesFromAlphabet(string $alphabet, int $length): string {}
+        public function getBytesFromString(string $alphabet, int $length): string {}
 
         public function shuffleArray(array $array): array {}
 

ext/random/random_arginfo.h

@@ -244,7 +244,7 @@ PHP_METHOD(Random_Randomizer, pickArrayKeys)
 /* }}} */
 
 /* {{{ Get Random Bytes for Alphabet */
-PHP_METHOD(Random_Randomizer, getBytesFromAlphabet)
+PHP_METHOD(Random_Randomizer, getBytesFromString)
 {
 	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	zend_long length;

ext/random/randomizer.c

@@ -50,13 +50,13 @@ try {
 }
 
 try {
-    var_dump(randomizer()->getBytesFromAlphabet('123', 10));
+    var_dump(randomizer()->getBytesFromString('123', 10));
 } catch (Random\BrokenRandomEngineError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
-    var_dump(randomizer()->getBytesFromAlphabet(str_repeat('a', 500), 10));
+    var_dump(randomizer()->getBytesFromString(str_repeat('a', 500), 10));
 } catch (Random\BrokenRandomEngineError $e) {
     echo $e->getMessage(), PHP_EOL;
 }

ext/random/tests/03_randomizer/engine_unsafe_biased.phpt

@@ -50,13 +50,13 @@ try {
 }
 
 try {
-    var_dump(randomizer()->getBytesFromAlphabet('123', 10));
+    var_dump(randomizer()->getBytesFromString('123', 10));
 } catch (Random\BrokenRandomEngineError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
-    var_dump(randomizer()->getBytesFromAlphabet(str_repeat('a', 500), 10));
+    var_dump(randomizer()->getBytesFromString(str_repeat('a', 500), 10));
 } catch (Random\BrokenRandomEngineError $e) {
     echo $e->getMessage(), PHP_EOL;
 }

ext/random/tests/03_randomizer/engine_unsafe_empty_string.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Random: Randomizer: getBytesFromAlphabet(): Basic functionality
+Random: Randomizer: getBytesFromString(): Basic functionality
 --FILE--
 <?php
 
@@ -25,11 +25,11 @@ foreach ($engines as $engine) {
     echo $engine::class, PHP_EOL;
 
     $randomizer = new Randomizer($engine);
-    var_dump($randomizer->getBytesFromAlphabet('a', 10));
-    var_dump($randomizer->getBytesFromAlphabet(str_repeat('a', 256), 5));
+    var_dump($randomizer->getBytesFromString('a', 10));
+    var_dump($randomizer->getBytesFromString(str_repeat('a', 256), 5));
 
     for ($i = 1; $i < 250; $i++) {
-        $output = $randomizer->getBytesFromAlphabet(str_repeat('ab', $i), 500);
+        $output = $randomizer->getBytesFromString(str_repeat('ab', $i), 500);
 
         // This check can theoretically fail with a chance of 0.5**500.
         if (!str_contains($output, 'a') || !str_contains($output, 'b')) {

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

@@ -0,0 +1,28 @@
+--TEST--
+Random: Randomizer: getBytesFromString(): Parameters are correctly validated
+--FILE--
+<?php
+
+use Random\Randomizer;
+
+function randomizer(): Randomizer
+{
+    return new Randomizer();
+}
+
+try {
+    var_dump(randomizer()->getBytesFromString("", 2));
+} catch (ValueError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump(randomizer()->getBytesFromString("abc", 0));
+} catch (ValueError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+Random\Randomizer::getBytesFromString(): Argument #1 ($alphabet) cannot be empty
+Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than 0