fix conflicts

Author: taylorotwell

src/Illuminate/Collections/Arr.php

@@ -633,32 +633,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.
      *
@@ -708,29 +707,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;
     }
 
     /**

src/Illuminate/Foundation/Application.php

@@ -38,7 +38,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '10.1.1';
+    const VERSION = '10.1.2';
 
     /**
      * The base path for the Laravel installation.

tests/Support/SupportArrTest.php

@@ -741,19 +741,6 @@ public function testRandom()
         $this->assertCount(2, array_intersect_assoc(['one' => 'foo', 'two' => 'bar', 'three' => 'baz'], $random));
     }
 
-    public function testRandomIsActuallyRandom()
-    {
-        $values = [];
-
-        for ($i = 0; $i < 100; $i++) {
-            $values[] = Arr::random(['foo', 'bar', 'baz']);
-        }
-
-        $this->assertContains('foo', $values);
-        $this->assertContains('bar', $values);
-        $this->assertContains('baz', $values);
-    }
-
     public function testRandomNotIncrementingKeys()
     {
         $random = Arr::random(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz']);
@@ -840,34 +827,10 @@ public function testSet()
 
     public function testShuffleWithSeed()
     {
-        $this->assertSame(
+        $this->assertEquals(
             Arr::shuffle(range(0, 100, 10), 1234),
             Arr::shuffle(range(0, 100, 10), 1234)
         );
-
-        $this->assertNotSame(
-            range(0, 100, 10),
-            Arr::shuffle(range(0, 100, 10), 1234)
-        );
-    }
-
-    public function testShuffle()
-    {
-        $source = range('a', 'z'); // alphabetic keys to ensure values are returned
-
-        $sameElements = true;
-        $dontMatch = false;
-
-        // Attempt 5x times to prevent random failures
-        for ($i = 0; $i < 5; $i++) {
-            $shuffled = Arr::shuffle($source);
-
-            $dontMatch = $dontMatch || $source !== $shuffled;
-            $sameElements = $sameElements && $source === array_values(Arr::sort($shuffled));
-        }
-
-        $this->assertTrue($sameElements, 'Shuffled array should always have the same elements.');
-        $this->assertTrue($dontMatch, 'Shuffled array should not have the same order.');
     }
 
     public function testEmptyShuffle()

tests/View/Blade/BladeEscapedTest.php

@@ -22,11 +22,13 @@ public function testNestedEscapes()
         $template = '
 @foreach($cols as $col)
     @@foreach($issues as $issue_45915)
+        👋 سلام 👋
     @@endforeach
 @endforeach';
         $compiled = '
 <?php $__currentLoopData = $cols; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $col): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
     @foreach($issues as $issue_45915)
+        👋 سلام 👋
     @endforeach
 <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>';
         $this->assertSame($compiled, $this->compiler->compileString($template));