Merge pull request #1754 from doctrine/2.11.x-merge-up-into-2.12.x_anhFL93S

ostrolucky · web-flow · commit 309f5f4feebd · 2024-02-11T10:42:37.000+01:00
diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -10,7 +10,6 @@
 use Throwable;
 
 use function in_array;
-use function method_exists;
 use function sprintf;
 
 /**
@@ -62,13 +61,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // Need to get rid of _every_ occurrence of dbname from connection configuration and we have already extracted all relevant info from url
+        /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
         unset($params['dbname'], $params['path'], $params['url']);
 
-        $tmpConnection = DriverManager::getConnection($params, $connection->getConfiguration());
-
-        $schemaManager           = method_exists($tmpConnection, 'createSchemaManager')
-            ? $tmpConnection->createSchemaManager()
-            : $tmpConnection->getSchemaManager();
+        $tmpConnection           = DriverManager::getConnection($params, $connection->getConfiguration());
+        $schemaManager           = $tmpConnection->createSchemaManager();
         $shouldNotCreateDatabase = $ifNotExists && in_array($name, $schemaManager->listDatabases());
 
         // Only quote if we don't have a path
diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -29,6 +29,8 @@ public function __construct(ManagerRegistry $doctrine)
      * get a doctrine entity generator
      *
      * @return EntityGenerator
+     *
+     * @psalm-suppress UndefinedDocblockClass ORM < 3 specific
      */
     protected function getEntityGenerator()
     {
diff --git a/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php
@@ -3,7 +3,7 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Schema\SqliteSchemaManager;
+use Doctrine\DBAL\Schema\SQLiteSchemaManager;
 use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -12,7 +12,6 @@
 
 use function file_exists;
 use function in_array;
-use function method_exists;
 use function sprintf;
 use function unlink;
 
@@ -73,6 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             throw new InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be dropped.");
         }
 
