Merge branch '2.13.x' into 2.14.x

# Conflicts:
#	src/Repository/ServiceEntityRepositoryProxy.php

phpstan.neon.dist

@@ -1,9 +1,20 @@
 parameters:
-   level: 1
+   level: 3
    paths:
       - src
       - tests
 
    excludePaths:
       - src/Command/Proxy/ConvertMappingDoctrineCommand.php
       - src/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php
+   ignoreErrors:
+    # Available in ORM < 3 only
+    - '#Doctrine\\ORM\\Tools\\EntityGenerator.#'
+    - '#Doctrine\\ORM\\Tools\\DisconnectedClassMetadataFactory.#'
+    - '#Doctrine\\ORM\\Tools\\Export\\ClassMetadataExporter.#'
+    # phpstan has no array shape intersection support https://github.com/phpstan/phpstan/issues/12414
+    - message: '#unresolvable type.#'
+      path: src/DataCollector/DoctrineDataCollector.php
+    # Probably needs Symfony plugin
+    - message: '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\Node#'
+      path: src/DependencyInjection/Configuration.php

src/Command/DoctrineCommand.php

@@ -3,12 +3,14 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\EntityGenerator;
 use Doctrine\Persistence\ManagerRegistry;
 use InvalidArgumentException;
 use Symfony\Component\Console\Command\Command;
 
+use function assert;
+
 /**
  * Base class for Doctrine console commands to extend from.
  *
@@ -26,12 +28,9 @@ public function __construct(
      * get a doctrine entity generator
      *
      * @return EntityGenerator
-     *
-     * @psalm-suppress UndefinedDocblockClass ORM < 3 specific
      */
     protected function getEntityGenerator()
     {
-        /** @phpstan-ignore class.notFound */
         $entityGenerator = new EntityGenerator();
         $entityGenerator->setGenerateAnnotations(false);
         $entityGenerator->setGenerateStubMethods(true);
@@ -49,7 +48,7 @@ protected function getEntityGenerator()
      * @param string   $name
      * @param int|null $shardId
      *
-     * @return EntityManager
+     * @return EntityManagerInterface
      */
     protected function getEntityManager($name, $shardId = null)
     {
@@ -59,6 +58,8 @@ protected function getEntityManager($name, $shardId = null)
             throw new InvalidArgumentException('Shards are not supported anymore using doctrine/dbal >= 3');
         }
 
+        assert($manager instanceof EntityManagerInterface);
+
         return $manager;
     }
 

src/Command/ImportMappingDoctrineCommand.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Driver\DatabaseDriver;
 use Doctrine\ORM\Tools\Console\MetadataFilter;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
@@ -13,6 +14,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+use function assert;
 use function chmod;
 use function dirname;
 use function file_put_contents;
@@ -88,6 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $namespaceOrBundle = $input->getArgument('name');
         if (isset($this->bundles[$namespaceOrBundle])) {
+            /** @phpstan-ignore method.notFound */
             $bundle    = $this->getApplication()->getKernel()->getBundle($namespaceOrBundle);
             $namespace = $bundle->getNamespace() . '\Entity';
 
@@ -118,20 +121,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $em = $this->getEntityManager($input->getOption('em'));
 
+        /* @phpstan-ignore method.notFound (Available in DBAL < 4) */
         $databaseDriver = new DatabaseDriver($em->getConnection()->getSchemaManager());
         $em->getConfiguration()->setMetadataDriverImpl($databaseDriver);
 
         $emName = $input->getOption('em');
         $emName = $emName ? $emName : 'default';
 
-        /* @phpstan-ignore class.notFound */
         $cmf = new DisconnectedClassMetadataFactory();
         $cmf->setEntityManager($em);
         $metadata = $cmf->getAllMetadata();
         $metadata = MetadataFilter::filter($metadata, $input->getOption('filter'));
         if ($metadata) {
             $output->writeln(sprintf('Importing mapping information from "<info>%s</info>" entity manager', $emName));
             foreach ($metadata as $class) {
+                assert($class instanceof ClassMetadata);
                 $className   = $class->name;
                 $class->name = $namespace . '\\' . $className;
                 if ($type === 'annotation') {

src/ConnectionFactory.php

@@ -117,7 +117,7 @@ public function createConnection(array $params, Configuration|null $config = nul
             $connection = DriverManager::getConnection(...array_merge([$params, $config], $eventManager ? [$eventManager] : []));
             $params     = $this->addDatabaseSuffix(array_merge($connection->getParams(), $overriddenOptions));
             $driver     = $connection->getDriver();
-            /** @psalm-suppress InvalidScalarArgument Bogus error, StaticServerVersionProvider implements Doctrine\DBAL\ServerVersionProvider  */
+            /** @phpstan-ignore arguments.count (DBAL < 4.x doesn't accept an argument) */
             $platform = $driver->getDatabasePlatform(
                 ...(class_exists(StaticServerVersionProvider::class)
                     ? [new StaticServerVersionProvider($params['serverVersion'] ?? $params['primary']['serverVersion'] ?? '')]

src/DependencyInjection/Configuration.php

@@ -272,6 +272,8 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                     ->prototype('array');
         $this->configureDbalDriverNode($replicaNode);
 
+        assert($node instanceof ArrayNodeDefinition);
+
         return $node;
     }
 
@@ -802,6 +804,8 @@ private function getOrmEntityManagersNode(): ArrayNodeDefinition
                 ->end()
             ->end();
 
+        assert($node instanceof ArrayNodeDefinition);
+
         return $node;
     }
 
@@ -828,6 +832,8 @@ private function getOrmCacheDriverNode(string $name): ArrayNodeDefinition
             $node->addDefaultsIfNotSet();
         }
 
+        assert($node instanceof ArrayNodeDefinition);
+
         return $node;
     }
 

src/Registry.php

@@ -6,8 +6,8 @@
 use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\Proxy;
 use ProxyManager\Proxy\LazyLoadingInterface;
-use Psr\Container\ContainerInterface;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
@@ -23,7 +23,7 @@ class Registry extends ManagerRegistry implements ResetInterface
      * @param string[] $connections
      * @param string[] $entityManagers
      */
-    public function __construct(ContainerInterface $container, array $connections, array $entityManagers, string $defaultConnection, string $defaultEntityManager)
+    public function __construct(Container $container, array $connections, array $entityManagers, string $defaultConnection, string $defaultEntityManager)
     {
         $this->container = $container;
 
@@ -51,7 +51,7 @@ public function getAliasNamespace($alias)
             }
 
             try {
-                /** @psalm-suppress UndefinedMethod ORM < 3 specific */
+                /** @phpstan-ignore method.notFound (ORM < 3 specific) */
                 return $objectManager->getConfiguration()->getEntityNamespace($alias);
             /* @phpstan-ignore class.notFound */
             } catch (ORMException) {

src/Repository/ServiceEntityRepositoryProxy.php

@@ -27,6 +27,7 @@
  */
 class ServiceEntityRepositoryProxy extends EntityRepository implements ServiceEntityRepositoryInterface
 {
+    /** @var EntityRepository<T> */
     private EntityRepository|null $repository = null;
 
     /** @param class-string<T> $entityClass The class name of the entity this repository manages */
@@ -111,11 +112,13 @@ protected function getClassMetadata(): ClassMetadata
         return ($this->repository ??= $this->resolveRepository())->getClassMetadata();
     }
 
+    /** @phpstan-return AbstractLazyCollection<int, T>&Selectable<int, T> */
     public function matching(Criteria $criteria): AbstractLazyCollection&Selectable
     {
         return ($this->repository ??= $this->resolveRepository())->matching($criteria);
     }
 
+    /** @return EntityRepository<T> */
     private function resolveRepository(): EntityRepository
     {
         $manager = $this->registry->getManagerForClass($this->entityClass);
@@ -127,6 +130,9 @@ private function resolveRepository(): EntityRepository
             ));
         }
 
-        return new EntityRepository($manager, $manager->getClassMetadata($this->entityClass));
+        /** @var ClassMetadata<T> $classMetadata */
+        $classMetadata = $manager->getClassMetadata($this->entityClass);
+
+        return new EntityRepository($manager, $classMetadata);
     }
 }

tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Repository/TestCustomClassRepoRepository.php

@@ -2,7 +2,7 @@
 
 namespace Fixtures\Bundles\RepositoryServiceBundle\Repository;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
 /**
@@ -11,7 +11,7 @@
  */
 class TestCustomClassRepoRepository extends EntityRepository
 {
-    public function getEntityManager(): EntityManager
+    public function getEntityManager(): EntityManagerInterface
     {
         return parent::getEntityManager();
     }