Merge pull request #2071 from dunglas/phpstan

dunglas · web-flow · commit a2bb3bf0c49a · 2018-07-05T17:36:27.000+02:00
Upgrade PHPStan to 0.10 and fix new violations
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -110,7 +110,7 @@ jobs:
       - *update-project-dependencies
       - run:
           name: Install PHPStan
-          command: composer global require phpstan/phpstan:^0.8
+          command: composer global require phpstan/phpstan:^0.10
       - *save-composer-cache-by-revision
       - *save-composer-cache-by-branch
       - run:
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,16 +3,35 @@ parameters:
         - tests/Fixtures/app/AppKernel.php
     excludes_analyse:
         - tests/Fixtures/app/cache
+        # The Symfony Configuration API isn't good enough to be analysed
+        - src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php
     ignoreErrors:
-        - '#Call to an undefined method Symfony\\Component\\Routing\\Exception\\ExceptionInterface::getCode\(\)#'
-        - '#Call to an undefined method Prophecy\\Prophecy\\ObjectProphecy::[a-zA-Z0-9_]+\(\)#'
-        - '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy::\$[a-zA-Z0-9_]+#'
-        - '#Call to an undefined method PHPUnit\\Framework\\MockObject\\MockObject::[a-zA-Z0-9_]+\(\)#'
-        - '#Call to an undefined method Doctrine\\Common\\Persistence\\Mapping\\ClassMetadata::getAssociationMappings\(\)#'
+        # Real problems, hard to fix
+        - '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects array\|object, string given\.#'
 
         # False positives
+        - '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy::\$[a-zA-Z0-9_]+#'
+        - '#Access to an undefined property object::\$isIdentifierComposite.#'
         - '#Call to an undefined method Doctrine\\Common\\Persistence\\ObjectManager::getConnection\(\)#'
-        - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::supportsResult\(\) invoked with 3 parameters, 1-2 required\.#'
+        - '#Call to an undefined method PHPUnit\\Framework\\MockObject\\MockObject::[a-zA-Z0-9_]+\(\)#'
+        - '#Call to an undefined method Prophecy\\Prophecy\\ObjectProphecy::[a-zA-Z0-9_]+\(\)#'
+        - '#Method ApiPlatform\\Core\\Tests\\Bridge\\Doctrine\\Orm\\ItemDataProviderTest::getManagerRegistry\(\) should return Doctrine\\Common\\Persistence\\ManagerRegistry but returns object\.#'
+        - '#Method ApiPlatform\\Core\\Tests\\Bridge\\Doctrine\\Util\\IdentifierManagerTraitTest::getObjectManager\(\) should return Doctrine\\Common\\Persistence\\ObjectManager but returns object\.#'
+        # Temporary fix while the PHPStan extension for Prophecy isn't compatible with 0.10
+        - '#Parameter .* expects .*, .*object.* given\.#'
+        - '#Parameter \#[0-9] \$filterLocator of class ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\FilterExtension constructor expects ApiPlatform\\Core\\Api\\FilterCollection|Psr\\Container\\ContainerInterface(\|null)?, ArrayObject given\.#'
+        - '#Property ApiPlatform\\Core\\Test\\DoctrineOrmFilterTestCase::\$managerRegistry \(Doctrine\\Common\\Persistence\\ManagerRegistry\) does not accept object\.#'
+        - '#Property ApiPlatform\\Core\\Test\\DoctrineOrmFilterTestCase::\$repository \(Doctrine\\ORM\\EntityRepository\) does not accept Doctrine\\Common\\Persistence\\ObjectRepository\.#'
+        # https://github.com/doctrine/doctrine2/pull/7298/files
+        - '#Strict comparison using === between null and int will always evaluate to false\.#'
+        - '#Strict comparison using !== between null and null will always evaluate to false\.#'
+
+        # Expected, due to deprecations
         - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::getResult\(\) invoked with 4 parameters, 1 required\.#'
+        - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\QueryResult(Item|Collection)ExtensionInterface::supportsResult\(\) invoked with 3 parameters, 1-2 required\.#'
+        - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\AbstractFilter::apply\(\) invoked with 5 parameters, 3-4 required\.#'
         - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\AbstractFilter::filterProperty\(\) invoked with 7 parameters, 5-6 required\.#'
