Merge pull request #1074 from dunglas/stanmaster

Fix PHPStan errors in master

Author: soyuka

phpstan.neon

@@ -14,3 +14,4 @@ parameters:
         - '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects Doctrine\\ORM\\Query\\Expr\\Base, Doctrine\\ORM\\Query\\Expr\\Join\[\] given#' # Fixed in Doctrine's master
         - '#Parameter \#1 \$rootNode of method ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\DependencyInjection\\Configuration::[a-zA-Z0-9]+\(\) expects Symfony\\Component\\Config\\Definition\\Builder\\ArrayNodeDefinition, Symfony\\Component\\Config\\Definition\\Builder\\ArrayNodeDefinition|Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition given#'
         - '#Parameter \#1 \$source of static method ApiPlatform\\Core\\Util\\RequestParser::parseRequestParams\(\) expects string, string\|resource given#'
+        - '#Call to an undefined method Doctrine\\Common\\Persistence\\ObjectManager::getConnection\(\)#'

src/Metadata/Extractor/XmlExtractor.php

@@ -75,7 +75,7 @@ private function getOperations(\SimpleXMLElement $resource, string $operationTyp
         $operationsParent = $operationType.'s';
 
         if (!isset($resource->$operationsParent)) {
-            return;
+            return null;
         }
 
         return $this->getAttributes($resource->$operationsParent, $operationType);

tests/Bridge/Doctrine/Orm/Filter/ExistsFilterTest.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Doctrine\Orm\Filter;
+namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\ExistsFilter;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGenerator;

tests/Bridge/Doctrine/Util/IdentifierManagerTraitTest.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Tests\Doctrine\Util;
+namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Util;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\IdentifierManagerTrait;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
@@ -26,21 +26,23 @@
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\EntityManagerInterface;
 
-class IdentifierManagerTraitImpl
+class IdentifierManagerTraitTest extends \PHPUnit_Framework_TestCase
 {
-    use IdentifierManagerTrait {
-        IdentifierManagerTrait::normalizeIdentifiers as public;
-    }
-
-    public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory)
+    private function getIdentifierManagerTraitImpl(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory)
     {
-        $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
-        $this->propertyMetadataFactory = $propertyMetadataFactory;
+        return new class($propertyNameCollectionFactory, $propertyMetadataFactory) {
+            use IdentifierManagerTrait {
+                IdentifierManagerTrait::normalizeIdentifiers as public;
+            }
+
+            public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory)
+            {
+                $this->propertyNameCollectionFactory = $propertyNameCollectionFactory;
+                $this->propertyMetadataFactory = $propertyMetadataFactory;
+            }
+        };
     }
-}
 
-class IdentifierManagerTraitTest extends \PHPUnit_Framework_TestCase
-{
     public function testSingleIdentifier()
     {
         list($propertyNameCollectionFactory, $propertyMetadataFactory) = $this->getMetadataFactories(Dummy::class, [
@@ -52,7 +54,7 @@ public function testSingleIdentifier()
             ],
         ]);
 
-        $identifierManager = new IdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
+        $identifierManager = $this->getIdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
 
         $this->assertEquals($identifierManager->normalizeIdentifiers(1, $objectManager, Dummy::class), ['id' => 1]);
     }
@@ -72,7 +74,7 @@ public function testCompositeIdentifier()
             ],
         ]);
 
-        $identifierManager = new IdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
+        $identifierManager = $this->getIdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
 
         $this->assertEquals($identifierManager->normalizeIdentifiers('ida=1;idb=2', $objectManager, Dummy::class), ['ida' => 1, 'idb' => 2]);
     }
@@ -96,7 +98,7 @@ public function testInvalidIdentifier()
             ],
         ]);
 
-        $identifierManager = new IdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
+        $identifierManager = $this->getIdentifierManagerTraitImpl($propertyNameCollectionFactory, $propertyMetadataFactory);
 
         $identifierManager->normalizeIdentifiers('idbad=1;idb=2', $objectManager, Dummy::class);
     }