Random Extension: Drop Random::nextInt()

Author: zeriyoshi

ext/random_ext/random_ext.c

@@ -645,15 +645,6 @@ PHP_METHOD(Random, getNumberGenerator)
 	RETURN_OBJ(Z_OBJ_P(zrng));
 }
 
-PHP_METHOD(Random, nextInt)
-{
-	php_random *random = Z_RANDOM_P(ZEND_THIS);
-
-	ZEND_PARSE_PARAMETERS_NONE();
-
-	RETURN_LONG((zend_long) php_random_next(random));
-}
-
 PHP_METHOD(Random, getInt)
 {
 	php_random *random = Z_RANDOM_P(ZEND_THIS);

ext/random_ext/random_ext.stub.php

@@ -58,7 +58,6 @@ final class Random
 
         public function __construct(?Random\NumberGenerator $rng = null) {}
         public function getNumberGenerator(): Random\NumberGenerator {}
-        public function nextInt(): int {}
         public function getInt(int $min, int $max): int {}
         public function getBytes(int $length): string {}
         public function shuffleArray(array $array): array {}

ext/random_ext/random_ext_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d5e46edb28ce2e3f864ff0fc30e95d3b778a9d06 */
+ * Stub hash: d5f5afc735100bce1a76f2a16522c5832a65b2f0 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Random_NumberGenerator_generate, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -37,8 +37,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Random_getNumberGenerator, 0, 0, Random\\NumberGenerator, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Random_nextInt arginfo_class_Random_NumberGenerator_generate
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Random_getInt, 0, 2, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, min, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, max, IS_LONG, 0)
@@ -68,7 +66,6 @@ ZEND_METHOD(Random_NumberGenerator_XorShift128Plus, __unserialize);
 ZEND_METHOD(Random_NumberGenerator_Secure, __construct);
 ZEND_METHOD(Random, __construct);
 ZEND_METHOD(Random, getNumberGenerator);
-ZEND_METHOD(Random, nextInt);
 ZEND_METHOD(Random, getInt);
 ZEND_METHOD(Random, getBytes);
 ZEND_METHOD(Random, shuffleArray);
@@ -111,7 +108,6 @@ static const zend_function_entry class_Random_NumberGenerator_Secure_methods[] =
 static const zend_function_entry class_Random_methods[] = {
 	ZEND_ME(Random, __construct, arginfo_class_Random___construct, ZEND_ACC_PUBLIC)
 	ZEND_ME(Random, getNumberGenerator, arginfo_class_Random_getNumberGenerator, ZEND_ACC_PUBLIC)
-	ZEND_ME(Random, nextInt, arginfo_class_Random_nextInt, ZEND_ACC_PUBLIC)
 	ZEND_ME(Random, getInt, arginfo_class_Random_getInt, ZEND_ACC_PUBLIC)
 	ZEND_ME(Random, getBytes, arginfo_class_Random_getBytes, ZEND_ACC_PUBLIC)
 	ZEND_ME(Random, shuffleArray, arginfo_class_Random_shuffleArray, ZEND_ACC_PUBLIC)

ext/random_ext/tests/methods.phpt

@@ -22,8 +22,8 @@ $rngs[] = new UserRNG();
 foreach ($rngs as $rng) {
     $instance = new Random($rng);
 
-    // nextInt
-    $instance->nextInt();
+    // getNumberGenerator
+    $instance->getNumberGenerator();
 
     // getInt
     for ($i = 0; $i < 100; $i++) {

ext/random_ext/tests/mt19937_compat.phpt

@@ -9,7 +9,7 @@ $random = new Random(new Random\NumberGenerator\MT19937($seed));
 
 for ($i = 0; $i < 20000; $i++) {
     $mt_rand_ret = mt_rand();
-    $random_ret = $random->nextInt() >> 1;
+    $random_ret = $random->getNumberGenerator()->generate() >> 1;
 
     if ($mt_rand_ret !== $random_ret) {
         die("failure: mt_rand_ret: ${mt_rand_ret} random_ret: ${random_ret} i: ${i}");

ext/random_ext/tests/serialize.phpt

@@ -26,10 +26,10 @@ $rngs[] = new UserRNG();
 foreach ($rngs as $rng) {
     $instance = new Random($rng);
 
-    $instance->nextInt();
+    $instance->getNumberGenerator()->generate();
     $clone_instance = unserialize(serialize($instance));
 
-    if ($instance->nextInt() !== $clone_instance->nextInt()) {
+    if ($instance->getNumberGenerator()->generate() !== $clone_instance->getNumberGenerator()->generate()) {
         die('failure: ' . $instnace->getNumberGenerator()::class);
     }
 }