Merge b206009 into 5fa9b56

api-platform · Dec 2, 2019 · a8e4257 · a8e4257
2 parents 5fa9b56 + b206009
commit a8e4257
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Filter/SearchFilter.php b/src/Bridge/Doctrine/Orm/Filter/SearchFilter.php
@@ -22,7 +22,6 @@
 use ApiPlatform\Core\Exception\InvalidArgumentException;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Types\Type as DBALType;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\QueryBuilder;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -85,17 +84,14 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             [$alias, $field, $associations] = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
         }
 
-        /**
-         * @var ClassMetadata
-         */
-        $metadata = $this->getNestedMetadata($resourceClass, $associations);
-
         $values = $this->normalizeValues((array) $value, $property);
         if (null === $values) {
             return;
         }
 
         $caseSensitive = true;
+        $metadata = $this->getNestedMetadata($resourceClass, $associations);
+
         if ($metadata->hasField($field)) {
             if ('id' === $field) {
                 $values = array_map([$this, 'getIdFromValue'], $values);