[5.4] Make Arr::random($array, 1) return an array of one item

src/Illuminate/Support/Arr.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Support;
 
 use ArrayAccess;
+use InvalidArgumentException;
 use Illuminate\Support\Traits\Macroable;
 
 class Arr
@@ -442,16 +443,26 @@ public static function pull(&$array, $key, $default = null)
      * Get a random value from an array.
      *
      * @param  array  $array
-     * @param  int    $num
+     * @param  int|null  $amount
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
-    public static function random($array, $num = 1)
+    public static function random($array, $amount = null)
     {
-        if ($num == 1) {
+        if (($requested = $amount ?: 1) > ($count = count($array))) {
+            throw new InvalidArgumentException("You requested {$requested} items, but there are only {$count} items in the array.");
+        }
+
+        if (is_null($amount)) {
             return $array[array_rand($array)];
         }
 
-        $keys = array_rand($array, $num);
+        $keys = array_rand($array, $amount);
+
+        if ($amount == 1) {
+            $keys = [$keys];
+        }
 
         $results = [];
 

src/Illuminate/Support/Collection.php

@@ -1077,21 +1077,17 @@ public function put($key, $value)
      *
      * @throws \InvalidArgumentException
      */
-    public function random($amount = 1)
+    public function random($amount = null)
     {
-        if ($amount > ($count = $this->count())) {
-            throw new InvalidArgumentException("You requested {$amount} items, but there are only {$count} items in the collection.");
+        if (($requested = $amount ?: 1) > ($count = $this->count())) {
+            throw new InvalidArgumentException("You requested {$requested} items, but there are only {$count} items in the collection.");
         }
 
-        $keys = array_rand($this->items, $amount);
-
-        if (count(func_get_args()) == 0) {
-            return $this->items[$keys];
+        if (is_null($amount)) {
+            return Arr::random($this->items);
         }
 
-        $keys = array_wrap($keys);
-
-        return new static(array_intersect_key($this->items, array_flip($keys)));
+        return new static(Arr::random($this->items, $amount));
     }
 
     /**

src/Illuminate/Support/helpers.php

@@ -250,10 +250,10 @@ function array_pull(&$array, $key, $default = null)
      * Get a random value from an array.
      *
      * @param  array  $array
-     * @param  int    $num
+     * @param  int|null  $num
      * @return mixed
      */
-    function array_random($array, $num = 1)
+    function array_random($array, $num = null)
     {
         return Arr::random($array, $num);
     }

tests/Support/SupportArrTest.php

@@ -405,6 +405,12 @@ public function testRandom()
 
         $this->assertContains($randomValue, ['foo', 'bar', 'baz']);
 
+        $randomValues = Arr::random(['foo', 'bar', 'baz'], 1);
+
+        $this->assertInternalType('array', $randomValues);
+        $this->assertCount(1, $randomValues);
+        $this->assertContains($randomValues[0], ['foo', 'bar', 'baz']);
+
         $randomValues = Arr::random(['foo', 'bar', 'baz'], 2);
 
         $this->assertInternalType('array', $randomValues);