Fixed array keys for map method

babenkoivan · babenkoivan · commit f6746d785658 · 2018-03-01T18:52:21.000+01:00
diff --git a/src/ElasticEngine.php b/src/ElasticEngine.php
@@ -218,7 +218,7 @@ public function map($results, $model)
             if (isset($models[$id])) {
                 return $models[$id];
             }
-        })->filter();
+        })->filter()->values();
     }
 
     public function getTotalCount($results)
diff --git a/tests/ElasticEngineTest.php b/tests/ElasticEngineTest.php
@@ -249,6 +249,7 @@ public function testMap()
         ];
 
         $model = $this->mockModel([
+            'key' => 2,
             'methods' => [
                 'whereIn',
                 'get',
@@ -267,7 +268,7 @@ public function testMap()
         $model
             ->method('keyBy')
             ->willReturn([
-                1 => $model
+                2 => $model
             ]);
 
         $this->assertEquals(

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public function map($results, $model)`
`218`	`218`	`if (isset($models[$id])) {`
`219`	`219`	`return $models[$id];`
`220`	`220`	`}`
`221`		`- })->filter();`
	`221`	`+ })->filter()->values();`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`public function getTotalCount($results)`