Random Extension 5.x follow-up

EXTENSIONS

@@ -430,6 +430,7 @@ PRIMARY MAINTAINER   Go Kudo <zeriyoshi@gmail.com> (2022 - 2022)
                      Tim Düsterhus <timwolla@php.net> (2022 - 2022)
 MAINTENANCE:         Maintained
 STATUS:              Working
+SINCE:               8.2.0
 -------------------------------------------------------------------------------
 EXTENSION:           readline
 PRIMARY MAINTAINER:  Unknown

UPGRADING.INTERNALS

@@ -51,6 +51,14 @@ PHP 8.2 INTERNALS UPGRADE NOTES
   are deprecated (see main UPGRADING notes). To suppress the notice, e.g. to
   avoid duplicates when processing the same value multiple times, pass or add
   IS_CALLABLE_SUPPRESS_DEPRECATIONS to the check_flags parameter.
+* php_lcg.h, php_rand.h, php_mt_rand.h and php_random.h has already removed in 
+  ext/standard, They have been merged into a single ext/random/php_random.h 
+  header file. If you are using them in an extension, change the headers to read as follows
+  #if PHP_VERSION_ID < 80200
+  # include "ext/standard/php_XYZ.h"
+  #else
+  # include "ext/random/php_random.h"
+  #endif
 
 ========================
 2. Build system changes

ext/random/random.stub.php

@@ -120,7 +120,9 @@ final class Randomizer
 
         public function __construct(?Engine $engine = null) {}
 
-        public function getInt(int $min = UNKNOWN, int $max = UNKNOWN): int {}
+        public function nextInt(): int {}
+
+        public function getInt(int $min, int $max): int {}
 
         public function getBytes(int $length): string {}
 

ext/random/randomizer.c

@@ -86,26 +86,34 @@ PHP_METHOD(Random_Randomizer, __construct)
 }
 /* }}} */
 
-/* {{{ Generate random number in range */
-PHP_METHOD(Random_Randomizer, getInt)
+/* {{{ Generate random number */
+PHP_METHOD(Random_Randomizer, nextInt)
 {
 	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	uint64_t result;
-	zend_long min, max;
-	int argc = ZEND_NUM_ARGS();
 
-	if (argc == 0) {
-		result = randomizer->algo->generate(randomizer->status);
-		if (randomizer->status->last_generated_size > sizeof(zend_long)) {
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	result = randomizer->algo->generate(randomizer->status);
+	if (randomizer->status->last_generated_size > sizeof(zend_long)) {
 			zend_throw_exception(spl_ce_RuntimeException, "Generated value exceeds size of int", 0);
 			RETURN_THROWS();
-		}
-		if (randomizer->status->last_unsafe) {
-			zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
-			RETURN_THROWS();
-		}
-		RETURN_LONG((zend_long) (result >> 1));
 	}
+	if (randomizer->status->last_unsafe) {
+		zend_throw_exception(spl_ce_RuntimeException, "Random number generation failed", 0);
+		RETURN_THROWS();
+	}
+
+	RETURN_LONG((zend_long) (result >> 1));
+}
+/* }}} */
+
+/* {{{ Generate random number in range */
+PHP_METHOD(Random_Randomizer, getInt)
+{
+	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	uint64_t result;
+	zend_long min, max;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(min)

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

@@ -27,6 +27,19 @@ $engines[] = new UserEngine();
 foreach ($engines as $engine) {
     $randomizer = new Random\Randomizer($engine);
 
+    // nextInt
+    for ($i = 0; $i < 1000; $i++) {
+        try {
+            if (!\is_int($randomizer->nextInt())) {
+                die($engine::class . ': nextInt: failure');
+            }
+        } catch (\RuntimeException $e) {
+            if ($e->getMessage() !== 'Generated value exceeds size of int') {
+                throw $e;
+            }
+        }
+    }
+
     // getInt
     for ($i = 0; $i < 1000; $i++) {
         $result = $randomizer->getInt(-50, 50);

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

@@ -6,15 +6,15 @@ Random: Randomizer: Compatibility: Mt19937
 $randomizer = new \Random\Randomizer(new \Random\Engine\Mt19937(1234, \MT_RAND_PHP));
 \mt_srand(1234, \MT_RAND_PHP);
 for ($i = 0; $i < 1000; $i++) {
-    if ($randomizer->getInt() !== \mt_rand()) {
+    if ($randomizer->nextInt() !== \mt_rand()) {
         die('failure');
     }
 }
 
 $randomizer = new \Random\Randomizer(new \Random\Engine\Mt19937(1234, \MT_RAND_MT19937));
 \mt_srand(1234, \MT_RAND_MT19937);
 for ($i = 0; $i < 1000; $i++) {
-    if ($randomizer->getInt() !== \mt_rand()) {
+    if ($randomizer->nextInt() !== \mt_rand()) {
         die('failure');
     }
 }

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

@@ -15,8 +15,8 @@ $user_randomizer = new \Random\Randomizer(new class () implements \Random\Engine
     }
 });
 for ($i = 0; $i < 1000; $i++) {
-    $native = $native_randomizer->getInt();
-    $user = $user_randomizer->getInt();
+    $native = $native_randomizer->nextInt();
+    $user = $user_randomizer->nextInt();
     if ($native !== $user) {
         die("failure Mt19937 i: {$i} native: {$native} user: {$user}");
     }
@@ -36,8 +36,8 @@ try {
     });
 
     for ($i = 0; $i < 1000; $i++) {
-        $native = $native_randomizer->getInt();
-        $user = $user_randomizer->getInt();
+        $native = $native_randomizer->nextInt();
+        $user = $user_randomizer->nextInt();
         if ($native !== $user) {
             die("failure PcgOneseq128XslRr64 i: {$i} native: {$native} user: {$user}");
         }
@@ -65,8 +65,8 @@ try {
     });
 
     for ($i = 0; $i < 1000; $i++) {
-        $native = $native_randomizer->getInt();
-        $user = $user_randomizer->getInt();
+        $native = $native_randomizer->nextInt();
+        $user = $user_randomizer->nextInt();
         if ($native !== $user) {
             die("failure Xoshiro256StarStar i: {$i} native: {$native} user: {$user}");
         }