Fix collection engine mapIds bug (#585)

laravel · Feb 15, 2022 · d50ed2f · d50ed2f
1 parent 5c1db4e
commit d50ed2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Engines/CollectionEngine.php b/src/Engines/CollectionEngine.php
@@ -164,10 +164,10 @@ protected function ensureSoftDeletesAreHandled($builder, $query)
      */
     public function mapIds($results)
     {
-        $results = $results['results'];
+        $results = array_values($results['results']);
 
         return count($results) > 0
-                    ? collect($results)->pluck($results[0]->getKeyName())->values()
+                    ? collect($results)->pluck($results[0]->getKeyName())
                     : collect();
     }
 

diff --git a/tests/Feature/CollectionEngineTest.php b/tests/Feature/CollectionEngineTest.php
@@ -101,6 +101,17 @@ public function test_it_can_paginate_results()
 
         $models = SearchableUserModel::search('laravel')->paginate();
         $this->assertCount(2, $models);
+
+        $dummyQuery = function ($query) {
+            $query->where('name', '!=', 'Dummy');
+        };
+        $models = SearchableUserModel::search('laravel')->query($dummyQuery)->orderBy('name')->paginate(1, 'page', 1);
+        $this->assertCount(1, $models);
+        $this->assertEquals('Abigail Otwell', $models[0]->name);
+
+        $models = SearchableUserModel::search('laravel')->query($dummyQuery)->orderBy('name')->paginate(1, 'page', 2);
+        $this->assertCount(1, $models);
+        $this->assertEquals('Taylor Otwell', $models[0]->name);
     }
 
     public function test_limit_is_applied()