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

.github/expected-missing-return-types.diff

@@ -6,6 +6,24 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 (echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
 git checkout composer.json src/
 
+diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
+index f52a1ce1e9..1fb72535e1 100644
+--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
++++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
+@@ -285,5 +285,5 @@ class QueryMock extends AbstractQuery
+      * @return array|string
+      */
+-    public function getSQL()
++    public function getSQL(): array|string
+     {
+     }
+@@ -292,5 +292,5 @@ class QueryMock extends AbstractQuery
+      * @return Result|int
+      */
+-    protected function _doExecute()
++    protected function _doExecute(): Result|int
+     {
+     }
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
 index bb5560a7b5..be86cbf98e 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -167,7 +185,7 @@ index 6b1c6c5fbe..bb80ed461e 100644
 +    public function isFresh(ResourceInterface $resource, int $timestamp): bool;
  }
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index d4ec1be090..747e093b1b 100644
+index 41548a3e9d..f99739454f 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -215,5 +215,5 @@ class Application implements ResetInterface
@@ -276,7 +294,7 @@ index 2762cdf05c..737334268a 100644
 +    public function getName(): string;
  }
 diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
-index 893b3192e9..94822ed191 100644
+index 907c9f505c..3bfd23061a 100644
 --- a/src/Symfony/Component/Console/Helper/Table.php
 +++ b/src/Symfony/Component/Console/Helper/Table.php
 @@ -193,5 +193,5 @@ class Table
@@ -322,6 +340,17 @@ index 08bab02ee4..1181f0795e 100644
 +    protected function processValue(mixed $value, bool $isRoot = false): mixed
      {
          if (\is_array($value)) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
+index 895c155e07..3955c902d4 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
+@@ -33,5 +33,5 @@ class DefinitionErrorExceptionPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         try {
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
 index f5d33682ff..e644489097 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
@@ -595,10 +624,10 @@ index 1cb865fd66..f6f4efe7a7 100644
 +    public function getName(): string;
  }
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-index f77a99e0ff..a6829efa75 100644
+index fb84d96428..8ab979360a 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-@@ -457,5 +457,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+@@ -459,5 +459,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
       * @return Response
       */
 -    protected function forward(Request $request, bool $catch = false, Response $entry = null)
@@ -922,7 +951,7 @@ index 84a84ad1f3..6f66b6d32a 100644
 +    public function supportsDecoding(string $format): bool;
  }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 829e178407..1ac8101771 100644
