fix(doctrine): use abitrary index instead of value (#5079)

api-platform · Oct 24, 2022 · 7044c5a · 7044c5a
1 parent 541b738
commit 7044c5a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/src/Doctrine/Orm/Filter/SearchFilter.php b/src/Doctrine/Orm/Filter/SearchFilter.php
@@ -179,7 +179,7 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
         $parameters = [];
         foreach ($values as $key => $value) {
             $keyValueParameter = sprintf('%s_%s', $valueParameter, $key);
-            $parameters[$caseSensitive ? $value : strtolower($value)] = $keyValueParameter;
+            $parameters[] = [$caseSensitive ? $value : strtolower($value), $keyValueParameter];
 
             $ors[] = match ($strategy) {
                 self::STRATEGY_PARTIAL => $queryBuilder->expr()->like(
@@ -209,7 +209,9 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
         }
 
         $queryBuilder->andWhere($queryBuilder->expr()->orX(...$ors));
-        array_walk($parameters, $queryBuilder->setParameter(...));
+        foreach ($parameters as $parameter) {
+            $queryBuilder->setParameter($parameter[1], $parameter[0]);
+        }
     }
 
     /**

diff --git a/tests/Doctrine/Common/Filter/SearchFilterTestTrait.php b/tests/Doctrine/Common/Filter/SearchFilterTestTrait.php
@@ -297,6 +297,18 @@ private function provideApplyTestArguments(): array
                     ],
                 ],
             ],
+            'partial (multiple almost same values; case insensitive)' => [
+                [
+                    'id' => null,
+                    'name' => 'ipartial',
+                ],
+                [
+                    'name' => [
+                        'blue car',
+                        'Blue Car',
+                    ],
+                ],
+            ],
             'start' => [
                 [
                     'id' => null,

diff --git a/tests/Doctrine/Odm/Filter/SearchFilterTest.php b/tests/Doctrine/Odm/Filter/SearchFilterTest.php
@@ -426,6 +426,21 @@ public function provideApplyTestData(): array
                     ],
                     $filterFactory,
                 ],
+                'partial (multiple almost same values; case insensitive)' => [
+                    [
+                        [
+                            '$match' => [
+                                'name' => [
+                                    '$in' => [
+                                        new Regex('blue car', 'i'),
+                                        new Regex('Blue Car', 'i'),
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                    $filterFactory,
+                ],
                 'start' => [
                     [
                         [

diff --git a/tests/Doctrine/Orm/Filter/SearchFilterTest.php b/tests/Doctrine/Orm/Filter/SearchFilterTest.php
@@ -352,6 +352,14 @@ public function provideApplyTestData(): array
                     ],
                     $filterFactory,
                 ],
+                'partial (multiple almost same values; case insensitive)' => [
+                    sprintf('SELECT %s FROM %s %1$s WHERE LOWER(%1$s.name) LIKE LOWER(CONCAT(\'%%\', :name_p1_0, \'%%\')) OR LOWER(%1$s.name) LIKE LOWER(CONCAT(\'%%\', :name_p1_1, \'%%\'))', $this->alias, Dummy::class),
+                    [
+                        'name_p1_0' => 'blue car',
+                        'name_p1_1' => 'blue car',
+                    ],
+                    $filterFactory,
+                ],
                 'start' => [
                     sprintf('SELECT %s FROM %s %1$s WHERE %1$s.name LIKE CONCAT(:name_p1_0, \'%%\')', $this->alias, Dummy::class),
                     ['name_p1_0' => 'partial'],