+        /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
         unset($params['dbname'], $params['url']);
 
         if (! $input->getOption('force')) {
@@ -89,9 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // as some vendors do not allow dropping the database connected to.
         $connection->close();
         $connection         = DriverManager::getConnection($params, $connection->getConfiguration());
-        $schemaManager      = method_exists($connection, 'createSchemaManager')
-            ? $connection->createSchemaManager()
-            : $connection->getSchemaManager();
+        $schemaManager      = $connection->createSchemaManager();
         $shouldDropDatabase = ! $ifExists || in_array($name, $schemaManager->listDatabases());
 
         // Only quote if we don't have a path
@@ -101,7 +99,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         try {
             if ($shouldDropDatabase) {
-                if ($schemaManager instanceof SqliteSchemaManager) {
+                /** @psalm-suppress TypeDoesNotContainType Bogus error, Doctrine\DBAL\Schema\AbstractSchemaManager<Doctrine\DBAL\Platforms\AbstractPlatform> does contain Doctrine\DBAL\Schema\SQLiteSchemaManager */
+                if ($schemaManager instanceof SQLiteSchemaManager) {
                     // dropDatabase() is deprecated for Sqlite
                     $connection->close();
                     if (file_exists($name)) {
diff --git a/Command/Proxy/ConvertMappingDoctrineCommand.php b/Command/Proxy/ConvertMappingDoctrineCommand.php
@@ -15,6 +15,8 @@
  * formats.
  *
  * @deprecated use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand instead
+ *
+ * @psalm-suppress UndefinedClass ORM < 3
  */
 class ConvertMappingDoctrineCommand extends ConvertMappingCommand
 {
diff --git a/Command/Proxy/DoctrineCommandHelper.php b/Command/Proxy/DoctrineCommandHelper.php
@@ -28,6 +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 */
         $helperSet->set(new EntityManagerHelper($em), 'em');
 
         trigger_deprecation(
diff --git a/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php b/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php
@@ -9,6 +9,8 @@
  * Ensure the Doctrine ORM is configured properly for a production environment.
  *
  * @deprecated use Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand instead
+ *
+ * @psalm-suppress UndefinedClass ORM < 3 specific
  */
 class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCommand
 {
diff --git a/ConnectionFactory.php b/ConnectionFactory.php
@@ -118,7 +118,8 @@ public function createConnection(array $params, ?Configuration $config = null, ?
             $connection = DriverManager::getConnection(...array_merge([$params, $config], $eventManager ? [$eventManager] : []));
             $params     = $this->addDatabaseSuffix(array_merge($connection->getParams(), $overriddenOptions));
             $driver     = $connection->getDriver();
-            $platform   = $driver->getDatabasePlatform(
+            /** @psalm-suppress InvalidScalarArgument Bogus error, StaticServerVersionProvider implements Doctrine\DBAL\ServerVersionProvider  */
+            $platform = $driver->getDatabasePlatform(
                 ...(class_exists(StaticServerVersionProvider::class) ? [new StaticServerVersionProvider($params['serverVersion'] ?? '')] : []),
             );
 
@@ -250,6 +251,7 @@ private function addDatabaseSuffix(array $params): array
      */
     private function parseDatabaseUrl(array $params): array
     {
+        /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
         if (! isset($params['url'])) {
             return $params;
         }
diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
@@ -5,7 +5,7 @@
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\OraclePlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Exception;
 use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector;
@@ -64,7 +64,7 @@ public function explainAction($token, $connectionName, $query)
         assert($connection instanceof Connection);
         try {
             $platform = $connection->getDatabasePlatform();
-            if ($platform instanceof SqlitePlatform) {
+            if ($platform instanceof SQLitePlatform) {
                 $results = $this->explainSQLitePlatform($connection, $query);
             } elseif ($platform instanceof SQLServerPlatform) {
                 throw new Exception('Explain for SQLServerPlatform is currently not supported. Contributions are welcome.');
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -6,7 +6,6 @@
 use Doctrine\ORM\Cache\CacheConfiguration;
 use Doctrine\ORM\Cache\Logging\CacheLoggerChain;
 use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger;
-use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Tools\SchemaValidator;
@@ -122,8 +121,7 @@ public function collect(Request $request, Response $response, ?Throwable $except
                 }
             }
 
-            $emConfig = $em->getConfiguration();
-            assert($emConfig instanceof Configuration);
+            $emConfig   = $em->getConfiguration();
             $slcEnabled = $emConfig->isSecondLevelCacheEnabled();
 
             if (! $slcEnabled) {
diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -68,7 +68,7 @@ public function __construct($driver, array $namespaces, array $managerParameters
     public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [], bool $enableXsdValidation = false)
     {
         $locator = new Definition(SymfonyFileLocator::class, [$namespaces, '.orm.xml']);
-        $driver  = new Definition(XmlDriver::class, [$locator, null, $enableXsdValidation]);
+        $driver  = new Definition(XmlDriver::class, [$locator, XmlDriver::DEFAULT_FILE_EXTENSION, $enableXsdValidation]);
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }
diff --git a/ManagerConfigurator.php b/ManagerConfigurator.php
@@ -45,12 +45,7 @@ private function enableFilters(EntityManagerInterface $entityManager): void
 
         $filterCollection = $entityManager->getFilters();
         foreach ($this->enabledFilters as $filter) {
-            $filterObject = $filterCollection->enable($filter);
-            if ($filterObject === null) {
-                continue;
-            }
-
-            $this->setFilterParameters($filter, $filterObject);
+            $this->setFilterParameters($filter, $filterCollection->enable($filter));
         }
     }
 
diff --git a/Mapping/DisconnectedMetadataFactory.php b/Mapping/DisconnectedMetadataFactory.php
@@ -10,11 +10,7 @@
 use RuntimeException;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
-use function array_pop;
-use function class_exists;
 use function dirname;
-use function explode;
-use function implode;
 use function sprintf;
 use function str_replace;
 use function strpos;
@@ -110,22 +106,9 @@ public function getNamespaceMetadata($namespace, $path = null)
      */
     public function findNamespaceAndPathForMetadata(ClassMetadataCollection $metadata, $path = null)
     {
-        $all = $metadata->getMetadata();
-        if (class_exists($all[0]->name)) {
-            $r    = new ReflectionClass($all[0]->name);
-            $path = $this->getBasePathForClass($r->getName(), $r->getNamespaceName(), dirname($r->getFilename()));
-            $ns   = $r->getNamespaceName();
-        } elseif ($path) {
-            // Get namespace by removing the last component of the FQCN
-            $nsParts = explode('\\', $all[0]->name);
-            array_pop($nsParts);
-            $ns = implode('\\', $nsParts);
-        } else {
-            throw new RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $all[0]->name));
-        }
-
-        $metadata->setPath($path);
-        $metadata->setNamespace($ns);
+        $r = new ReflectionClass($metadata->getMetadata()[0]->name);
+        $metadata->setPath($this->getBasePathForClass($r->getName(), $r->getNamespaceName(), dirname($r->getFilename())));
+        $metadata->setNamespace($r->getNamespaceName());
     }
 
     /**
diff --git a/Registry.php b/Registry.php
@@ -51,6 +51,7 @@ public function getAliasNamespace($alias)
             }
 
             try {
+                /** @psalm-suppress UndefinedMethod ORM < 3 specific */
                 return $objectManager->getConfiguration()->getEntityNamespace($alias);
             } catch (ORMException $e) {
             }
diff --git a/Repository/RepositoryFactoryCompatibility.php b/Repository/RepositoryFactoryCompatibility.php
@@ -21,8 +21,6 @@ trait RepositoryFactoryCompatibility
          * @return EntityRepository<T>
          *
          * @template T of object
-         *
-         * @psalm-suppress MethodSignatureMismatch
          */
         public function getRepository(EntityManagerInterface $entityManager, string $entityName): EntityRepository
         {
diff --git a/Repository/ServiceEntityRepositoryProxy.php b/Repository/ServiceEntityRepositoryProxy.php
@@ -41,21 +41,18 @@ public function __construct(
         $this->repository = $this->resolveRepository();
     }
 
-    /** @psalm-suppress MethodSignatureMismatch This proxy is used only in combination with newer parent class */
     public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
     {
         return ($this->repository ??= $this->resolveRepository())
             ->createQueryBuilder($alias, $indexBy);
     }
 
-    /** @psalm-suppress MethodSignatureMismatch This proxy is used only in combination with newer parent class */
     public function createResultSetMappingBuilder(string $alias): ResultSetMappingBuilder
     {
         return ($this->repository ??= $this->resolveRepository())
             ->createResultSetMappingBuilder($alias);
     }
 
-    /** @psalm-suppress MethodSignatureMismatch This proxy is used only in combination with newer parent class */
     public function find(mixed $id, LockMode|int|null $lockMode = null, int|null $lockVersion = null): object|null
     {
         /** @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class */
@@ -67,7 +64,6 @@ public function find(mixed $id, LockMode|int|null $lockMode = null, int|null $lo
      * {@inheritDoc}
      *
      * @psalm-suppress InvalidReturnStatement This proxy is used only in combination with newer parent class
-     * @psalm-suppress MethodSignatureMismatch This proxy is used only in combination with newer parent class
      * @psalm-suppress InvalidReturnType This proxy is used only in combination with newer parent class
      */
     public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
@@ -92,8 +88,6 @@ public function count(array $criteria = []): int
 
     /**
      * {@inheritDoc}
-     *
-     * @psalm-suppress MethodSignatureMismatch This proxy is used only in combination with newer parent class
      */
     public function __call(string $method, array $arguments): mixed
     {
diff --git a/Tests/Command/DropDatabaseDoctrineTest.php b/Tests/Command/DropDatabaseDoctrineTest.php
@@ -38,6 +38,7 @@ public function testExecute(array $options): void
             'driver' => 'pdo_sqlite',
         ];
 
+        /** @psalm-suppress InvalidArgument Need to be compatible with DBAL < 4, which still has `$params['url']` */
         $container = $this->getMockContainer($connectionName, $params);
 
         $application = new Application();
diff --git a/Tests/ConnectionFactoryTest.php b/Tests/ConnectionFactoryTest.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Bundle\DoctrineBundle\Tests;
 
 use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
-use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
@@ -110,6 +109,7 @@ public function testConnectionOverrideOptions(): void
 
     public function testConnectionCharsetFromUrl()
     {
+        /** @psalm-suppress InvalidArgument Need to be compatible with DBAL < 4, which still has `$params['url']` */
         $connection = (new ConnectionFactory([]))->createConnection(
             ['url' => 'mysql://root:password@database:3306/main?charset=utf8mb4_unicode_ci'],
             $this->configuration,
@@ -169,10 +169,10 @@ class FakeConnection extends Connection
     /**
      * {@inheritDoc}
      */
-    public function __construct(array $params, Driver $driver, ?Configuration $config = null, ?EventManager $eventManager = null)
+    public function __construct(array $params, Driver $driver, ?Configuration $config = null)
     {
         ++self::$creationCount;
 
-        parent::__construct($params, $driver, $config, $eventManager);
+        parent::__construct($params, $driver, $config);
     }
 }
diff --git a/Tests/DataCollector/DoctrineDataCollectorTest.php b/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Bundle\DoctrineBundle\Tests\DataCollector;
 
 use Doctrine\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector;
-use Doctrine\DBAL\Logging\DebugStack;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -17,7 +16,6 @@
 use Symfony\Component\HttpFoundation\Response;
 
 use function interface_exists;
-use function method_exists;
 
 class DoctrineDataCollectorTest extends TestCase
 {
@@ -130,48 +128,6 @@ public function testGetGroupedQueries(): void
         $this->assertSame(1, $groupedQueries['default'][1]['count']);
     }
 
-    /** @group legacy */
-    public function testGetGroupedQueriesWithDeprecatedDebugStackLogger(): void
-    {
-        if (! method_exists(DoctrineDataCollector::class, 'addLogger')) {
-            $this->markTestSkipped('This test requires symfony < 7.0');
-        }
-
-        $logger            = $this->getMockBuilder(DebugStack::class)->getMock();
-        $logger->queries   = [];
-        $logger->queries[] = [
-            'sql' => 'SELECT * FROM foo WHERE bar = :bar',
-            'params' => [':bar' => 1],
-            'types' => null,
-            'executionMS' => 32,
-        ];
-        $logger->queries[] = [
-            'sql' => 'SELECT * FROM foo WHERE bar = :bar',
-            'params' => [':bar' => 2],
-            'types' => null,
-            'executionMS' => 25,
-        ];
-        $collector         = $this->createCollector([]);
-        $collector->addLogger('default', $logger);
-        $collector->collect(new Request(), new Response());
-        $groupedQueries = $collector->getGroupedQueries();
-        $this->assertCount(1, $groupedQueries['default']);
-        $this->assertSame('SELECT * FROM foo WHERE bar = :bar', $groupedQueries['default'][0]['sql']);
-        $this->assertSame(2, $groupedQueries['default'][0]['count']);
-
-        $logger->queries[] = [
-            'sql' => 'SELECT * FROM bar',
-            'params' => [],
-            'types' => null,
-            'executionMS' => 25,
-        ];
-        $collector->collect(new Request(), new Response());
-        $groupedQueries = $collector->getGroupedQueries();
-        $this->assertCount(2, $groupedQueries['default']);
-        $this->assertSame('SELECT * FROM bar', $groupedQueries['default'][1]['sql']);
-        $this->assertSame(1, $groupedQueries['default'][1]['count']);
-    }
-
     private function createEntityMetadata(string $entityFQCN): ClassMetadata
     {
         $metadata            = new ClassMetadata($entityFQCN);
diff --git a/Tests/Mapping/ContainerEntityListenerResolverTest.php b/Tests/Mapping/ContainerEntityListenerResolverTest.php
@@ -128,7 +128,6 @@ public function testRegisterStringException(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('An object was expected, but got "string".');
-        /** @psalm-suppress InvalidArgument */
         $this->resolver->register('CompanyContractListener');
     }
 }
diff --git a/Tests/Mapping/DisconnectedMetadataFactoryTest.php b/Tests/Mapping/DisconnectedMetadataFactoryTest.php
diff --git a/psalm.xml.dist b/psalm.xml.dist

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public function __construct(ManagerRegistry $doctrine)`
`29`	`29`	`* get a doctrine entity generator`
`30`	`30`	`*`
`31`	`31`	`* @return EntityGenerator`
	`32`	`+ *`
	`33`	`+ * @psalm-suppress UndefinedDocblockClass ORM < 3 specific`
`32`	`34`	`*/`
`33`	`35`	`protected function getEntityGenerator()`
`34`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* formats.`
`16`	`16`	`*`
`17`	`17`	`* @deprecated use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand instead`
	`18`	`+ *`
	`19`	`+ * @psalm-suppress UndefinedClass ORM < 3`
`18`	`20`	`*/`
`19`	`21`	`class ConvertMappingDoctrineCommand extends ConvertMappingCommand`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`* Ensure the Doctrine ORM is configured properly for a production environment.`
`10`	`10`	`*`
`11`	`11`	`* @deprecated use Doctrine\ORM\Tools\Console\Command\EnsureProductionSettingsCommand instead`
	`12`	`+ *`
	`13`	`+ * @psalm-suppress UndefinedClass ORM < 3 specific`
`12`	`14`	`*/`
`13`	`15`	`class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCommand`
`14`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function __construct($driver, array $namespaces, array $managerParameters`
`68`	`68`	`public static function createXmlMappingDriver(array $namespaces, array $managerParameters = [], $enabledParameter = false, array $aliasMap = [], bool $enableXsdValidation = false)`
`69`	`69`	`{`
`70`	`70`	`$locator = new Definition(SymfonyFileLocator::class, [$namespaces, '.orm.xml']);`
`71`		`- $driver = new Definition(XmlDriver::class, [$locator, null, $enableXsdValidation]);`
	`71`	`+ $driver = new Definition(XmlDriver::class, [$locator, XmlDriver::DEFAULT_FILE_EXTENSION, $enableXsdValidation]);`
`72`	`72`
`73`	`73`	`return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);`
`74`	`74`	`}`