Merge remote-tracking branch 'refs/remotes/origin/uuidbin-search' into uuidbin-search

Author: odoucet

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

@@ -20,7 +20,6 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryBuilderHelper;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\QueryBuilder;
@@ -139,7 +138,6 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
              * The only fix is to provide field type to doctrine ...
              * BUT it is not possible with setParameter(), as third arg can only be
              * \Doctrine\DBAL\Connection::PARAM_STR_ARRAY
-             *
              * The only way to do this will be to rewrite the IN() statement to multiple values,
              * each provided as a single setParameter()
              */
@@ -162,11 +160,6 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
                     $args[] = new Parameter($valueParameter, $caseSensitive ? $values[$i] : strtolower($values[$i]), $type);
                 }
 
-                // setParameters reset current parameters set, so we need to merge with getParameters()
-                $parameters = new ArrayCollection($args);
-                foreach ($queryBuilder->getParameters() as $p) {
-                    $parameters->add($p);
-                }
                 $queryBuilder
                     ->andWhere(sprintf($wrapCase('%s.%s').' IN (%s)', $alias, $field, implode(',', $inQuery)))
                     ->setParameters($parameters);
@@ -222,10 +215,10 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
      *
      * @throws InvalidArgumentException If strategy does not exist
      */
-    protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, $value, bool $caseSensitive)
+    protected function addWhereByStrategy(string $strategy, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $alias, string $field, $value, bool $caseSensitive, ClassMetadata $metadata = null)
     {
         // check if we have metadata
-        if (($metadata = func_get_arg(7)) instanceof ClassMetadata) {
+        if ($metadata instanceof ClassMetadata) {
             $type = $metadata->getTypeOfField($field);
         } else {
             @trigger_error('addWhereByStrategy() will require argument ClassMetadata in 3.0.', E_USER_DEPRECATED);