Merge remote-tracking branch 'origin/2.11.x' into 2.12.x

Author: ostrolucky

.github/workflows/static-analysis.yml

@@ -31,4 +31,4 @@ jobs:
         uses: "ramsey/composer-install@v2"
 
       - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --find-unused-psalm-suppress"
+        run: "vendor/bin/psalm --show-info=false --stats --output-format=github --find-unused-psalm-suppress"

Command/CreateDatabaseDoctrineCommand.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -60,10 +61,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             throw new InvalidArgumentException("Connection does not contain a 'path' or 'dbname' parameter and cannot be created.");
         }
 
-        // Need to get rid of _every_ occurrence of dbname from connection configuration and we have already extracted all relevant info from url
+        // Need to get rid of _every_ occurrence of dbname from connection configuration as 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']);
 
+        if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            $params['dbname'] = 'postgres';
+        }
+
         $tmpConnection           = DriverManager::getConnection($params, $connection->getConfiguration());
         $schemaManager           = $tmpConnection->createSchemaManager();
         $shouldNotCreateDatabase = $ifNotExists && in_array($name, $schemaManager->listDatabases());

Command/DropDatabaseDoctrineCommand.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command;
 
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\SQLiteSchemaManager;
 use InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
@@ -75,6 +76,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @psalm-suppress InvalidArrayOffset Need to be compatible with DBAL < 4, which still has `$params['url']` */
         unset($params['dbname'], $params['url']);
 
+        if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            $params['dbname'] = 'postgres';
+        }
+
         if (! $input->getOption('force')) {
             $output->writeln('<error>ATTENTION:</error> This operation should not be executed in a production environment.');
             $output->writeln('');

DependencyInjection/DoctrineExtension.php

@@ -1136,7 +1136,6 @@ private function loadMessengerServices(ContainerBuilder $container): void
     {
         // If the Messenger component is installed, wire it:
 
-        /** @psalm-suppress UndefinedClass Optional dependency */
         if (! interface_exists(MessageBusInterface::class)) {
             return;
         }

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -988,7 +988,6 @@ public function testAnnotationsBundleMappingDetectionWithVendorNamespace(): void
 
     public function testMessengerIntegration(): void
     {
-        /** @psalm-suppress UndefinedClass */
         if (! interface_exists(MessageBusInterface::class)) {
             $this->markTestSkipped('Symfony Messenger component is not installed');
         }
@@ -1014,7 +1013,6 @@ public function testMessengerIntegration(): void
 
     public function testMessengerIntegrationWithDoctrineTransport(): void
     {
-        /** @psalm-suppress UndefinedClass */
         if (! interface_exists(MessageBusInterface::class)) {
             $this->markTestSkipped('Symfony Messenger component is not installed');
         }
@@ -1046,7 +1044,6 @@ public function testMessengerIntegrationWithDoctrineTransport(): void
 
     public function testMessengerIntegrationWithoutDoctrineTransport(): void
     {
-        /** @psalm-suppress UndefinedClass */
         if (! interface_exists(MessageBusInterface::class)) {
             $this->markTestSkipped('Symfony Messenger component is not installed');
         }