SA: Bump Psalm to level 5

DataCollector/DoctrineDataCollector.php

@@ -10,6 +10,7 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\SchemaValidator;
 use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
 use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector as BaseCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -102,6 +103,8 @@ public function collect(Request $request, Response $response, ?Throwable $except
                 $factory   = $em->getMetadataFactory();
                 $validator = new SchemaValidator($em);
 
+                assert($factory instanceof AbstractClassMetadataFactory);
+
                 foreach ($factory->getLoadedMetadata() as $class) {
                     assert($class instanceof ClassMetadataInfo);
                     if (isset($entities[$name][$class->getName()])) {

DependencyInjection/DoctrineExtension.php

@@ -946,6 +946,8 @@ private function loadValidatorLoader(string $entityManagerName, ContainerBuilder
     /**
      * @param array<string, mixed> $objectManager
      * @param string               $cacheName
+     *
+     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, $cacheName)
     {

DoctrineBundle.php

@@ -15,6 +15,7 @@
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterUidTypePass;
 use Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider\EntityFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
 use Symfony\Component\Console\Application;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -40,8 +41,11 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterEventListenersAndSubscribersPass('doctrine.connections', 'doctrine.dbal.%s_connection.event_manager', 'doctrine'), PassConfig::TYPE_BEFORE_OPTIMIZATION);
 
         if ($container->hasExtension('security')) {
-            /** @psalm-suppress MissingDependency We can safely assume here that if security extension exists, all security deps are installed  */
-            $container->getExtension('security')->addUserProviderFactory(new EntityFactory('entity', 'doctrine.orm.security.user.provider'));
+            $security = $container->getExtension('security');
+
+            if ($security instanceof SecurityExtension) {
+                $security->addUserProviderFactory(new EntityFactory('entity', 'doctrine.orm.security.user.provider'));
+            }
         }
 
         $container->addCompilerPass(new DoctrineValidationPass('orm'));

Mapping/ClassMetadataFactory.php

@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataFactory as BaseClassMetadataFactory;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 class ClassMetadataFactory extends BaseClassMetadataFactory
 {
@@ -16,7 +17,7 @@ protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonS
 
         $customGeneratorDefinition = $class->customGeneratorDefinition;
 
-        if (! isset($customGeneratorDefinition['instance'])) {
+        if (! isset($customGeneratorDefinition['instance']) || ! $class instanceof ClassMetadataInfo) {
             return;
         }
 

Mapping/MappingDriver.php

@@ -48,6 +48,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata): void
             $metadata->generatorType !== ClassMetadataInfo::GENERATOR_TYPE_CUSTOM
             || ! isset($metadata->customGeneratorDefinition['class'])
             || ! $this->idGeneratorLocator->has($metadata->customGeneratorDefinition['class'])
+            || ! $metadata instanceof ClassMetadataInfo
         ) {
             return;
         }

Registry.php

@@ -42,8 +42,14 @@ public function __construct(ContainerInterface $container, array $connections, a
     public function getAliasNamespace($alias)
     {
         foreach (array_keys($this->getManagers()) as $name) {
+            $objectManager = $this->getManager($name);
+
+            if (! $objectManager instanceof EntityManagerInterface) {
+                continue;
+            }
+
             try {
-                return $this->getManager($name)->getConfiguration()->getEntityNamespace($alias);
+                return $objectManager->getConfiguration()->getEntityNamespace($alias);
             } catch (ORMException $e) {
             }
         }

Tests/Command/CreateDatabaseDoctrineTest.php

@@ -117,6 +117,8 @@ public function provideShardOption(): Generator
     /**
      * @param mixed[]|null $params Connection parameters
      *
+     * @return MockObject&Container
+     *
      * @psalm-param Params $params
      */
     private function getMockContainer(string $connectionName, ?array $params = null): MockObject

Tests/Command/DropDatabaseDoctrineTest.php

@@ -3,13 +3,16 @@
 namespace Doctrine\Bundle\DoctrineBundle\Tests\Command;
 
 use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Exception;
+use Doctrine\Persistence\ManagerRegistry;
 use Generator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\DependencyInjection\Container;
 
 use function array_merge;
 use function class_exists;
@@ -140,20 +143,22 @@ public function provideIncompatibleDriverOptions(): Generator
     /**
      * @param list<mixed> $params Connection parameters
      *
+     * @return MockObject&Container
+     *
      * @psalm-param Params $params
      */
     private function getMockContainer(string $connectionName, array $params): MockObject
     {
         // Mock the container and everything you'll need here
-        $mockDoctrine = $this->getMockBuilder('Doctrine\Persistence\ManagerRegistry')
+        $mockDoctrine = $this->getMockBuilder(ManagerRegistry::class)
             ->getMock();
 
         $mockDoctrine->expects($this->any())
             ->method('getDefaultConnectionName')
             ->withAnyParameters()
             ->willReturn($connectionName);
 
-        $mockConnection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+        $mockConnection = $this->getMockBuilder(Connection::class)
             ->disableOriginalConstructor()
             ->setMethods(['getParams'])
             ->getMockForAbstractClass();
@@ -168,7 +173,7 @@ private function getMockContainer(string $connectionName, array $params): MockOb
             ->withAnyParameters()
             ->willReturn($mockConnection);
 
-        $mockContainer = $this->getMockBuilder('Symfony\Component\DependencyInjection\Container')
+        $mockContainer = $this->getMockBuilder(Container::class)
             ->setMethods(['get'])
             ->getMock();
 

composer.json

@@ -47,6 +47,7 @@
         "symfony/phpunit-bridge": "^5.2",
         "symfony/property-info": "^4.3.3|^5.0",
         "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0",
+        "symfony/security-bundle": "^4.4|5.0",
         "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0",
         "symfony/validator": "^3.4.30|^4.3.3|^5.0",
         "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0",

psalm.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="6"
+    errorLevel="5"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"