Merge pull request #2075 from dunglas/phpstan-master

Fix PHPStan issues

Author: dunglas

phpstan.neon

@@ -16,7 +16,7 @@ parameters:
         - '#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\.#'
+        - '#Method ApiPlatform\\Core\\Tests\\Bridge\\Doctrine\\Orm\\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\.#'

src/DataProvider/OperationDataProviderTrait.php

@@ -38,7 +38,7 @@ trait OperationDataProviderTrait
     private $subresourceDataProvider;
 
     /**
-     * @var IdentifierConverterInterface
+     * @var IdentifierConverterInterface|null
      */
     private $identifierConverter;
 
@@ -92,7 +92,7 @@ private function extractIdentifiers(array $parameters, array $attributes)
 
             $id = $parameters['id'];
 
-            if ($this->identifierConverter) {
+            if (null !== $this->identifierConverter) {
                 return $this->identifierConverter->convert((string) $id, $attributes['resource_class']);
             }
 
@@ -108,7 +108,7 @@ private function extractIdentifiers(array $parameters, array $attributes)
 
             $identifiers[$id] = $parameters[$id];
 
-            if ($this->identifierConverter) {
+            if (null !== $this->identifierConverter) {
                 $identifiers[$id] = $this->identifierConverter->convert((string) $identifiers[$id], $resourceClass);
             }
         }

src/JsonApi/Serializer/ItemNormalizer.php

@@ -214,6 +214,10 @@ protected function normalizeRelation(PropertyMetadata $propertyMetadata, $relate
             }
             if (isset($context['api_included'])) {
                 $context['api_sub_level'] = true;
+
+                if (!$this->serializer instanceof NormalizerInterface) {
+                    throw new InvalidArgumentException(sprintf('The injected serializer must be an instance of "%s".', NormalizerInterface::class));
+                }
                 $data = $this->serializer->normalize($relatedObject, $format, $context);
                 unset($context['api_sub_level']);
 

tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php

@@ -425,7 +425,7 @@ public function testGetSubSubresourceItemLegacy()
 
         $managerRegistryProphecy->getManagerForClass(RelatedDummy::class)->shouldBeCalled()->willReturn($rDummyManagerProphecy->reveal());
 
-        $result = new \StdClass();
+        $result = new \stdClass();
         // Origin manager (ThirdLevel)
         $queryProphecy = $this->prophesize(AbstractQuery::class);
         $queryProphecy->getOneOrNullResult()->shouldBeCalled()->willReturn($result);

tests/Bridge/Doctrine/Orm/Util/IdentifierManagerTraitTest.php

@@ -146,11 +146,6 @@ private function getMetadataFactories(string $resourceClass, array $identifiers)
 
     /**
      * Gets a mocked object manager.
-     *
-     * @param string $resourceClass
-     * @param array  $identifierFields
-     *
-     * @return ObjectManager
      */
     private function getObjectManager(string $resourceClass, array $identifierFields): ObjectManager
     {

tests/Bridge/Symfony/Routing/IriConverterTest.php

@@ -207,7 +207,7 @@ public function testNotAbleToGenerateGetItemIriFromResourceClass()
 
     public function testGetItemFromIriWithIdentifierConverter()
     {
-        $item = new \StdClass();
+        $item = new \stdClass();
         $itemDataProviderProphecy = $this->prophesize(ItemDataProviderInterface::class);
         $itemDataProviderProphecy->getItem(Dummy::class, ['id' => 3], 'get', ['fetch_data' => true, IdentifierConverterInterface::HAS_IDENTIFIER_CONVERTER => true])->shouldBeCalled()->willReturn($item);
         $identifierConverterProphecy = $this->prophesize(IdentifierConverterInterface::class);

tests/Fixtures/TestBundle/DataProvider/ContainNonResourceItemDataProvider.php

@@ -33,6 +33,10 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
     {
+        if (!is_scalar($id)) {
+            throw new \InvalidArgumentException('The id must be a scalar.');
+        }
+
         // Retrieve the blog post item from somewhere
         $cnr = new ContainNonResource();
         $cnr->id = $id;