Merge pull request laravel#372 from Redshift-Web-Design/7.0

[7.0] Calling values() on sorted collection to reset the array keys.
serpentblade · Apr 19, 2019 · 0eb2643 · 0eb2643
2 parents 72d6251 + 3cd8d23
commit 0eb2643
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Engines/AlgoliaEngine.php b/src/Engines/AlgoliaEngine.php
@@ -191,7 +191,7 @@ public function map(Builder $builder, $results, $model)
                 return in_array($model->getScoutKey(), $objectIds);
             })->sortBy(function($model) use ($objectIdPositions) {
                 return $objectIdPositions[$model->getScoutKey()];
-            });
+            })->values();
     }
 
     /**

diff --git a/tests/AlgoliaEngineTest.php b/tests/AlgoliaEngineTest.php
@@ -97,7 +97,15 @@ public function test_map_method_respects_order()
         ]], $model);
 
         $this->assertEquals(4, count($results));
-        $this->assertEquals([1, 2, 4, 3], $results->pluck('id')->all());
+
+        // It's important we assert with array keys to ensure
+        // they have been reset after sorting.
+        $this->assertEquals([
+            0 => ['id' => 1],
+            1 => ['id' => 2],
+            2 => ['id' => 4],
+            3 => ['id' => 3],
+        ], $results->toArray());
     }
 
     public function test_a_model_is_indexed_with_a_custom_algolia_key()