Fixed unexpected behavior for ElasticsearchEngine::getTotalCount() in hyperf/scout. (#3095)

* Fixed unexpected behavior for `ElasticsearchEngine::getTotalCount()` in `hyperf/scout`.

* Format code

Co-authored-by: 李铭昕 <[email protected]>

Author: PandaLIU-1111

src/Engine/ElasticsearchEngine.php

@@ -136,7 +136,7 @@ public function paginate(Builder $builder, $perPage, $page)
             'from' => (($page * $perPage) - $perPage),
             'size' => $perPage,
         ]);
-        $result['nbPages'] = $result['hits']['total'] / $perPage;
+        $result['nbPages'] = $this->getTotalCount($result) / $perPage;
         return $result;
     }
 
@@ -158,7 +158,7 @@ public function mapIds($results): BaseCollection
      */
     public function map(Builder $builder, $results, $model): Collection
     {
-        if ($results['hits']['total'] === 0) {
+        if ($this->getTotalCount($results) === 0) {
             return $model->newCollection();
         }
         $keys = collect($results['hits']['hits'])->pluck('_id')->values()->all();
@@ -177,7 +177,12 @@ public function map(Builder $builder, $results, $model): Collection
      */
     public function getTotalCount($results): int
     {
-        return $results['hits']['total'];
+        $total = $results['hits']['total'];
+        if (is_array($total)) {
+            return $results['hits']['total']['value'];
+        }
+
+        return $total;
     }
 
     /**

tests/Cases/ElasticsearchEngineTest.php

@@ -130,7 +130,7 @@ public function testMapCorrectlyMapsResultsToModels()
         $model->shouldReceive('newCollection')->andReturn($models);
         $results = $engine->map($builder, [
             'hits' => [
-                'total' => '1',
+                'total' => 1,
                 'hits' => [
                     [
                         '_id' => '1',
@@ -140,4 +140,23 @@ public function testMapCorrectlyMapsResultsToModels()
         ], $model);
         $this->assertEquals(1, count($results));
     }
+
+    public function testGetTotalCount()
+    {
+        $client = Mockery::mock('Elasticsearch\Client');
+        $engine = new ElasticsearchEngine($client, 'scout');
+        $this->assertSame(1, $engine->getTotalCount([
+            'hits' => [
+                'total' => 1,
+            ],
+        ]));
+        $this->assertSame(2, $engine->getTotalCount([
+            'hits' => [
+                'total' => [
+                    'value' => 2,
+                    'relation' => 'eq',
+                ],
+            ],
+        ]));
+    }
 }