Enhancement: Use Helper to determine largest random number (#756)

FakerPHP · Sep 14, 2023 · b399ff3 · b399ff3
1 parent 51794a1
commit b399ff3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/Faker/Core/Number.php b/src/Faker/Core/Number.php
@@ -60,7 +60,7 @@ public function randomFloat(?int $nbMaxDecimals = null, float $min = 0, ?float $
             $max = $tmp;
         }
 
-        return round($min + $this->numberBetween() / mt_getrandmax() * ($max - $min), $nbMaxDecimals);
+        return round($min + $this->numberBetween() / Extension\Helper::largestRandomNumber() * ($max - $min), $nbMaxDecimals);
     }
 
     public function randomNumber(int $nbDigits = null, bool $strict = false): int
@@ -70,7 +70,7 @@ public function randomNumber(int $nbDigits = null, bool $strict = false): int
         }
         $max = 10 ** $nbDigits - 1;
 
-        if ($max > mt_getrandmax()) {
+        if ($max > Extension\Helper::largestRandomNumber()) {
             throw new \InvalidArgumentException('randomNumber() can only generate numbers up to mt_getrandmax()');
         }
 

diff --git a/src/Faker/Extension/Helper.php b/src/Faker/Extension/Helper.php
@@ -21,6 +21,11 @@ public static function randomElement(array $array)
         return $array[array_rand($array, 1)];
     }
 
+    public static function largestRandomNumber(): int
+    {
+        return mt_getrandmax();
+    }
+
     /**
      * Replaces all hash sign ('#') occurrences with a random number
      * Replaces all percentage sign ('%') occurrences with a non-zero number.
@@ -42,7 +47,7 @@ public static function numerify(string $string): string
         }
 
         if ($nbReplacements = count($toReplace)) {
-            $maxAtOnce = strlen((string) mt_getrandmax()) - 1;
+            $maxAtOnce = strlen((string) self::largestRandomNumber()) - 1;
             $numbers = '';
             $i = 0;
 

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
@@ -3,6 +3,7 @@
 namespace Faker\Provider;
 
 use Faker\DefaultGenerator;
+use Faker\Extension;
 use Faker\Generator;
 use Faker\UniqueGenerator;
 use Faker\ValidGenerator;
@@ -85,7 +86,7 @@ public static function randomNumber($nbDigits = null, $strict = false)
         }
         $max = 10 ** $nbDigits - 1;
 
-        if ($max > mt_getrandmax()) {
+        if ($max > Extension\Helper::largestRandomNumber()) {
             throw new \InvalidArgumentException('randomNumber() can only generate numbers up to mt_getrandmax()');
         }
 
@@ -127,7 +128,7 @@ public static function randomFloat($nbMaxDecimals = null, $min = 0, $max = null)
             $max = $tmp;
         }
 
-        return round($min + mt_rand() / mt_getrandmax() * ($max - $min), $nbMaxDecimals);
+        return round($min + mt_rand() / Extension\Helper::largestRandomNumber() * ($max - $min), $nbMaxDecimals);
     }
 
     /**
@@ -449,7 +450,7 @@ public static function numerify($string = '###')
         }
 
         if ($nbReplacements = count($toReplace)) {
-            $maxAtOnce = strlen((string) mt_getrandmax()) - 1;
+            $maxAtOnce = strlen((string) Extension\Helper::largestRandomNumber()) - 1;
             $numbers = '';
             $i = 0;
 
@@ -642,7 +643,7 @@ public function optional($weight = 0.5, $default = null)
     {
         // old system based on 0.1 <= $weight <= 0.9
         // TODO: remove in v2
-        if ($weight > 0 && $weight < 1 && mt_rand() / mt_getrandmax() <= $weight) {
+        if ($weight > 0 && $weight < 1 && mt_rand() / Extension\Helper::largestRandomNumber() <= $weight) {
             return $this->generator;
         }
 

diff --git a/src/Faker/Provider/Biased.php b/src/Faker/Provider/Biased.php
@@ -2,6 +2,8 @@
 
 namespace Faker\Provider;
 
+use Faker\Extension;
+
 class Biased extends Base
 {
     /**
@@ -23,8 +25,8 @@ class Biased extends Base
     public function biasedNumberBetween($min = 0, $max = 100, $function = 'sqrt')
     {
         do {
-            $x = mt_rand() / mt_getrandmax();
-            $y = mt_rand() / (mt_getrandmax() + 1);
+            $x = mt_rand() / Extension\Helper::largestRandomNumber();
+            $y = mt_rand() / (Extension\Helper::largestRandomNumber() + 1);
         } while (call_user_func($function, $x) < $y);
 
         return (int) floor($x * ($max - $min + 1) + $min);