Merge branch 'PHP-8.2'

* PHP-8.2:
  Fix pre-PHP 8.2 compatibility for php_mt_rand_range() with MT_RAND_PHP (php#9839)

Author: TimWolla

ext/random/engine_mt19937.c

@@ -162,23 +162,7 @@ static uint64_t generate(php_random_status *status)
 
 static zend_long range(php_random_status *status, zend_long min, zend_long max)
 {
-	php_random_status_state_mt19937 *s = status->state;
-
-	if (s->mode == MT_RAND_MT19937) {
-		return php_random_range(&php_random_algo_mt19937, status, min, max);
-	}
-
-	/* Legacy mode deliberately not inside php_mt_rand_range()
-	 * to prevent other functions being affected */
-
-	uint64_t r = php_random_algo_mt19937.generate(status) >> 1;
-
-	/* This is an inlined version of the RAND_RANGE_BADSCALING macro that does not invoke UB when encountering
-	 * (max - min) > ZEND_LONG_MAX.
-	 */
-	zend_ulong offset = (double) ( (double) max - min + 1.0) * (r / (PHP_MT_RAND_MAX + 1.0));
-
-	return (zend_long) (offset + min);
+	return php_random_range(&php_random_algo_mt19937, status, min, max);
 }
 
 static bool serialize(php_random_status *status, HashTable *data)

ext/random/random.c

@@ -447,7 +447,21 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)
  * rand() allows min > max, mt_rand does not */
 PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
 {
-	return php_mt_rand_range(min, max);
+	php_random_status *status = php_random_default_status();
+	php_random_status_state_mt19937 *s = status->state;
+
+	if (s->mode == MT_RAND_MT19937) {
+		return php_mt_rand_range(min, max);
+	}
+
+	uint64_t r = php_random_algo_mt19937.generate(php_random_default_status()) >> 1;
+
+	/* This is an inlined version of the RAND_RANGE_BADSCALING macro that does not invoke UB when encountering
+	 * (max - min) > ZEND_LONG_MAX.
+	 */
+	zend_ulong offset = (double) ( (double) max - min + 1.0) * (r / (PHP_MT_RAND_MAX + 1.0));
+
+	return (zend_long) (offset + min);
 }
 /* }}} */
 

ext/random/randomizer.c

@@ -126,7 +126,22 @@ PHP_METHOD(Random_Randomizer, getInt)
 		RETURN_THROWS();
 	}
 
-	result = randomizer->algo->range(randomizer->status, min, max);
+	if (UNEXPECTED(
+		randomizer->algo->range == php_random_algo_mt19937.range
+		&& ((php_random_status_state_mt19937 *) randomizer->status->state)->mode != MT_RAND_MT19937
+	)) {
+		uint64_t r = php_random_algo_mt19937.generate(randomizer->status) >> 1;
+			
+		/* This is an inlined version of the RAND_RANGE_BADSCALING macro that does not invoke UB when encountering
+		 * (max - min) > ZEND_LONG_MAX.
+		 */
+		zend_ulong offset = (double) ( (double) max - min + 1.0) * (r / (PHP_MT_RAND_MAX + 1.0));
+
+		result = (zend_long) (offset + min);
+	} else {
+		result = randomizer->algo->range(randomizer->status, min, max);
+	}
+
 	if (EG(exception)) {
 		RETURN_THROWS();
 	}

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

@@ -0,0 +1,32 @@
+--TEST--
+array_rand() is not affected by MT_RAND_PHP as with PHP < 8.2
+--FILE--
+<?php
+
+$array = [
+    'foo',
+    'bar',
+    'baz',
+];
+
+mt_srand(1, MT_RAND_PHP);
+function custom_array_rand() {
+    global $array;
+    $key = array_rand($array);
+    var_dump('found key ' . $key);
+    return $array[$key];
+}
+
+var_dump(
+    custom_array_rand(),
+    custom_array_rand(),
+    custom_array_rand(),
+);
+?>
+--EXPECTF--
+string(11) "found key 0"
+string(11) "found key 1"
+string(11) "found key 0"
+string(3) "foo"
+string(3) "bar"
+string(3) "foo"