Merge branch '5.4' into 6.2

* 5.4:
  [DependencyInjection] Skip errored definitions deep-referenced as runtime exceptions
  [Messenger] Preserve existing Doctrine schema
  [HttpClient] Explicitly exclude CURLOPT_POSTREDIR

Author: nicolas-grekas

Store/DoctrineDbalPostgreSqlStore.php

@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Lock\BlockingSharedLockStoreInterface;
 use Symfony\Component\Lock\BlockingStoreInterface;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
@@ -69,7 +68,7 @@ public function __construct(Connection|string $connOrUrl)
                 $params = ['url' => $this->filterDsn($connOrUrl)];
             }
 
-            $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration() : new Configuration();
+            $config = new Configuration();
             if (class_exists(DefaultSchemaManagerFactory::class)) {
                 $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
             }

Store/DoctrineDbalStore.php

@@ -20,7 +20,6 @@
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
@@ -88,7 +87,7 @@ public function __construct(Connection|string $connOrUrl, array $options = [], f
                 $params = ['url' => $connOrUrl];
             }
 
-            $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration() : new Configuration();
+            $config = new Configuration();
             if (class_exists(DefaultSchemaManagerFactory::class)) {
                 $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
             }

Tests/Store/DoctrineDbalPostgreSqlStoreTest.php

@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
@@ -173,7 +172,7 @@ public function testWaitAndSaveReadAfterConflictReleasesLockFromInternalStore()
     private static function getDbalConnection(string $dsn): Connection
     {
         $params = class_exists(DsnParser::class) ? (new DsnParser(['sqlite' => 'pdo_sqlite']))->parse($dsn) : ['url' => $dsn];
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = new Configuration();
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }

Tests/Store/DoctrineDbalStoreTest.php

@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;
@@ -39,7 +38,7 @@ public static function setUpBeforeClass(): void
     {
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
 
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = new Configuration();
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
@@ -60,7 +59,7 @@ protected function getClockDelay()
 
     public function getStore(): PersistingStoreInterface
     {
-        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config = new Configuration();
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }