phpstan: lvl 4 -> 5

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-   level: 4
+   level: 5
    paths:
       - src
       - tests

src/Command/Proxy/DoctrineCommandHelper.php

@@ -28,8 +28,7 @@ public static function setApplicationEntityManager(Application $application, $em
         $em = $application->getKernel()->getContainer()->get('doctrine')->getManager($emName);
         assert($em instanceof EntityManagerInterface);
         $helperSet = $application->getHelperSet();
-        /** @psalm-suppress InvalidArgument ORM < 3 specific */
-        /* @phpstan-ignore class.notFound */
+        /* @phpstan-ignore class.notFound, argument.type (ORM < 3 specific) */
         $helperSet->set(new EntityManagerHelper($em), 'em');
 
         trigger_deprecation(

src/Command/Proxy/OrmProxyCommand.php

@@ -31,6 +31,7 @@ public function __construct(
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (! $this->entityManagerProvider) {
+            /* @phpstan-ignore argument.type (ORM < 3 specific) */
             DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));
         }
 

src/DependencyInjection/Configuration.php

@@ -63,7 +63,9 @@ public function getConfigTreeBuilder(): TreeBuilder
         $treeBuilder = new TreeBuilder('doctrine');
         $rootNode    = $treeBuilder->getRootNode();
 
+        /* @phpstan-ignore argument.type (symfony plugin needed) */
         $this->addDbalSection($rootNode);
+        /* @phpstan-ignore argument.type (symfony plugin needed) */
         $this->addOrmSection($rootNode);
 
         return $treeBuilder;
@@ -262,6 +264,7 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                     )
                     ->useAttributeAsKey('name')
                     ->prototype('array');
+        /* @phpstan-ignore argument.type (symfony plugin needed) */
         $this->configureDbalDriverNode($slaveNode);
 
         // dbal >= 2.11
@@ -270,6 +273,7 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                 ->arrayNode('replicas')
                     ->useAttributeAsKey('name')
                     ->prototype('array');
+        /* @phpstan-ignore argument.type (symfony plugin needed) */
         $this->configureDbalDriverNode($replicaNode);
 
         assert($node instanceof ArrayNodeDefinition);

src/Repository/LazyServiceEntityRepository.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\Repository;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use LogicException;
@@ -62,7 +63,7 @@ private function initialize(): void
     {
         $manager = $this->registry->getManagerForClass($this->entityClass);
 
-        if ($manager === null) {
+        if (! $manager instanceof EntityManagerInterface) {
             throw new LogicException(sprintf(
                 'Could not find the entity manager for class "%s". Check your Doctrine configuration to make sure it is configured to load this entity’s metadata.',
                 $this->entityClass,

src/Repository/ServiceEntityRepositoryProxy.php

@@ -123,7 +123,7 @@ private function resolveRepository(): EntityRepository
     {
         $manager = $this->registry->getManagerForClass($this->entityClass);
 
-        if ($manager === null) {
+        if (! $manager instanceof EntityManagerInterface) {
             throw new LogicException(sprintf(
                 'Could not find the entity manager for class "%s". Check your Doctrine configuration to make sure it is configured to load this entity’s metadata.',
                 $this->entityClass,

src/Twig/DoctrineExtension.php

@@ -108,14 +108,13 @@ public static function escapeFunction(mixed $parameter)
     /**
      * Return a query with the parameters replaced
      *
-     * @param string       $query
-     * @param mixed[]|Data $parameters
+     * @param string                       $query
+     * @param array<array-key, mixed>|Data $parameters
      *
      * @return string
      */
     public function replaceQueryParameters($query, $parameters)
     {
-        /** @phpstan-ignore instanceof.alwaysTrue */
         if ($parameters instanceof Data) {
             $parameters = $parameters->getValue(true);
         }

tests/Middleware/IdleConnectionMiddlewareTest.php

@@ -15,6 +15,7 @@ class IdleConnectionMiddlewareTest extends TestCase
     /** @requires function Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver::__construct */
     public function testWrap()
     {
+        /** @var ArrayObject<string, int> $connectionExpiries */
         $connectionExpiries = new ArrayObject(['connectionone' => time() - 30, 'connectiontwo' => time() + 40]);
         $ttlByConnection    = ['connectionone' => 25, 'connectiontwo' => 60];
 

tests/ProfilerTest.php

@@ -64,6 +64,7 @@ public function setUp(): void
         if (class_exists(CodeExtension::class)) {
             $this->twig->addExtension(new CodeExtension('', '', ''));
         } elseif (class_exists(CodeExtensionLegacy::class)) {
+            /* @phpstan-ignore argument.type (available in symfony < 7) */
             $this->twig->addExtension(new CodeExtensionLegacy('', '', ''));
         }
 

tests/Repository/ContainerRepositoryFactoryTest.php

@@ -31,37 +31,46 @@ public static function setUpBeforeClass(): void
 
     public function testGetRepositoryReturnsService(): void
     {
-        $em        = $this->createEntityManager(['Foo\CoolEntity' => 'my_repo']);
+        /* @phpstan-ignore argument.type */
+        $em = $this->createEntityManager(['Foo\CoolEntity' => 'my_repo']);
+        /* @phpstan-ignore argument.type */
         $repo      = new StubRepository($em, new ClassMetadata('Foo\CoolEntity'));
         $container = $this->createContainer(['my_repo' => $repo]);
 
         $factory = new ContainerRepositoryFactory($container);
+        /* @phpstan-ignore argument.type */
         $this->assertSame($repo, $factory->getRepository($em, 'Foo\CoolEntity'));
     }
 
     public function testGetRepositoryReturnsEntityRepository(): void
     {
         $container = $this->createContainer([]);
-        $em        = $this->createEntityManager(['Foo\BoringEntity' => null]);
+        /* @phpstan-ignore argument.type */
+        $em = $this->createEntityManager(['Foo\BoringEntity' => null]);
 
-        $factory    = new ContainerRepositoryFactory($container);
+        $factory = new ContainerRepositoryFactory($container);
+        /* @phpstan-ignore argument.type */
         $actualRepo = $factory->getRepository($em, 'Foo\BoringEntity');
         $this->assertInstanceOf(EntityRepository::class, $actualRepo);
         // test the same instance is returned
+        /* @phpstan-ignore argument.type */
         $this->assertSame($actualRepo, $factory->getRepository($em, 'Foo\BoringEntity'));
     }
 
     public function testCustomRepositoryIsReturned(): void
     {
         $container = $this->createContainer([]);
-        $em        = $this->createEntityManager([
+        /* @phpstan-ignore argument.type */
+        $em = $this->createEntityManager([
             'Foo\CustomNormalRepoEntity' => StubRepository::class,
         ]);
 
-        $factory    = new ContainerRepositoryFactory($container);
+        $factory = new ContainerRepositoryFactory($container);
+        /* @phpstan-ignore argument.type */
         $actualRepo = $factory->getRepository($em, 'Foo\CustomNormalRepoEntity');
         $this->assertInstanceOf(StubRepository::class, $actualRepo);
         // test the same instance is returned
+        /* @phpstan-ignore argument.type */
         $this->assertSame($actualRepo, $factory->getRepository($em, 'Foo\CustomNormalRepoEntity'));
     }
 
@@ -71,6 +80,7 @@ public function testServiceRepositoriesMustExtendObjectRepository(): void
 
         $container = $this->createContainer(['my_repo' => $repo]);
 
+        /* @phpstan-ignore argument.type */
         $em = $this->createEntityManager(['Foo\CoolEntity' => 'my_repo']);
 
         $factory = new ContainerRepositoryFactory($container);
@@ -81,6 +91,7 @@ public function testServiceRepositoriesMustExtendObjectRepository(): void
             $this->expectExceptionMessage('The service "my_repo" must implement ObjectRepository (or extend a base class, like ServiceEntityRepository), "stdClass" given.');
         }
 
+        /* @phpstan-ignore argument.type */
         $factory->getRepository($em, 'Foo\CoolEntity');
     }
 
@@ -90,10 +101,13 @@ public function testServiceRepositoriesCanNotExtendsEntityRepository(): void
 
         $container = $this->createContainer(['my_repo' => $repo]);
 
+        /* @phpstan-ignore argument.type */
         $em = $this->createEntityManager(['Foo\CoolEntity' => 'my_repo']);
 
         $factory = new ContainerRepositoryFactory($container);
+        /* @phpstan-ignore argument.type */
         $factory->getRepository($em, 'Foo\CoolEntity');
+        /* @phpstan-ignore argument.type */
         $actualRepo = $factory->getRepository($em, 'Foo\CoolEntity');
         $this->assertSame($repo, $actualRepo);
     }
@@ -102,6 +116,7 @@ public function testRepositoryMatchesServiceInterfaceButServiceNotFound(): void
     {
         $container = $this->createContainer([]);
 
+        /* @phpstan-ignore argument.type */
         $em = $this->createEntityManager([
             'Foo\CoolEntity' => StubServiceRepository::class,
         ]);
@@ -111,20 +126,23 @@ public function testRepositoryMatchesServiceInterfaceButServiceNotFound(): void
         $this->expectExceptionMessage(<<<'EXCEPTION'
 The "Doctrine\Bundle\DoctrineBundle\Tests\Repository\Fixtures\StubServiceRepository" entity repository implements "Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepositoryInterface", but its service could not be found. Make sure the service exists and is tagged with "doctrine.repository_service".
 EXCEPTION);
+        /* @phpstan-ignore argument.type */
         $factory->getRepository($em, 'Foo\CoolEntity');
     }
 
     public function testCustomRepositoryIsNotAValidClass(): void
     {
         $container = $this->createContainer([]);
 
+        /* @phpstan-ignore argument.type */
         $em = $this->createEntityManager(['Foo\CoolEntity' => 'not_a_real_class']);
 
         $factory = new ContainerRepositoryFactory($container);
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage(<<<'EXCEPTION'
 The "Foo\CoolEntity" entity has a repositoryClass set to "not_a_real_class", but this is not a valid class. Check your class naming. If this is meant to be a service id, make sure this service exists and is tagged with "doctrine.repository_service".
 EXCEPTION);
+        /* @phpstan-ignore argument.type */
         $factory->getRepository($em, 'Foo\CoolEntity');
     }