+        - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\FilterInterface::apply\(\) invoked with 5 parameters, 3-4 required\.#'
         - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Filter\\OrderFilter::filterProperty\(\) invoked with 7 parameters, 5-6 required\.#'
+        - '#Method ApiPlatform\\Core\\DataProvider\\CollectionDataProviderInterface::getCollection\(\) invoked with 3 parameters, 1-2 required.#'
+        - '#PHPDoc tag @param references unknown parameter \$operationName#'
diff --git a/src/Annotation/ApiFilter.php b/src/Annotation/ApiFilter.php
@@ -53,11 +53,11 @@ final class ApiFilter
 
     public function __construct($options = [])
     {
-        if (!isset($options['value'])) {
+        if (!\is_string($options['value'] ?? null)) {
             throw new InvalidArgumentException('This annotation needs a value representing the filter class.');
         }
 
-        if (!is_subclass_of($options['value'], FilterInterface::class)) {
+        if (!is_a($options['value'], FilterInterface::class, true)) {
             throw new InvalidArgumentException(sprintf('The filter class "%s" does not implement "%s".', $options['value'], FilterInterface::class));
         }
 
diff --git a/src/Api/ResourceClassResolver.php b/src/Api/ResourceClassResolver.php
@@ -51,7 +51,7 @@ public function getResourceClass($value, string $resourceClass = null, bool $str
             $typeToFind = $type = $resourceClass;
         }
 
-        if (($strict && isset($type) && $resourceClass !== $type) || false === $isResourceClass = $this->isResourceClass($typeToFind)) {
+        if (($strict && $resourceClass !== $type) || false === $isResourceClass = $this->isResourceClass($typeToFind)) {
             if (is_subclass_of($type, $resourceClass) && $this->isResourceClass($resourceClass)) {
                 return $type;
             }
diff --git a/src/Bridge/Doctrine/Orm/Extension/FilterExtension.php b/src/Bridge/Doctrine/Orm/Extension/FilterExtension.php
@@ -61,13 +61,11 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         }
 
         foreach ($resourceFilters as $filterId) {
-            if (!($filter = $this->getFilter($filterId)) instanceof FilterInterface) {
-                continue;
+            $filter = $this->getFilter($filterId);
+            if ($filter instanceof FilterInterface) {
+                $context['filters'] = $context['filters'] ?? [];
+                $filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
             }
-
-            $context['filters'] = $context['filters'] ?? [];
-
-            $filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
         }
     }
 }
diff --git a/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php b/src/Bridge/Doctrine/Orm/Extension/OrderExtension.php
@@ -60,8 +60,8 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
                         $order = 'ASC';
                     }
 
-                    if (false === ($pos = \strpos($field, '.'))
-                        || isset($classMetaData->embeddedClasses[\substr($field, 0, $pos)])) {
+                    $pos = strpos($field, '.');
+                    if (false === $pos || isset($classMetaData->embeddedClasses[\substr($field, 0, $pos)])) {
                         // Configure default filter with property
                         $field = "{$rootAlias}.{$field}";
                     } else {
diff --git a/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php b/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php
@@ -164,7 +164,8 @@ protected function isPropertyNested(string $property/*, string $resourceClass*/)
             $resourceClass = null;
         }
 
-        if (false === $pos = strpos($property, '.')) {
+        $pos = strpos($property, '.');
+        if (false === $pos) {
             return false;
         }
 
diff --git a/src/Bridge/Doctrine/Orm/Util/IdentifierManagerTrait.php b/src/Bridge/Doctrine/Orm/Util/IdentifierManagerTrait.php
@@ -49,7 +49,7 @@ private function normalizeIdentifiers($id, ObjectManager $manager, string $resou
             $identifiersMap = [];
 
             // first transform identifiers to a proper key/value array
-            foreach (explode(';', $id) as $identifier) {
+            foreach (explode(';', (string) $id) as $identifier) {
                 if (!$identifier) {
                     continue;
                 }
diff --git a/src/Bridge/Doctrine/Orm/Util/QueryChecker.php b/src/Bridge/Doctrine/Orm/Util/QueryChecker.php
@@ -127,10 +127,9 @@ public static function hasOrderByOnToManyJoin(QueryBuilder $queryBuilder, Manage
             $parts = QueryJoinParser::getOrderByParts($orderBy);
 
             foreach ($parts as $part) {
-                if (false !== ($pos = strpos($part, '.'))) {
-                    $alias = substr($part, 0, $pos);
-
-                    $orderByAliases[$alias] = true;
+                $pos = strpos($part, '.');
+                if (false !== $pos) {
+                    $orderByAliases[substr($part, 0, $pos)] = true;
                 }
             }
         }
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/AnnotationFilterPass.php
@@ -39,6 +39,9 @@ final class AnnotationFilterPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $resourceClassDirectories = $container->getParameter('api_platform.resource_class_directories');
+        /**
+         * @var Reader
+         */
         $reader = $container->get('annotation_reader');
 
         foreach (ReflectionClassRecursiveIterator::getReflectionClassesFromDirectories($resourceClassDirectories) as $className => $reflectionClass) {
diff --git a/src/Bridge/Symfony/Bundle/EventListener/SwaggerUiListener.php b/src/Bridge/Symfony/Bundle/EventListener/SwaggerUiListener.php
@@ -19,8 +19,6 @@ final class SwaggerUiListener
 {
     /**
      * Sets SwaggerUiAction as controller if the requested format is HTML.
-     *
-     * @param $event GetResponseEvent
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
diff --git a/src/DataProvider/OperationDataProviderTrait.php b/src/DataProvider/OperationDataProviderTrait.php
@@ -14,10 +14,8 @@
 namespace ApiPlatform\Core\DataProvider;
 
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use ApiPlatform\Core\Exception\InvalidIdentifierException;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use ApiPlatform\Core\Exception\RuntimeException;
-use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 
 /**
  * @internal
@@ -35,15 +33,10 @@ trait OperationDataProviderTrait
     private $itemDataProvider;
 
     /**
-     * @var SubresourceDataProviderInterface
+     * @var SubresourceDataProviderInterface|null
      */
     private $subresourceDataProvider;
 
-    /**
-     * @var ChainIdentifierDenormalizer
-     */
-    private $identifierDenormalizer;
-
     /**
      * Retrieves data for a collection operation.
      *
@@ -57,7 +50,7 @@ private function getCollectionData(array $attributes, array $context)
     /**
      * Gets data for an item operation.
      *
-     * @throws NotFoundHttpException
+     * @throws PropertyNotFoundException
      *
      * @return object|null
      */
@@ -73,14 +66,13 @@ private function getItemData($identifiers, array $attributes, array $context)
     /**
      * Gets data for a nested operation.
      *
-     * @throws NotFoundHttpException
      * @throws RuntimeException
      *
      * @return object|null
      */
     private function getSubresourceData($identifiers, array $attributes, array $context)
     {
-        if (!$this->subresourceDataProvider) {
+        if (null === $this->subresourceDataProvider) {
             throw new RuntimeException('Subresources not supported');
         }
 
@@ -89,8 +81,6 @@ private function getSubresourceData($identifiers, array $attributes, array $cont
 
     /**
      * @param array $parameters - usually comes from $request->attributes->all()
-     *
-     * @throws InvalidIdentifierException
      */
     private function extractIdentifiers(array $parameters, array $attributes)
     {
@@ -104,12 +94,10 @@ private function extractIdentifiers(array $parameters, array $attributes)
 
         $identifiers = [];
 
-        foreach ($attributes['subresource_context']['identifiers'] as $key => list($id, $resourceClass, $hasIdentifier)) {
-            if (false === $hasIdentifier) {
-                continue;
+        foreach ($attributes['subresource_context']['identifiers'] as $key => list($id, , $hasIdentifier)) {
+            if (false !== $hasIdentifier) {
+                $identifiers[$id] = $parameters[$id];
             }
-
-            $identifiers[$id] = $parameters[$id];
         }
 
         return $identifiers;
diff --git a/src/EventListener/DeserializeListener.php b/src/EventListener/DeserializeListener.php
@@ -84,6 +84,9 @@ public function onKernelRequest(GetResponseEvent $event)
      */
     private function getFormat(Request $request): string
     {
+        /**
+         * @var string|null
+         */
         $contentType = $request->headers->get('CONTENT_TYPE');
         if (null === $contentType) {
             throw new NotAcceptableHttpException('The "Content-Type" header must exist.');
diff --git a/src/JsonApi/Serializer/ItemNormalizer.php b/src/JsonApi/Serializer/ItemNormalizer.php
@@ -25,6 +25,8 @@
 use ApiPlatform\Core\Serializer\AbstractItemNormalizer;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * Converts between objects and array.
@@ -161,7 +163,10 @@ protected function denormalizeRelation(string $attributeName, PropertyMetadata $
         if (!$this->resourceClassResolver->isResourceClass($className)) {
             $context['resource_class'] = $className;
 
-            return $this->serializer->denormalize($value, $className, $format, $context);
+            if ($this->serializer instanceof DenormalizerInterface) {
+                return $this->serializer->denormalize($value, $className, $format, $context);
+            }
+            throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', DenormalizerInterface::class));
         }
 
         if (!\is_array($value) || !isset($value['id'], $value['type'])) {
@@ -188,7 +193,10 @@ protected function normalizeRelation(PropertyMetadata $propertyMetadata, $relate
             } else {
                 unset($context['resource_class']);
 
-                return $this->serializer->normalize($relatedObject, $format, $context);
+                if ($this->serializer instanceof NormalizerInterface) {
+                    return $this->serializer->normalize($relatedObject, $format, $context);
+                }
+                throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', NormalizerInterface::class));
             }
         } else {
             $iri = $this->iriConverter->getIriFromItem($relatedObject);
diff --git a/src/JsonLd/Action/ContextAction.php b/src/JsonLd/Action/ContextAction.php
@@ -44,11 +44,7 @@ public function __construct(ContextBuilderInterface $contextBuilder, ResourceNam
     /**
      * Generates a context according to the type requested.
      *
-     * @param $shortName string
-     *
      * @throws NotFoundHttpException
-     *
-     * @return array
      */
     public function __invoke(string $shortName): array
     {
diff --git a/src/JsonLd/ContextBuilder.php b/src/JsonLd/ContextBuilder.php
@@ -36,7 +36,7 @@ final class ContextBuilder implements ContextBuilderInterface
     private $urlGenerator;
 
     /**
-     * @var NameConverterInterface
+     * @var NameConverterInterface|null
      */
     private $nameConverter;
 
diff --git a/src/Metadata/Extractor/XmlExtractor.php b/src/Metadata/Extractor/XmlExtractor.php
@@ -133,7 +133,7 @@ private function getProperties(\SimpleXMLElement $resource): array
     /**
      * Transforms an XML attribute's value in a PHP value.
      *
-     * @return bool|string|null
+     * @return string|int|bool|null
      */
     private function phpize(\SimpleXMLElement $array, string $key, string $type)
     {
diff --git a/src/Serializer/AbstractCollectionNormalizer.php b/src/Serializer/AbstractCollectionNormalizer.php
@@ -91,8 +91,10 @@ public function normalize($object, $format = null, array $context = [])
     protected function getPaginationConfig($object, array $context = []): array
     {
         $currentPage = $lastPage = $itemsPerPage = $pageTotalItems = $totalItems = null;
+        $paginated = $paginator = false;
 
-        if ($paginated = $paginator = $object instanceof PartialPaginatorInterface) {
+        if ($object instanceof PartialPaginatorInterface) {
+            $paginated = $paginator = true;
             if ($object instanceof PaginatorInterface) {
                 $paginated = 1. !== $lastPage = $object->getLastPage();
                 $totalItems = $object->getTotalItems();
diff --git a/src/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php
@@ -31,6 +31,8 @@
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * Base item normalizer.
@@ -306,7 +308,10 @@ protected function denormalizeRelation(string $attributeName, PropertyMetadata $
             $context['api_allow_update'] = true;
 
             try {
-                return $this->serializer->denormalize($value, $className, $format, $context);
+                if ($this->serializer instanceof DenormalizerInterface) {
+                    return $this->serializer->denormalize($value, $className, $format, $context);
+                }
+                throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', DenormalizerInterface::class));
             } catch (InvalidValueException $e) {
                 if (!$this->allowPlainIdentifiers || null === $this->itemDataProvider) {
                     throw $e;
@@ -437,7 +442,10 @@ protected function getAttributeValue($object, $attribute, $format = null, array
 
         unset($context['resource_class']);
 
-        return $this->serializer->normalize($attributeValue, $format, $context);
+        if ($this->serializer instanceof NormalizerInterface) {
+            return $this->serializer->normalize($attributeValue, $format, $context);
+        }
+        throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', NormalizerInterface::class));
     }
 
     /**
@@ -478,7 +486,10 @@ protected function normalizeRelation(PropertyMetadata $propertyMetadata, $relate
                 $context['resource_class'] = $resourceClass;
             }
 
-            return $this->serializer->normalize($relatedObject, $format, $context);
+            if ($this->serializer instanceof NormalizerInterface) {
+                return $this->serializer->normalize($relatedObject, $format, $context);
+            }
+            throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', NormalizerInterface::class));
         }
 
         $iri = $this->iriConverter->getIriFromItem($relatedObject);
diff --git a/src/Swagger/Serializer/DocumentationNormalizer.php b/src/Swagger/Serializer/DocumentationNormalizer.php
@@ -757,11 +757,6 @@ public function supportsNormalization($data, $format = null)
     }
 
     /**
-     * @param string           $operationType
-     * @param bool             $denormalization
-     * @param ResourceMetadata $resourceMetadata
-     * @param string           $operationType
-     *
      * @return array|null
      */
     private function getSerializerContext(string $operationType, bool $denormalization, ResourceMetadata $resourceMetadata, string $operationName)
diff --git a/src/Util/AnnotationFilterExtractorTrait.php b/src/Util/AnnotationFilterExtractorTrait.php
@@ -31,7 +31,7 @@ trait AnnotationFilterExtractorTrait
      *
      * @param array $miscAnnotations class or property annotations
      *
-     * @return array only ApiFilter annotations
+     * @return \Iterator only ApiFilter annotations
      */
     private function getFilterAnnotations(array $miscAnnotations): \Iterator
     {
diff --git a/tests/Annotation/ApiResourceTest.php b/tests/Annotation/ApiResourceTest.php
@@ -44,6 +44,9 @@ public function testAssignation()
     public function testApiResourceAnnotation()
     {
         $reader = new AnnotationReader();
+        /**
+         * @var ApiResource
+         */
         $resource = $reader->getClassAnnotation(new \ReflectionClass(AnnotatedClass::class), ApiResource::class);
 
         $this->assertSame('shortName', $resource->shortName);
diff --git a/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php b/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php
diff --git a/tests/Bridge/Doctrine/Orm/Util/QueryBuilderHelperTest.php b/tests/Bridge/Doctrine/Orm/Util/QueryBuilderHelperTest.php
diff --git a/tests/Bridge/Symfony/Routing/IriConverterTest.php b/tests/Bridge/Symfony/Routing/IriConverterTest.php
diff --git a/tests/DataProvider/ChainCollectionDataProviderTest.php b/tests/DataProvider/ChainCollectionDataProviderTest.php
diff --git a/tests/Fixtures/TestBundle/Controller/DummyValidationController.php b/tests/Fixtures/TestBundle/Controller/DummyValidationController.php
diff --git a/tests/Fixtures/TestBundle/Entity/DummyCar.php b/tests/Fixtures/TestBundle/Entity/DummyCar.php
diff --git a/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php b/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php
diff --git a/tests/Fixtures/TestBundle/Manager/UserManager.php b/tests/Fixtures/TestBundle/Manager/UserManager.php
diff --git a/tests/Fixtures/app/config/config_test.yml b/tests/Fixtures/app/config/config_test.yml
diff --git a/tests/GraphQl/Action/EntrypointActionTest.php b/tests/GraphQl/Action/EntrypointActionTest.php

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,11 @@ final class ApiFilter`
`53`	`53`
`54`	`54`	`public function __construct($options = [])`
`55`	`55`	`{`
`56`		`- if (!isset($options['value'])) {`
	`56`	`+ if (!\is_string($options['value'] ?? null)) {`
`57`	`57`	`throw new InvalidArgumentException('This annotation needs a value representing the filter class.');`
`58`	`58`	`}`
`59`	`59`
`60`		`- if (!is_subclass_of($options['value'], FilterInterface::class)) {`
	`60`	`+ if (!is_a($options['value'], FilterInterface::class, true)) {`
`61`	`61`	`throw new InvalidArgumentException(sprintf('The filter class "%s" does not implement "%s".', $options['value'], FilterInterface::class));`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getResourceClass($value, string $resourceClass = null, bool $str`
`51`	`51`	`$typeToFind = $type = $resourceClass;`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (($strict && isset($type) && $resourceClass !== $type) \|\| false === $isResourceClass = $this->isResourceClass($typeToFind)) {`
	`54`	`+ if (($strict && $resourceClass !== $type) \|\| false === $isResourceClass = $this->isResourceClass($typeToFind)) {`
`55`	`55`	`if (is_subclass_of($type, $resourceClass) && $this->isResourceClass($resourceClass)) {`
`56`	`56`	`return $type;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,13 +61,11 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`foreach ($resourceFilters as $filterId) {`
`64`		`- if (!($filter = $this->getFilter($filterId)) instanceof FilterInterface) {`
`65`		`- continue;`
	`64`	`+ $filter = $this->getFilter($filterId);`
	`65`	`+ if ($filter instanceof FilterInterface) {`
	`66`	`+ $context['filters'] = $context['filters'] ?? [];`
	`67`	`+ $filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);`
`66`	`68`	`}`
`67`		`-`
`68`		`- $context['filters'] = $context['filters'] ?? [];`
`69`		`-`
`70`		`- $filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);`
`71`	`69`	`}`
`72`	`70`	`}`
`73`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ protected function isPropertyNested(string $property/, string $resourceClass/)`
`164`	`164`	`$resourceClass = null;`
`165`	`165`	`}`
`166`	`166`
`167`		`- if (false === $pos = strpos($property, '.')) {`
	`167`	`+ $pos = strpos($property, '.');`
	`168`	`+ if (false === $pos) {`
`168`	`169`	`return false;`
`169`	`170`	`}`
`170`	`171`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private function normalizeIdentifiers($id, ObjectManager $manager, string $resou`
`49`	`49`	`$identifiersMap = [];`
`50`	`50`
`51`	`51`	`// first transform identifiers to a proper key/value array`
`52`		`- foreach (explode(';', $id) as $identifier) {`
	`52`	`+ foreach (explode(';', (string) $id) as $identifier) {`
`53`	`53`	`if (!$identifier) {`
`54`	`54`	`continue;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,9 @@ public static function hasOrderByOnToManyJoin(QueryBuilder $queryBuilder, Manage`
`127`	`127`	`$parts = QueryJoinParser::getOrderByParts($orderBy);`
`128`	`128`
`129`	`129`	`foreach ($parts as $part) {`
`130`		`- if (false !== ($pos = strpos($part, '.'))) {`
`131`		`- $alias = substr($part, 0, $pos);`
`132`		`-`
`133`		`- $orderByAliases[$alias] = true;`
	`130`	`+ $pos = strpos($part, '.');`
	`131`	`+ if (false !== $pos) {`
	`132`	`+ $orderByAliases[substr($part, 0, $pos)] = true;`
`134`	`133`	`}`
`135`	`134`	`}`
`136`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ final class AnnotationFilterPass implements CompilerPassInterface`
`39`	`39`	`public function process(ContainerBuilder $container)`
`40`	`40`	`{`
`41`	`41`	`$resourceClassDirectories = $container->getParameter('api_platform.resource_class_directories');`
	`42`	`+ /**`
	`43`	`+ * @var Reader`
	`44`	`+ */`
`42`	`45`	`$reader = $container->get('annotation_reader');`
`43`	`46`
`44`	`47`	`foreach (ReflectionClassRecursiveIterator::getReflectionClassesFromDirectories($resourceClassDirectories) as $className => $reflectionClass) {`