SearchFilter: Fix unit tests

Author: jpierront

src/Bridge/Doctrine/Orm/Filter/SearchFilter.php

@@ -84,7 +84,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             [$alias, $field, $associations] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
         }
 
-        $values = $this->normalizeValues((array) $value, $property);
+        $values = $this->normalizeValues((array)$value, $property);
         if (null === $values) {
             return;
         }
@@ -112,7 +112,8 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
                 return;
             }
 
-            $this->addWhereByStrategy($strategy, $queryBuilder, $queryNameGenerator, $alias, $field, $doctrineTypeField, $values, $caseSensitive);
+            $valueParameter = $queryNameGenerator->generateParameterName($field);
+            $this->addWhereByStrategy($strategy, $queryBuilder, $queryNameGenerator, $alias, $field, $doctrineTypeField, $values, $caseSensitive, $valueParameter);
         }
 
         // metadata doesn't have the field, nor an association on the field
@@ -136,6 +137,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             return;
         }
 
+        $valueParameter = $queryNameGenerator->generateParameterName($field);
         if ($metadata->isCollectionValuedAssociation($field)) {
             $associationAlias = QueryBuilderHelper::addJoinOnce($queryBuilder, $queryNameGenerator, $alias, $field);
             $associationField = $associationFieldIdentifier;
@@ -144,18 +146,17 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             $associationField = $field;
         }
 
-        $this->addWhereByStrategy($strategy, $queryBuilder, $queryNameGenerator, $associationAlias, $associationField, $doctrineTypeField, $values, $caseSensitive);
+        $this->addWhereByStrategy($strategy, $queryBuilder, $queryNameGenerator, $associationAlias, $associationField, $doctrineTypeField, $values, $caseSensitive, $valueParameter);
     }
 
     /**
      * Adds where clause according to the strategy.
      *
      * @throws InvalidArgumentException If strategy does not exist
      */
-    protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, $fieldType, array $values, bool $caseSensitive)
+    protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, $fieldType, array $values, bool $caseSensitive, string $valueParameter)
     {
         $wrapCase = $this->createWrapCase($caseSensitive);
-        $valueParameter = $queryNameGenerator->generateParameterName($field);
 
         if (self::STRATEGY_EXACT !== $strategy && 1 !== \count($values)) {
             $this->logger->notice('Invalid filter ignored', [
@@ -174,28 +175,28 @@ protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuild
                         ->setParameter($valueParameter, $values[0], $fieldType);
                 } else {
                     $queryBuilder
-                        ->andWhere(sprintf($wrapCase('%s.%s').' IN (:%s)', $alias, $field, $valueParameter))
+                        ->andWhere(sprintf($wrapCase('%s.%s') . ' IN (:%s)', $alias, $field, $valueParameter))
                         ->setParameter($valueParameter, $caseSensitive ? $values : array_map('strtolower', $values));
                 }
                 break;
             case self::STRATEGY_PARTIAL:
                 $queryBuilder
-                    ->andWhere(sprintf($wrapCase('%s.%s').' LIKE '.$wrapCase('CONCAT(\'%%\', :%s, \'%%\')'), $alias, $field, $valueParameter))
+                    ->andWhere(sprintf($wrapCase('%s.%s') . ' LIKE ' . $wrapCase('CONCAT(\'%%\', :%s, \'%%\')'), $alias, $field, $valueParameter))
                     ->setParameter($valueParameter, $values[0], $fieldType);
                 break;
             case self::STRATEGY_START:
                 $queryBuilder
-                    ->andWhere(sprintf($wrapCase('%s.%s').' LIKE '.$wrapCase('CONCAT(:%s, \'%%\')'), $alias, $field, $valueParameter))
+                    ->andWhere(sprintf($wrapCase('%s.%s') . ' LIKE ' . $wrapCase('CONCAT(:%s, \'%%\')'), $alias, $field, $valueParameter))
                     ->setParameter($valueParameter, $values[0], $fieldType);
                 break;
             case self::STRATEGY_END:
                 $queryBuilder
-                    ->andWhere(sprintf($wrapCase('%s.%s').' LIKE '.$wrapCase('CONCAT(\'%%\', :%s)'), $alias, $field, $valueParameter))
+                    ->andWhere(sprintf($wrapCase('%s.%s') . ' LIKE ' . $wrapCase('CONCAT(\'%%\', :%s)'), $alias, $field, $valueParameter))
                     ->setParameter($valueParameter, $values[0], $fieldType);
                 break;
             case self::STRATEGY_WORD_START:
                 $queryBuilder
-                    ->andWhere(sprintf($wrapCase('%1$s.%2$s').' LIKE '.$wrapCase('CONCAT(:%3$s, \'%%\')').' OR '.$wrapCase('%1$s.%2$s').' LIKE '.$wrapCase('CONCAT(\'%% \', :%3$s, \'%%\')'), $alias, $field, $valueParameter))
+                    ->andWhere(sprintf($wrapCase('%1$s.%2$s') . ' LIKE ' . $wrapCase('CONCAT(:%3$s, \'%%\')') . ' OR ' . $wrapCase('%1$s.%2$s') . ' LIKE ' . $wrapCase('CONCAT(\'%% \', :%3$s, \'%%\')'), $alias, $field, $valueParameter))
                     ->setParameter($valueParameter, $values[0], $fieldType);
                 break;
             default:
@@ -244,7 +245,7 @@ protected function getType(string $doctrineType): string
                 return 'float';
         }
 
-        if (\defined(DBALType::class.'::DATE_IMMUTABLE')) {
+        if (\defined(DBALType::class . '::DATE_IMMUTABLE')) {
             switch ($doctrineType) {
                 case DBALType::DATE_IMMUTABLE:
                 case DBALType::TIME_IMMUTABLE: