revert random change

illuminate · Feb 22, 2023 · 23b6cb7 · 23b6cb7
1 parent 6607201
commit 23b6cb7
Showing 1 changed file with 16 additions and 31 deletions.
diff --git a/Arr.php b/Arr.php
@@ -635,32 +635,31 @@ public static function random($array, $number = null, $preserveKeys = false)
         }
 
         if (is_null($number)) {
-            return head(array_slice($array, random_int(0, $count - 1), 1));
+            return $array[array_rand($array)];
         }
 
         if ((int) $number === 0) {
             return [];
         }
 
-        $keys = array_keys($array);
-        $count = count($keys);
-        $selected = [];
+        $keys = array_rand($array, $number);
 
-        for ($i = $count - 1; $i >= $count - $number; $i--) {
-            $j = random_int(0, $i);
+        $results = [];
 
-            if ($preserveKeys) {
-                $selected[$keys[$j]] = $array[$keys[$j]];
-            } else {
-                $selected[] = $array[$keys[$j]];
+        if ($preserveKeys) {
+            foreach ((array) $keys as $key) {
+                $results[$key] = $array[$key];
+            }
+        } else {
+            foreach ((array) $keys as $key) {
+                $results[] = $array[$key];
             }
-
-            $keys[$j] = $keys[$i];
         }
 
-        return $selected;
+        return $results;
     }
 
+
     /**
      * Set an array item to a given value using "dot" notation.
      *
@@ -710,29 +709,15 @@ public static function set(&$array, $key, $value)
      */
     public static function shuffle($array, $seed = null)
     {
-        if (! is_null($seed)) {
+        if (is_null($seed)) {
+            shuffle($array);
+        } else {
             mt_srand($seed);
             shuffle($array);
             mt_srand();
-
-            return $array;
-        }
-
-        if (empty($array)) {
-            return [];
-        }
-
-        $keys = array_keys($array);
-
-        for ($i = count($keys) - 1; $i > 0; $i--) {
-            $j = random_int(0, $i);
-            $shuffled[] = $array[$keys[$j]];
-            $keys[$j] = $keys[$i];
         }
 
-        $shuffled[] = $array[$keys[0]];
-
-        return $shuffled;
+        return $array;
     }
 
     /**