+index e2b6c1bc8d..3c742d8cab 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -210,5 +210,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -947,7 +976,7 @@ index 829e178407..1ac8101771 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 7c4c5fb41b..840dd2bcdb 100644
+index 98ccfca4e4..0b1bc69b00 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -969,15 +998,15 @@ index 7c4c5fb41b..840dd2bcdb 100644
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
      {
-         if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
-@@ -287,5 +287,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+         if ($class !== $mappedClass = $this->getMappedClass($data, $class, $context)) {
+@@ -276,5 +276,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return string[]
       */
 -    abstract protected function extractAttributes(object $object, string $format = null, array $context = []);
 +    abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array;
 
      /**
-@@ -294,15 +294,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -283,15 +283,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return mixed
       */
 -    abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []);
@@ -997,7 +1026,7 @@ index 7c4c5fb41b..840dd2bcdb 100644
      {
          if (!isset($context['cache_key'])) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
-index ae3adbfe33..3a38429cf1 100644
+index 1786d6fff1..04a2e62ed2 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 @@ -45,5 +45,5 @@ interface DenormalizerInterface
@@ -1014,7 +1043,7 @@ index ae3adbfe33..3a38429cf1 100644
 +    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool;
  }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
-index 691e9c70f0..fc87f672e1 100644
+index cb43d78cc7..d215ffe997 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 @@ -37,5 +37,5 @@ interface NormalizerInterface
@@ -1090,10 +1119,10 @@ index ee1d68c78f..9baaabb04c 100644
      {
          return self::PROPERTY_CONSTRAINT;
 diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-index 9aa01a9dec..c18b07ac46 100644
+index 744a2cd720..b656f2885f 100644
 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-@@ -307,5 +307,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
+@@ -303,5 +303,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
       * @psalm-return T
       */
 -    abstract protected function createValidator();

src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php

@@ -22,7 +22,6 @@
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
 use Symfony\Component\Cache\Marshaller\MarshallerInterface;
@@ -87,7 +86,7 @@ public function __construct(Connection|string $connOrDsn, string $namespace = ''
                 $params = ['url' => $connOrDsn];
             }
 
-            $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration() : new Configuration();
+            $config = new Configuration();
             if (class_exists(DefaultSchemaManagerFactory::class)) {
                 $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
             }

src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -23,31 +25,98 @@
  */
 class DefinitionErrorExceptionPass extends AbstractRecursivePass
 {
-    protected function processValue(mixed $value, bool $isRoot = false): mixed
+    private $erroredDefinitions = [];
+    private $targetReferences = [];
+    private $sourceReferences = [];
+
+    /**
+     * @return void
+     */
+    public function process(ContainerBuilder $container)
     {
-        if (!$value instanceof Definition || !$value->hasErrors()) {
-            return parent::processValue($value, $isRoot);
-        }
+        try {
+            parent::process($container);
+
+            if (!$this->erroredDefinitions) {
+                return;
+            }
+
+            $runtimeIds = [];
+
+            foreach ($this->sourceReferences as $id => $sourceIds) {
+                foreach ($sourceIds as $sourceId => $isRuntime) {
+                    if (!$isRuntime) {
+                        continue 2;
+                    }
+                }
+
+                unset($this->erroredDefinitions[$id]);
+                $runtimeIds[$id] = $id;
+            }
+
+            if (!$this->erroredDefinitions) {
+                return;
+            }
+
+            foreach ($this->targetReferences as $id => $targetIds) {
+                if (!isset($this->sourceReferences[$id]) || isset($runtimeIds[$id]) || isset($this->erroredDefinitions[$id])) {
+                    continue;
+                }
+                foreach ($this->targetReferences[$id] as $targetId => $isRuntime) {
+                    foreach ($this->sourceReferences[$id] as $sourceId => $isRuntime) {
+                        if ($sourceId !== $targetId) {
+                            $this->sourceReferences[$targetId][$sourceId] = false;
+                            $this->targetReferences[$sourceId][$targetId] = false;
+                        }
+                    }
+                }
 
-        if ($isRoot && !$value->isPublic()) {
-            $graph = $this->container->getCompiler()->getServiceReferenceGraph();
-            $runtimeException = false;
-            foreach ($graph->getNode($this->currentId)->getInEdges() as $edge) {
-                if (!$edge->getValue() instanceof Reference || ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE !== $edge->getValue()->getInvalidBehavior()) {
-                    $runtimeException = false;
-                    break;
+                unset($this->sourceReferences[$id]);
+            }
+
+            foreach ($this->erroredDefinitions as $id => $definition) {
+                if (isset($this->sourceReferences[$id])) {
+                    continue;
                 }
-                $runtimeException = true;
+
+                // only show the first error so the user can focus on it
+                $errors = $definition->getErrors();
+
+                throw new RuntimeException(reset($errors));
             }
-            if ($runtimeException) {
-                return parent::processValue($value, $isRoot);
+        } finally {
+            $this->erroredDefinitions = [];
+            $this->targetReferences = [];
+            $this->sourceReferences = [];
+        }
+    }
+
+    protected function processValue(mixed $value, bool $isRoot = false): mixed
+    {
+        if ($value instanceof ArgumentInterface) {
+            parent::processValue($value->getValues());
+
+            return $value;
+        }
+
+        if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {
+            if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
+                $this->sourceReferences[$targetId][$this->currentId] ??= true;
+                $this->targetReferences[$this->currentId][$targetId] ??= true;
+            } else {
+                $this->sourceReferences[$targetId][$this->currentId] = false;
+                $this->targetReferences[$this->currentId][$targetId] = false;
             }
+
+            return $value;
+        }
+
+        if (!$value instanceof Definition || !$value->hasErrors()) {
+            return parent::processValue($value, $isRoot);
         }
 
-        // only show the first error so the user can focus on it
-        $errors = $value->getErrors();
-        $message = reset($errors);
+        $this->erroredDefinitions[$this->currentId] = $value;
 
-        throw new RuntimeException($message);
+        return parent::processValue($value);
     }
 }

src/Symfony/Component/DependencyInjection/Tests/Compiler/DefinitionErrorExceptionPassTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
 
 class DefinitionErrorExceptionPassTest extends TestCase
 {
@@ -49,4 +50,25 @@ public function testNoExceptionThrown()
         $pass->process($container);
         $this->assertSame($def, $container->getDefinition('foo_service_id')->getArgument(0));
     }
+
+    public function testSkipNestedErrors()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('nested_error', 'stdClass')
+            ->addError('Things went wrong!');
+
+        $container->register('bar', 'stdClass')
+            ->addArgument(new Reference('nested_error'));
+
+        $container->register('foo', 'stdClass')
+            ->addArgument(new Reference('bar', ContainerBuilder::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE));
+
+        $pass = new DefinitionErrorExceptionPass();
+        $pass->process($container);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Things went wrong!');
+        $container->get('foo');
+    }
 }

src/Symfony/Component/HttpClient/CurlHttpClient.php

@@ -459,6 +459,7 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_TIMEOUT_MS => 'max_duration',
             \CURLOPT_TIMEOUT => 'max_duration',
             \CURLOPT_MAXREDIRS => 'max_redirects',
+            \CURLOPT_POSTREDIR => 'max_redirects',
             \CURLOPT_PROXY => 'proxy',
             \CURLOPT_NOPROXY => 'no_proxy',
             \CURLOPT_SSL_VERIFYPEER => 'verify_peer',

src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php

@@ -15,7 +15,6 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\DBAL\Tools\DsnParser;
-use Doctrine\ORM\ORMSetup;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 
 /**
@@ -71,7 +70,7 @@ public static function createHandler(object|string $connection, array $options =
                 }
                 $connection[3] = '-';
                 $params = class_exists(DsnParser::class) ? (new DsnParser())->parse($connection) : ['url' => $connection];
-                $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+                $config = new Configuration();
                 if (class_exists(DefaultSchemaManagerFactory::class)) {
                     $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
                 }

src/Symfony/Component/Lock/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());
             }

src/Symfony/Component/Lock/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());
             }

src/Symfony/Component/Lock/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());
         }