Chunk reorganizer fix

composer.json

@@ -3,7 +3,7 @@
   "description": "Collections library for php language",
   "minimum-stability": "dev",
   "license": "MIT",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "authors": [
     {
       "name": "Maxim Sokolovsky",

src/WS/Utils/Collections/Functions/Reorganizers.php

@@ -90,23 +90,14 @@ public static function random(int $count = 1): Closure
     public static function chunk(int $size): Closure
     {
         return static function (Collection $collection) use ($size): Collection {
-            $chunkCollection = self::collectionConstructor();
-            $currentChunk = self::collectionConstructor();
-            $pointer = $size;
-            $collection
-                ->stream()
-                ->each(static function ($el) use ($size, $chunkCollection, & $currentChunk, & $pointer) {
-                    $pointer--;
-                    $currentChunk->add($el);
-
-                    if ($pointer === 0) {
-                        $chunkCollection->add($currentChunk);
-                        $currentChunk = self::collectionConstructor();
-                        $pointer = $size;
-                    }
-                })
-            ;
-            return $chunkCollection;
+            $array = $collection->toArray();
+            $chunkedArray = array_chunk($array, $size);
+            $result = self::collectionConstructor();
+            foreach ($chunkedArray as $items) {
+                $result->add(self::collectionConstructor($items));
+            };
+
+            return $result;
         };
     }
 

tests/WS/Utils/Collections/ReorganizersFunctionsTest.php

@@ -33,6 +33,23 @@ public function chunking(): void
         $this->assertThat($chunkedCollection->stream()->findLast(), CollectionIsEqual::to([5, 6]));
     }
 
+    /**
+     * @test
+     * @return void
+     */
+    public function chunkingWhitTail(): void
+    {
+        $collection = self::toCollection(1, 2, 3, 4, 5);
+        $chunkedCollection = $collection
+            ->stream()
+            ->reorganize(Reorganizers::chunk(2))
+            ->getCollection()
+        ;
+        $this->assertEquals(3, $chunkedCollection->size());
+        $this->assertThat($chunkedCollection->stream()->findFirst(), CollectionIsEqual::to([1, 2]));
+        $this->assertThat($chunkedCollection->stream()->findLast(), CollectionIsEqual::to([5]));
+    }
+
     /**
      * @test
      */