Fix scout key not matched (#4)

zingimmick · Aug 11, 2021 · 2f216c5 · 2f216c5
1 parent 47eacc8
commit 2f216c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ecs.php b/ecs.php
@@ -6,6 +6,7 @@
 use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitInternalClassFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer;
+use PhpCsFixer\Fixer\Strict\StrictParamFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 use Zing\CodingStandard\Set\ECSSetList;
@@ -21,6 +22,7 @@
         PhpUnitInternalClassFixer::class,
         PhpUnitTestClassRequiresCoversFixer::class,
         NoSuperfluousPhpdocTagsFixer::class,
+        StrictParamFixer::class => [__DIR__ . '/src/Engines/OpenSearchEngine.php'],
     ]);
     $parameters->set(
         Option::PATHS,

diff --git a/src/Engines/OpenSearchEngine.php b/src/Engines/OpenSearchEngine.php
@@ -218,7 +218,7 @@ public function map(Builder $builder, $results, $model)
 
         return $model->getScoutModelsByIds($builder, $objectIds)
             ->filter(function ($model) use ($objectIds) {
-                return in_array($model->getScoutKey(), $objectIds, true);
+                return in_array($model->getScoutKey(), $objectIds);
             })->sortBy(function ($model) use ($objectIdPositions) {
                 return $objectIdPositions[$model->getScoutKey()];
             })->values();
@@ -249,7 +249,7 @@ public function lazyMap(Builder $builder, $results, $model)
         return $model->queryScoutModelsByIds($builder, $objectIds)
             ->cursor()
             ->filter(function ($model) use ($objectIds) {
-                return in_array($model->getScoutKey(), $objectIds, true);
+                return in_array($model->getScoutKey(), $objectIds);
             })->sortBy(function ($model) use ($objectIdPositions) {
                 return $objectIdPositions[$model->getScoutKey()];
             })->values();

diff --git a/tests/OpenSearchEngineTest.php b/tests/OpenSearchEngineTest.php
@@ -437,7 +437,7 @@ public function testSeachable(): void
         "items": [
             {
                 "fields": {
-                    "id": {$model->getKey()},
+                    "id": "{$model->getKey()}",
                     "name": "我是一条新<em>文档</em>的标题",
                     "phone": "18312345678",
                     "index_name": "app_schema_demo"