[5.4] Support amount 0 in Arr::random()

src/Illuminate/Support/Arr.php

@@ -454,7 +454,7 @@ public static function pull(&$array, $key, $default = null)
     }
 
     /**
-     * Get a random value from an array.
+     * Get one or a specified number of random values from an array.
      *
      * @param  array  $array
      * @param  int|null  $amount
@@ -464,16 +464,24 @@ public static function pull(&$array, $key, $default = null)
      */
     public static function random($array, $amount = null)
     {
-        if (($requested = $amount ?: 1) > ($count = count($array))) {
+        $requested = is_null($amount) ? 1 : $amount;
+
+        $count = count($array);
+
+        if ($requested > $count) {
             throw new InvalidArgumentException(
-                "You requested {$requested} items, but there are only {$count} items in the array."
+                "You requested {$requested} items, but there are only {$count} items available."
             );
         }
 
         if (is_null($amount)) {
             return $array[array_rand($array)];
         }
 
+        if ((int) $amount === 0) {
+            return [];
+        }
+
         $keys = array_rand($array, $amount);
 
         $results = [];

src/Illuminate/Support/Collection.php

@@ -10,7 +10,6 @@
 use CachingIterator;
 use JsonSerializable;
 use IteratorAggregate;
-use InvalidArgumentException;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
@@ -1070,7 +1069,7 @@ public function put($key, $value)
     }
 
     /**
-     * Get zero or more items randomly from the collection.
+     * Get one or a specified number of items randomly from the collection.
      *
      * @param  int|null  $amount
      * @return mixed
@@ -1079,16 +1078,6 @@ public function put($key, $value)
      */
     public function random($amount = null)
     {
-        if ($amount === 0) {
-            return new static;
-        }
-
-        if (($requested = $amount ?: 1) > ($count = $this->count())) {
-            throw new InvalidArgumentException(
-                "You requested {$requested} items, but there are only {$count} items in the collection."
-            );
-        }
-
         if (is_null($amount)) {
             return Arr::random($this->items);
         }

tests/Support/SupportArrTest.php

@@ -421,22 +421,74 @@ public function testPull()
 
     public function testRandom()
     {
-        $randomValue = Arr::random(['foo', 'bar', 'baz']);
-
-        $this->assertContains($randomValue, ['foo', 'bar', 'baz']);
-
-        $randomValues = Arr::random(['foo', 'bar', 'baz'], 1);
+        $random = Arr::random(['foo', 'bar', 'baz']);
+        $this->assertContains($random, ['foo', 'bar', 'baz']);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], 0);
+        $this->assertInternalType('array', $random);
+        $this->assertCount(0, $random);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], 1);
+        $this->assertInternalType('array', $random);
+        $this->assertCount(1, $random);
+        $this->assertContains($random[0], ['foo', 'bar', 'baz']);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], 2);
+        $this->assertInternalType('array', $random);
+        $this->assertCount(2, $random);
+        $this->assertContains($random[0], ['foo', 'bar', 'baz']);
+        $this->assertContains($random[1], ['foo', 'bar', 'baz']);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], '0');
+        $this->assertInternalType('array', $random);
+        $this->assertCount(0, $random);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], '1');
+        $this->assertInternalType('array', $random);
+        $this->assertCount(1, $random);
+        $this->assertContains($random[0], ['foo', 'bar', 'baz']);
+
+        $random = Arr::random(['foo', 'bar', 'baz'], '2');
+        $this->assertInternalType('array', $random);
+        $this->assertCount(2, $random);
+        $this->assertContains($random[0], ['foo', 'bar', 'baz']);
+        $this->assertContains($random[1], ['foo', 'bar', 'baz']);
+    }
 
-        $this->assertInternalType('array', $randomValues);
-        $this->assertCount(1, $randomValues);
-        $this->assertContains($randomValues[0], ['foo', 'bar', 'baz']);
+    public function testRandomOnEmptyArray()
+    {
+        $random = Arr::random([], 0);
+        $this->assertInternalType('array', $random);
+        $this->assertCount(0, $random);
 
-        $randomValues = Arr::random(['foo', 'bar', 'baz'], 2);
+        $random = Arr::random([], '0');
+        $this->assertInternalType('array', $random);
+        $this->assertCount(0, $random);
+    }
 
-        $this->assertInternalType('array', $randomValues);
-        $this->assertCount(2, $randomValues);
-        $this->assertContains($randomValues[0], ['foo', 'bar', 'baz']);
-        $this->assertContains($randomValues[1], ['foo', 'bar', 'baz']);
+    public function testRandomThrowsAnErrorWhenRequestingMoreItemsThanAreAvailable()
+    {
+        $exceptions = 0;
+
+        try {
+            Arr::random([]);
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        try {
+            Arr::random([], 1);
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        try {
+            Arr::random([], 2);
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        $this->assertSame(3, $exceptions);
     }
 
     public function testSet()

tests/Support/SupportCollectionTest.php

@@ -911,6 +911,10 @@ public function testRandom()
     {
         $data = new Collection([1, 2, 3, 4, 5, 6]);
 
+        $random = $data->random();
+        $this->assertInternalType('integer', $random);
+        $this->assertContains($random, $data->all());
+
         $random = $data->random(0);
         $this->assertInstanceOf(Collection::class, $random);
         $this->assertCount(0, $random);
@@ -919,9 +923,21 @@ public function testRandom()
         $this->assertInstanceOf(Collection::class, $random);
         $this->assertCount(1, $random);
 
-        $random = $data->random(3);
+        $random = $data->random(2);
+        $this->assertInstanceOf(Collection::class, $random);
+        $this->assertCount(2, $random);
+
+        $random = $data->random('0');
+        $this->assertInstanceOf(Collection::class, $random);
+        $this->assertCount(0, $random);
+
+        $random = $data->random('1');
+        $this->assertInstanceOf(Collection::class, $random);
+        $this->assertCount(1, $random);
+
+        $random = $data->random('2');
         $this->assertInstanceOf(Collection::class, $random);
-        $this->assertCount(3, $random);
+        $this->assertCount(2, $random);
     }
 
     public function testRandomOnEmptyCollection()
@@ -931,23 +947,36 @@ public function testRandomOnEmptyCollection()
         $random = $data->random(0);
         $this->assertInstanceOf(Collection::class, $random);
         $this->assertCount(0, $random);
-    }
-
-    public function testRandomWithoutArgument()
-    {
-        $data = new Collection([1, 2, 3, 4, 5, 6]);
 
-        $random = $data->random();
-        $this->assertInternalType('integer', $random);
-        $this->assertContains($random, $data->all());
+        $random = $data->random('0');
+        $this->assertInstanceOf(Collection::class, $random);
+        $this->assertCount(0, $random);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testRandomThrowsAnErrorWhenRequestingMoreItemsThanAreAvailable()
     {
-        (new Collection)->random();
+        $data = new Collection();
+        $exceptions = 0;
+
+        try {
+            $data->random();
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        try {
+            $data->random(1);
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        try {
+            $data->random(2);
+        } catch (\InvalidArgumentException $e) {
+            ++$exceptions;
+        }
+
+        $this->assertSame(3, $exceptions);
     }
 
     public function testTakeLast()