Add preserve keys option to the partition method in the collection class

laravel · Dec 3, 2016 · 539d044 · 539d044
1 parent b74eee4
commit 539d044
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -729,16 +729,17 @@ public function forPage($page, $perPage)
      * Partition the collection into two arrays using the given callback or key.
      *
      * @param  callable|string  $callback
+     * @param  bool  $preserveKeys
      * @return array
      */
-    public function partition($callback)
+    public function partition($callback, $preserveKeys = false)
     {
         $partitions = [new static(), new static()];
 
         $callback = $this->valueRetriever($callback);
 
-        foreach ($this->items as $item) {
-            $partitions[(int) ! $callback($item)][] = $item;
+        foreach ($this->items as $key => $item) {
+            $partitions[(int) ! $callback($item)][$preserveKeys ? $key : null] = $item;
         }
 
         return $partitions;

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -1655,8 +1655,7 @@ public function testPartitionWithClosure()
     public function testPartitionByKey()
     {
         $courses = new Collection([
-            ['free' => true, 'title' => 'Basic'],
-            ['free' => false, 'title' => 'Premium']
+            ['free' => true, 'title' => 'Basic'], ['free' => false, 'title' => 'Premium'],
         ]);
 
         list($free, $premium) = $courses->partition('free');
@@ -1666,6 +1665,19 @@ public function testPartitionByKey()
         $this->assertSame($premium->toArray(), [['free' => false, 'title' => 'Premium']]);
     }
 
+    public function testPartitionPreservingKeys()
+    {
+        $courses = new Collection([
+            'a' => ['free' => true], 'b' => ['free' => false], 'c' => ['free' => true],
+        ]);
+
+        list($free, $premium) = $courses->partition('free', true);
+
+        $this->assertSame($free->toArray(), ['a' => ['free' => true], 'c' => ['free' => true]]);
+
+        $this->assertSame($premium->toArray(), ['b' => ['free' => false]]);
+    }
+
     public function testPartitionEmptyCollection()
     {
         $collection = new Collection();