Merge branch 'fix-empty-collection-chunk' of https://github.com/jstoo…

…ne/framework into jstoone-fix-empty-collection-chunk
laravel · Nov 1, 2016 · 11d30ff · 11d30ff
2 parents 5a9c646 + 5e6de19
commit 11d30ff
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -955,6 +955,16 @@ public function split($numberOfGroups)
      */
     public function chunk($size)
     {
+        if ($size < 0) {
+            throw new InvalidArgumentException(
+                'Size parameter expected to be greater than 0'
+            );
+        }
+
+        if ($size == 0) {
+            return new static;
+        }
+
         $chunks = [];
 
         foreach (array_chunk($this->items, $size, true) as $chunk) {

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -682,6 +682,27 @@ public function testChunk()
         $this->assertEquals([9 => 10], $data[3]->toArray());
     }
 
+    public function testChunkWhenGivenZeroAsSize()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+
+        $this->assertEquals(
+            [],
+            $collection->chunk(0)->toArray()
+        );
+    }
+
+    public function testChunkWhenGivenLessThanZero()
+    {
+        $collection = new Collection([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->assertEquals(
+            [],
+            $collection->chunk(-1)->toArray()
+        );
+    }
+
     public function testEvery()
     {
         $data = new Collection([