Fix phpstan

api-platform · Apr 7, 2021 · 8619658 · 8619658
1 parent 49dbfe1
commit 8619658
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -40,7 +40,7 @@ parameters:
 			- fail
 	ignoreErrors:
 		# Real problems, hard to fix
-		- '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects array\|object, string given\.#'
+		- '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects .+#'
 		# False positives
 		-
 			message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#'

diff --git a/src/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php b/src/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php
@@ -186,6 +186,7 @@ public static function getExistingJoin(QueryBuilder $queryBuilder, string $alias
      */
     private static function mapRootAliases(array $rootAliases, array $rootEntities): array
     {
+        /** @var bool|array $aliasMap */
         $aliasMap = array_combine($rootAliases, $rootEntities);
         if (false === $aliasMap) {
             throw new \LogicException('Number of root aliases and root entities do not match.');

diff --git a/tests/Behat/DoctrineContext.php b/tests/Behat/DoctrineContext.php
@@ -182,7 +182,6 @@ final class DoctrineContext implements Context
     private $passwordEncoder;
     private $schemaTool;
     private $schemaManager;
-    private $classes;
 
     /**
      * Initializes context.
@@ -198,17 +197,19 @@ public function __construct(ManagerRegistry $doctrine, UserPasswordEncoderInterf
         $this->manager = $doctrine->getManager();
         $this->schemaTool = $this->manager instanceof EntityManagerInterface ? new SchemaTool($this->manager) : null;
         $this->schemaManager = $this->manager instanceof DocumentManager ? $this->manager->getSchemaManager() : null;
-        $this->classes = $this->manager->getMetadataFactory()->getAllMetadata();
     }
 
     /**
      * @BeforeScenario @createSchema
      */
     public function createDatabase()
     {
+        /** @var array<int, \Doctrine\ORM\Mapping\ClassMetadata> $classes */
+        $classes = $this->manager->getMetadataFactory()->getAllMetadata();
+
         if ($this->isOrm()) {
-            $this->schemaTool->dropSchema($this->classes);
-            $this->schemaTool->createSchema($this->classes);
+            $this->schemaTool->dropSchema($classes);
+            $this->schemaTool->createSchema($classes);
         }
 
         if ($this->isOdm()) {

diff --git a/tests/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php b/tests/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php
@@ -165,6 +165,7 @@ public function testFindIriBy(): void
          * @var EntityManagerInterface
          */
         $manager = self::$container->get('doctrine')->getManager();
+        /** @var array<int, \Doctrine\ORM\Mapping\ClassMetadata> $classes */
         $classes = $manager->getMetadataFactory()->getAllMetadata();
         $schemaTool = new SchemaTool($manager);
 

diff --git a/tests/Bridge/Symfony/Bundle/Test/ClientTest.php b/tests/Bridge/Symfony/Bundle/Test/ClientTest.php
@@ -29,6 +29,7 @@ protected function setUp(): void
          * @var EntityManagerInterface
          */
         $manager = self::$container->get('doctrine')->getManager();
+        /** @var array<int, \Doctrine\ORM\Mapping\ClassMetadata> $classes */
         $classes = $manager->getMetadataFactory()->getAllMetadata();
         $schemaTool = new SchemaTool($manager);
 

diff --git a/tests/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php b/tests/Bridge/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php
@@ -50,6 +50,7 @@ protected function setUp(): void
         $manager = $doctrine->getManager();
         $this->manager = $manager;
         $this->schemaTool = new SchemaTool($this->manager);
+        /** @var array<int, \Doctrine\ORM\Mapping\ClassMetadata> $classes */
         $classes = $this->manager->getMetadataFactory()->getAllMetadata();
         $this->schemaTool->dropSchema($classes);
         $this->manager->clear();