From cbd670f5afa2427b0bf5beb58c648418386e9b07 Mon Sep 17 00:00:00 2001
From: Massimiliano Arione <garakkio@gmail.com>
Date: Sat, 11 Dec 2021 16:37:28 +0100
Subject: [PATCH 01/56] add nonces to profiler

---
 .../Controller/ProfilerController.php              | 14 +++++++-------
 .../Resources/views/Profiler/base.html.twig        |  4 ++--
 .../Tests/Controller/ProfilerControllerTest.php    |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index ac65e506f6e6b..5872a9e07c1ac 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -88,7 +88,7 @@ public function panelAction(Request $request, $token)
         }
 
         if (!$profile = $this->profiler->loadProfile($token)) {
-            return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', ['about' => 'no_token', 'token' => $token, 'request' => $request]), 200, ['Content-Type' => 'text/html']);
+            return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/info.html.twig', ['about' => 'no_token', 'token' => $token, 'request' => $request]);
         }
 
         if (null === $panel) {
@@ -111,7 +111,7 @@ public function panelAction(Request $request, $token)
             throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
         }
 
-        return new Response($this->twig->render($this->getTemplateManager()->getName($profile, $panel), [
+        return $this->renderWithCspNonces($request, $this->getTemplateManager()->getName($profile, $panel), [
             'token' => $token,
             'profile' => $profile,
             'collector' => $profile->getCollector($panel),
@@ -121,7 +121,7 @@ public function panelAction(Request $request, $token)
             'templates' => $this->getTemplateManager()->getNames($profile),
             'is_ajax' => $request->isXmlHttpRequest(),
             'profiler_markup_version' => 2, // 1 = original profiler, 2 = Symfony 2.8+ profiler
-        ]), 200, ['Content-Type' => 'text/html']);
+        ]);
     }
 
     /**
@@ -252,7 +252,7 @@ public function searchResultsAction(Request $request, $token)
         $end = $request->query->get('end', null);
         $limit = $request->query->get('limit');
 
-        return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', [
+        return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/results.html.twig', [
             'request' => $request,
             'token' => $token,
             'profile' => $profile,
@@ -265,7 +265,7 @@ public function searchResultsAction(Request $request, $token)
             'end' => $end,
             'limit' => $limit,
             'panel' => null,
-        ]), 200, ['Content-Type' => 'text/html']);
+        ]);
     }
 
     /**
@@ -367,11 +367,11 @@ public function openAction(Request $request)
             throw new NotFoundHttpException(sprintf('The file "%s" cannot be opened.', $file));
         }
 
-        return new Response($this->twig->render('@WebProfiler/Profiler/open.html.twig', [
+        return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/open.html.twig', [
             'filename' => $filename,
             'file' => $file,
             'line' => $line,
-         ]), 200, ['Content-Type' => 'text/html']);
+        ]);
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
index 0b13f57509a25..eee81b8311c76 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
@@ -8,13 +8,13 @@
         <link rel="icon" type="image/x-icon" sizes="16x16" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFEUlEQVR4AZVXA4wm2RMf27bXDM/+3/+sYBGfrbVtezc6BWtzfPbYXtvDL9906t6v0vWl05me7q1JzXuvvu4yXnvZgJ9hH6bwZYXLFR739vauUGuDwhq1L1N4Uv/tRYUhFjwcg49hn6aYr1V4TiGp86CoP9Oh1tV414KnM6t9fHymKUZ3DAI0hW4b1AyK3lE8phh5OxWeoJgUGhi5mLm95YzBwcHuhIQEV1JSEoWGhoKWHxYWFmenhJ/B5W0GwZpDt5Ovry9lZWWRyWOu5ORk7JsUpogsq5gnmISTU+HKQoLFQv/qq6/os88+I+EVFRUlSsRZ5oRiVmwlXMWShQkahUdERJCfnx/vd+3aRTU1NXTixAmqrq6mK1eu0PTp05mnrmD+QK6XhLO0XP2O2FJAQICRjjMU4P1PP/1EfX19NGfOHM8Z0N7ezueQkBBXYGAgSWIaQ5Em2T5QzFNSUig9PV3OHOe4uDjZ87p//34C7Nm7x/NcRUUFAX799Vec8Y7m7+8Pz92SfBDXr7VwPYRbxn/MmDG8Tps2jQBd3V30/PPPe35/6qmnaPXq1TR69Gg+h4eHiwwosdLT4dBkQDSXWmJiIq/vv/8+/fvvv3ThwgWqr6+n/Px8oyCmAerq6jy03Nxc2Yv7ySSjQzrmi4i92fVpaWlYOZ79/f2MW7dtpSlTptDp06epo6ODPvroI850ASiGdyZOnEjXrl2jyspKT4XA9cgjkaPL/D8UWG62HokieyQQoKSkRGiMs2bNotraWmprayOBNWvWyO+scGdnp5zF/WYvLEb8TwpRykp1MV7feust6uzqJMD169fpueeeY/rDDz/MKzzgdrsJoGkaffvtt/TFF19wQsIDmzZtssojt+6Fo1CgzKiAvAB3DRs2jAULtLS0eErPGB5Ad3c3lZaWUnFxMfeAd955h5+JjY3FaqXAPwhBnRCNySK4b98+Aoilv/z6i/zGggSk1g0opWupAMvGP91yt96zadWqVdTc3Ezz58/31LOAy+US6zgHBP766y+mDR8+HBUgFWSnQI2EAFnqlpcaGxsJIFkMN8L9AnPnzmX6jRs3SACeAi0vL888JwYPgTEJpauhnADo6/LSgQMHCHD37l2Cp15//XXq7eslgKb+Fi1exM9lZmbaCDclIcpQQhATE4OVsrOzuamg+cyePZuzG64Hrlu3jp9ZuWolCdy+fZueeOIJpkdHR1sLHqgM0Yh0bTRz1m7fvp2KiopYkYKCApo8ebLZIwzlFeXSOXEnsLPe2Ij+p5DbYYdOdOtDQ0rNjFya5sTcsGGDcTDZoXTcNoVBMoxWyzDS2yXmOyeUtGSskmDjx4/nRgPAfBDmMpZtUIbRcsi2GsfSD2QYyd2OcdmyZSSwdu1apuXk5GB16v4bak0yX0imyIUEgwNovFTglhMZGcm0srIy43zAVUxuTLbW4xn17Fci23wly9dngUummrTaixcvMpOtW7fiiBwQpqKYU9efHuxDJE5hC9wvL9TW1RLg+PHjPGTQ8wsLC4WpDC5Y5UR4k5qKMSLT6lqeAiX0nuAaMmSI9sMPP9CZM2foyJEj9O677wpTVIuTjidNp0HibvttoH9E5OMqbWKkSaNSlojldoLF7TEP+nUEmKI62y1kOBINbVaNarcI0PuGGUlHyfYvLHg7/jhFSFYqZh0P8KHSptd5ksOPU3tvqAEUot/hFmOIYJLp87wGe9Dwm95eg5xa/R8G6d8U5EcFhwAAAABJRU5ErkJggg==">
 
         {% block head %}
-            <style>
+            <style{% if csp_style_nonce is defined and csp_style_nonce %} nonce="{{ csp_style_nonce }}"{% endif %}">
                 {{ include('@WebProfiler/Profiler/profiler.css.twig') }}
             </style>
         {% endblock %}
     </head>
     <body>
-        <script>
+        <script{% if csp_script_nonce is defined and csp_script_nonce %} nonce="{{ csp_script_nonce }}"{% endif %}">
             document.body.classList.add(
                 localStorage.getItem('symfony/profiler/theme') || (matchMedia('(prefers-color-scheme: dark)').matches ? 'theme-dark' : 'theme-light'),
                 localStorage.getItem('symfony/profiler/width') || 'width-normal'
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
index 9115fc795e087..661717dfcad2b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -285,6 +285,8 @@ public function testSearchResultsAction($withCsp)
                 'limit' => 2,
                 'panel' => null,
                 'request' => $request,
+                'csp_script_nonce' => $withCsp ? 'dummy_nonce' : null,
+                'csp_style_nonce' => $withCsp ? 'dummy_nonce' : null,
             ]));
 
         $response = $controller->searchResultsAction($request, 'empty');

From 4e296722545779411cff27a08d07eccdfd465462 Mon Sep 17 00:00:00 2001
From: Giorgio Premi <giorgio.premi@libraesva.com>
Date: Wed, 29 Dec 2021 12:22:26 +0100
Subject: [PATCH 02/56] MailerInterface: failed exception contract when
 enabling messenger

The interface for MailerInterface::send states that exception for
transport failures are sent as TransportExceptionInterface, which
make perfectly sense and allows to create solid UI.

If at later stage the Messenger component is enabled, the mail will
be rewired into a dispatched message, which by default is synchronous.
This cause all exception to be wrapped into HandlerFailedException
which doesn't the interface contract.

In the end the UI is broken, and the exception HandlerFailedException,
even if caught, is totally unrelated to the usage context as it is only
related to configuration details.

This patch will unwrap the underlying MailTransportInterface exception
if available for the handler exception.
---
 src/Symfony/Component/Mailer/Mailer.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php
index 260989e72166a..2458544141cd3 100644
--- a/src/Symfony/Component/Mailer/Mailer.php
+++ b/src/Symfony/Component/Mailer/Mailer.php
@@ -13,8 +13,10 @@
 
 use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\Messenger\SendEmailMessage;
 use Symfony\Component\Mailer\Transport\TransportInterface;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Mime\RawMessage;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -50,6 +52,15 @@ public function send(RawMessage $message, Envelope $envelope = null): void
             $this->dispatcher->dispatch($event);
         }
 
-        $this->bus->dispatch(new SendEmailMessage($message, $envelope));
+        try {
+            $this->bus->dispatch(new SendEmailMessage($message, $envelope));
+        } catch (HandlerFailedException $e) {
+            foreach ($e->getNestedExceptions() as $nested) {
+                if ($nested instanceof TransportExceptionInterface) {
+                    throw $nested;
+                }
+            }
+            throw $e;
+        }
     }
 }

From aac10136097b92e6bd03043525b235f31ea480f1 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Mon, 9 Aug 2021 18:38:29 +0200
Subject: [PATCH 03/56] [Validator][Tests] Fix AssertingContextualValidator not
 throwing on remaining expectations

---
 .../Test/ConstraintValidatorTestCase.php      | 17 ++++-
 .../Test/ConstraintValidatorTestCaseTest.php  | 71 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php

diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
index 087bbf140fb2a..1d75a6bb3b026 100644
--- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -391,6 +391,17 @@ class AssertingContextualValidator implements ContextualValidatorInterface
     private $validateCalls = -1;
     private $expectedValidate = [];
 
+    public function __destruct()
+    {
+        if ($this->expectedAtPath) {
+            throw new ExpectationFailedException('Some expected validation calls for paths were not done.');
+        }
+
+        if ($this->expectedValidate) {
+            throw new ExpectationFailedException('Some expected validation calls for values were not done.');
+        }
+    }
+
     public function atPath($path)
     {
     }
@@ -403,7 +414,10 @@ public function doAtPath($path)
             throw new ExpectationFailedException(sprintf('Validation for property path "%s" was not expected.', $path));
         }
 
-        Assert::assertSame($this->expectedAtPath[$this->atPathCalls], $path);
+        $expectedPath = $this->expectedAtPath[$this->atPathCalls];
+        unset($this->expectedAtPath[$this->atPathCalls]);
+
+        Assert::assertSame($expectedPath, $path);
 
         return $this;
     }
@@ -417,6 +431,7 @@ public function doValidate($value, $constraints = null, $groups = null)
         Assert::assertFalse($this->expectNoValidate, 'No validation calls have been expected.');
 
         [$expectedValue, $expectedGroup, $expectedConstraints] = $this->expectedValidate[++$this->validateCalls];
+        unset($this->expectedValidate[$this->validateCalls]);
 
         Assert::assertSame($expectedValue, $value);
         $expectedConstraints($constraints);
diff --git a/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php b/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
new file mode 100644
index 0000000000000..70b6065e1a134
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Test;
+
+use PHPUnit\Framework\ExpectationFailedException;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\DateTime;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+class ConstraintValidatorTestCaseTest extends ConstraintValidatorTestCase
+{
+    protected function createValidator(): ConstraintValidatorInterface
+    {
+        return new TestCustomValidator();
+    }
+
+    public function testAssertingContextualValidatorRemainingExpectationsThrow()
+    {
+        $this->expectValidateValueAt(0, 'k1', 'ccc', [
+            new NotNull(),
+        ]);
+        $this->expectValidateValueAt(1, 'k2', 'ccc', [
+            new DateTime(),
+        ]);
+
+        $this->validator->validate('ccc', $this->constraint);
+
+        $contextualValidator = $this->context->getValidator()->inContext($this->context);
+        // Simulate __destruct to assert it throws
+        try {
+            $contextualValidator->__destruct();
+            $this->fail();
+        } catch (ExpectationFailedException $e) {
+        }
+
+        // Actually fulfill expectations so real __destruct doesn't throw
+        $contextualValidator
+            ->atPath('k2')
+            ->validate('ccc', [
+                new DateTime(),
+            ]);
+    }
+}
+
+class TestCustomValidator extends ConstraintValidator
+{
+    public function validate($value, Constraint $constraint)
+    {
+        $validator = $this->context
+            ->getValidator()
+            ->inContext($this->context);
+
+        $validator
+            ->atPath('k1')
+            ->validate($value, [
+                new NotNull(),
+            ]);
+    }
+}

From 693f9abacaa5b83bebbb9a84d25df883c75eab9a Mon Sep 17 00:00:00 2001
From: Karoly Gossler <connor@connor.hu>
Date: Mon, 12 Oct 2020 22:17:06 +0200
Subject: [PATCH 04/56] [Serializer] make XmlEncoder stateless thus reentrant

---
 .../Serializer/Encoder/XmlEncoder.php         | 80 ++++++++-----------
 .../Tests/Encoder/XmlEncoderTest.php          | 36 +++++++++
 .../Tests/Fixtures/EnvelopeNormalizer.php     | 43 ++++++++++
 .../Tests/Fixtures/EnvelopeObject.php         | 20 +++++
 .../Tests/Fixtures/EnvelopedMessage.php       | 20 +++++
 .../Fixtures/EnvelopedMessageNormalizer.php   | 32 ++++++++
 6 files changed, 186 insertions(+), 45 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeObject.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessage.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php

diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index a091cfab69a07..66e88e1b14340 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -17,8 +17,6 @@
 use Symfony\Component\Serializer\SerializerAwareTrait;
 
 /**
- * Encodes XML data.
- *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  * @author John Wards <jwards@whiteoctober.co.uk>
  * @author Fabian Vogler <fabian@equivalence.ch>
@@ -68,13 +66,6 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
         self::TYPE_CAST_ATTRIBUTES => true,
     ];
 
-    /**
-     * @var \DOMDocument
-     */
-    private $dom;
-    private $format;
-    private $context;
-
     /**
      * @param array $defaultContext
      */
@@ -107,19 +98,17 @@ public function encode($data, $format, array $context = [])
 
         $xmlRootNodeName = $context[self::ROOT_NODE_NAME] ?? $this->defaultContext[self::ROOT_NODE_NAME];
 
-        $this->dom = $this->createDomDocument($context);
-        $this->format = $format;
-        $this->context = $context;
+        $dom = $this->createDomDocument($context);
 
         if (null !== $data && !is_scalar($data)) {
-            $root = $this->dom->createElement($xmlRootNodeName);
-            $this->dom->appendChild($root);
-            $this->buildXml($root, $data, $xmlRootNodeName);
+            $root = $dom->createElement($xmlRootNodeName);
+            $dom->appendChild($root);
+            $this->buildXml($root, $data, $format, $context, $xmlRootNodeName);
         } else {
-            $this->appendNode($this->dom, $data, $xmlRootNodeName);
+            $this->appendNode($dom, $data, $format, $context, $xmlRootNodeName);
         }
 
-        return $this->dom->saveXML($ignorePiNode ? $this->dom->documentElement : null);
+        return $dom->saveXML($ignorePiNode ? $dom->documentElement : null);
     }
 
     /**
@@ -242,7 +231,7 @@ public function getRootNodeName()
     final protected function appendXMLString(\DOMNode $node, string $val): bool
     {
         if ('' !== $val) {
-            $frag = $this->dom->createDocumentFragment();
+            $frag = $node->ownerDocument->createDocumentFragment();
             $frag->appendXML($val);
             $node->appendChild($frag);
 
@@ -254,7 +243,7 @@ final protected function appendXMLString(\DOMNode $node, string $val): bool
 
     final protected function appendText(\DOMNode $node, string $val): bool
     {
-        $nodeText = $this->dom->createTextNode($val);
+        $nodeText = $node->ownerDocument->createTextNode($val);
         $node->appendChild($nodeText);
 
         return true;
@@ -262,7 +251,7 @@ final protected function appendText(\DOMNode $node, string $val): bool
 
     final protected function appendCData(\DOMNode $node, string $val): bool
     {
-        $nodeText = $this->dom->createCDATASection($val);
+        $nodeText = $node->ownerDocument->createCDATASection($val);
         $node->appendChild($nodeText);
 
         return true;
@@ -284,7 +273,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment): bool
 
     final protected function appendComment(\DOMNode $node, string $data): bool
     {
-        $node->appendChild($this->dom->createComment($data));
+        $node->appendChild($node->ownerDocument->createComment($data));
 
         return true;
     }
@@ -412,22 +401,22 @@ private function parseXmlValue(\DOMNode $node, array $context = [])
      *
      * @throws NotEncodableValueException
      */
-    private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName = null): bool
+    private function buildXml(\DOMNode $parentNode, $data, string $format, array $context, string $xmlRootNodeName = null): bool
     {
         $append = true;
-        $removeEmptyTags = $this->context[self::REMOVE_EMPTY_TAGS] ?? $this->defaultContext[self::REMOVE_EMPTY_TAGS] ?? false;
-        $encoderIgnoredNodeTypes = $this->context[self::ENCODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::ENCODER_IGNORED_NODE_TYPES];
+        $removeEmptyTags = $context[self::REMOVE_EMPTY_TAGS] ?? $this->defaultContext[self::REMOVE_EMPTY_TAGS] ?? false;
+        $encoderIgnoredNodeTypes = $context[self::ENCODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::ENCODER_IGNORED_NODE_TYPES];
 
-        if (\is_array($data) || ($data instanceof \Traversable && (null === $this->serializer || !$this->serializer->supportsNormalization($data, $this->format)))) {
+        if (\is_array($data) || ($data instanceof \Traversable && (null === $this->serializer || !$this->serializer->supportsNormalization($data, $format)))) {
             foreach ($data as $key => $data) {
                 //Ah this is the magic @ attribute types.
                 if (str_starts_with($key, '@') && $this->isElementNameValid($attributeName = substr($key, 1))) {
                     if (!is_scalar($data)) {
-                        $data = $this->serializer->normalize($data, $this->format, $this->context);
+                        $data = $this->serializer->normalize($data, $format, $context);
                     }
                     $parentNode->setAttribute($attributeName, $data);
                 } elseif ('#' === $key) {
-                    $append = $this->selectNodeType($parentNode, $data);
+                    $append = $this->selectNodeType($parentNode, $data, $format, $context);
                 } elseif ('#comment' === $key) {
                     if (!\in_array(\XML_COMMENT_NODE, $encoderIgnoredNodeTypes, true)) {
                         $append = $this->appendComment($parentNode, $data);
@@ -441,15 +430,15 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
                          * From ["item" => [0,1]];.
                          */
                         foreach ($data as $subData) {
-                            $append = $this->appendNode($parentNode, $subData, $key);
+                            $append = $this->appendNode($parentNode, $subData, $format, $context, $key);
                         }
                     } else {
-                        $append = $this->appendNode($parentNode, $data, $key);
+                        $append = $this->appendNode($parentNode, $data, $format, $context, $key);
                     }
                 } elseif (is_numeric($key) || !$this->isElementNameValid($key)) {
-                    $append = $this->appendNode($parentNode, $data, 'item', $key);
+                    $append = $this->appendNode($parentNode, $data, $format, $context, 'item', $key);
                 } elseif (null !== $data || !$removeEmptyTags) {
-                    $append = $this->appendNode($parentNode, $data, $key);
+                    $append = $this->appendNode($parentNode, $data, $format, $context, $key);
                 }
             }
 
@@ -461,9 +450,9 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
                 throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
             }
 
-            $data = $this->serializer->normalize($data, $this->format, $this->context);
+            $data = $this->serializer->normalize($data, $format, $context);
             if (null !== $data && !is_scalar($data)) {
-                return $this->buildXml($parentNode, $data, $xmlRootNodeName);
+                return $this->buildXml($parentNode, $data, $format, $context, $xmlRootNodeName);
             }
 
             // top level data object was normalized into a scalar
@@ -471,10 +460,10 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
                 $root = $parentNode->parentNode;
                 $root->removeChild($parentNode);
 
-                return $this->appendNode($root, $data, $xmlRootNodeName);
+                return $this->appendNode($root, $data, $format, $context, $xmlRootNodeName);
             }
 
-            return $this->appendNode($parentNode, $data, 'data');
+            return $this->appendNode($parentNode, $data, $format, $context, 'data');
         }
 
         throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
@@ -485,13 +474,14 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
      *
      * @param array|object $data
      */
-    private function appendNode(\DOMNode $parentNode, $data, string $nodeName, string $key = null): bool
+    private function appendNode(\DOMNode $parentNode, $data, string $format, array $context, string $nodeName, string $key = null): bool
     {
-        $node = $this->dom->createElement($nodeName);
+        $dom = $parentNode instanceof \DomDocument ? $parentNode : $parentNode->ownerDocument;
+        $node = $dom->createElement($nodeName);
         if (null !== $key) {
             $node->setAttribute('key', $key);
         }
-        $appendNode = $this->selectNodeType($node, $data);
+        $appendNode = $this->selectNodeType($node, $data, $format, $context);
         // we may have decided not to append this node, either in error or if its $nodeName is not valid
         if ($appendNode) {
             $parentNode->appendChild($node);
@@ -505,7 +495,7 @@ private function appendNode(\DOMNode $parentNode, $data, string $nodeName, strin
      */
     private function needsCdataWrapping(string $val): bool
     {
-        return 0 < preg_match('/[<>&]/', $val);
+        return preg_match('/[<>&]/', $val);
     }
 
     /**
@@ -513,24 +503,24 @@ private function needsCdataWrapping(string $val): bool
      *
      * @throws NotEncodableValueException
      */
-    private function selectNodeType(\DOMNode $node, $val): bool
+    private function selectNodeType(\DOMNode $node, $val, string $format, array $context): bool
     {
         if (\is_array($val)) {
-            return $this->buildXml($node, $val);
+            return $this->buildXml($node, $val, $format, $context);
         } elseif ($val instanceof \SimpleXMLElement) {
-            $child = $this->dom->importNode(dom_import_simplexml($val), true);
+            $child = $node->ownerDocument->importNode(dom_import_simplexml($val), true);
             $node->appendChild($child);
         } elseif ($val instanceof \Traversable) {
-            $this->buildXml($node, $val);
+            $this->buildXml($node, $val, $format, $context);
         } elseif ($val instanceof \DOMNode) {
-            $child = $this->dom->importNode($val, true);
+            $child = $node->ownerDocument->importNode($val, true);
             $node->appendChild($child);
         } elseif (\is_object($val)) {
             if (null === $this->serializer) {
                 throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
             }
 
-            return $this->selectNodeType($node, $this->serializer->normalize($val, $this->format, $this->context));
+            return $this->selectNodeType($node, $this->serializer->normalize($val, $format, $context), $format, $context);
         } elseif (is_numeric($val)) {
             return $this->appendText($node, (string) $val);
         } elseif (\is_string($val) && $this->needsCdataWrapping($val)) {
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 0752021605b72..91d361ce34c31 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -20,6 +20,10 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\Tests\Fixtures\Dummy;
+use Symfony\Component\Serializer\Tests\Fixtures\EnvelopedMessage;
+use Symfony\Component\Serializer\Tests\Fixtures\EnvelopedMessageNormalizer;
+use Symfony\Component\Serializer\Tests\Fixtures\EnvelopeNormalizer;
+use Symfony\Component\Serializer\Tests\Fixtures\EnvelopeObject;
 use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy;
 
@@ -850,6 +854,23 @@ public function testNotEncodableValueExceptionMessageForAResource()
         (new XmlEncoder())->encode(tmpfile(), 'xml');
     }
 
+    public function testReentrantXmlEncoder()
+    {
+        $envelope = new EnvelopeObject();
+        $message = new EnvelopedMessage();
+        $message->text = 'Symfony is great';
+        $envelope->message = $message;
+
+        $encoder = $this->createXmlEncoderWithEnvelopeNormalizer();
+        $expected = <<<'XML'
+<?xml version="1.0"?>
+<response><message>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxyZXNwb25zZT48dGV4dD5TeW1mb255IGlzIGdyZWF0PC90ZXh0PjwvcmVzcG9uc2U+Cg==</message></response>
+
+XML;
+
+        $this->assertSame($expected, $encoder->encode($envelope, 'xml'));
+    }
+
     public function testEncodeComment()
     {
         $expected = <<<'XML'
@@ -921,6 +942,21 @@ private function doTestEncodeWithoutComment(bool $legacy = false)
         $this->assertEquals($expected, $encoder->encode($data, 'xml'));
     }
 
+    private function createXmlEncoderWithEnvelopeNormalizer(): XmlEncoder
+    {
+        $normalizers = [
+            $envelopeNormalizer = new EnvelopeNormalizer(),
+            new EnvelopedMessageNormalizer(),
+        ];
+
+        $encoder = new XmlEncoder();
+        $serializer = new Serializer($normalizers, ['xml' => $encoder]);
+        $encoder->setSerializer($serializer);
+        $envelopeNormalizer->setSerializer($serializer);
+
+        return $encoder;
+    }
+
     private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder
     {
         $encoder = new XmlEncoder();
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
new file mode 100644
index 0000000000000..67d0402356d4d
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @author Karoly Gossler <connor@connor.hu>
+ */
+class EnvelopeNormalizer implements NormalizerInterface
+{
+    private $serializer;
+
+    public function normalize($envelope, $format = null, array $context = [])
+    {
+        $xmlContent = $this->serializer->serialize($envelope->message, 'xml');
+
+        $encodedContent = base64_encode($xmlContent);
+
+        return [
+            'message' => $encodedContent,
+        ];
+    }
+
+    public function supportsNormalization($data, $format = null)
+    {
+        return $data instanceof EnvelopeObject;
+    }
+
+    public function setSerializer($serializer)
+    {
+        $this->serializer = $serializer;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeObject.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeObject.php
new file mode 100644
index 0000000000000..6dae325912e67
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeObject.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+/**
+ * @author Karoly Gossler <connor@connor.hu>
+ */
+class EnvelopeObject
+{
+    public $message;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessage.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessage.php
new file mode 100644
index 0000000000000..b6b80216f77fe
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessage.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+/**
+ * @author Karoly Gossler <connor@connor.hu>
+ */
+class EnvelopedMessage
+{
+    public $text;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
new file mode 100644
index 0000000000000..5afe67c484341
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @author Karoly Gossler <connor@connor.hu>
+ */
+class EnvelopedMessageNormalizer implements NormalizerInterface
+{
+    public function normalize($message, $format = null, array $context = [])
+    {
+        return [
+            'text' => $message->text,
+        ];
+    }
+
+    public function supportsNormalization($data, $format = null)
+    {
+        return $data instanceof EnvelopedMessage;
+    }
+}

From 415dc197e4dfb579de72b8948ad1375fa4b24956 Mon Sep 17 00:00:00 2001
From: Konstantin Bogomolov <bog.konstantin@gmail.com>
Date: Sat, 24 Jul 2021 17:06:09 +0530
Subject: [PATCH 05/56] [Form] Do not fix URL protocol for relative URLs

---
 .../EventListener/FixUrlProtocolListener.php  |  2 +-
 .../FixUrlProtocolListenerTest.php            | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
index b44d217ea3214..c497212289b03 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -36,7 +36,7 @@ public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
 
-        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^([\w+.-]+://|[^:/?@#]++@)~', $data)) {
+        if ($this->defaultProtocol && $data && \is_string($data) && !preg_match('~^(?:[/.]|[\w+.-]+://|[^:/?@#]++@)~', $data)) {
             $event->setData($this->defaultProtocol.'://'.$data);
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
index 55fee6e2243ee..87f79439f94c7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -20,10 +20,25 @@
 
 class FixUrlProtocolListenerTest extends TestCase
 {
+    /**
+     * @dataProvider provideUrlToFix
+     */
+    public function testFixUrl($data)
+    {
+        $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
+        $event = new FormEvent($form, $data);
+
+        $filter = new FixUrlProtocolListener('http');
+        $filter->onSubmit($event);
+
+        $this->assertSame('http://'.$data, $event->getData());
+    }
+
     public function provideUrlToFix()
     {
         return [
             ['www.symfony.com'],
+            ['symfony.com/doc'],
             ['twitter.com/@symfony'],
             ['symfony.com?foo@bar'],
             ['symfony.com#foo@bar'],
@@ -32,17 +47,17 @@ public function provideUrlToFix()
     }
 
     /**
-     * @dataProvider provideUrlToFix
+     * @dataProvider provideUrlToSkip
      */
-    public function testFixUrl($data)
+    public function testSkipUrl($url)
     {
         $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
-        $event = new FormEvent($form, $data);
+        $event = new FormEvent($form, $url);
 
         $filter = new FixUrlProtocolListener('http');
         $filter->onSubmit($event);
 
-        $this->assertEquals('http://'.$data, $event->getData());
+        $this->assertSame($url, $event->getData());
     }
 
     public function provideUrlToSkip()
@@ -56,20 +71,9 @@ public function provideUrlToSkip()
             ['iris.beep://foo'],
             ['foo+bar://foo'],
             ['fabien@symfony.com'],
+            ['//relative/url'],
+            ['/relative/url'],
+            ['./relative/url'],
         ];
     }
-
-    /**
-     * @dataProvider provideUrlToSkip
-     */
-    public function testSkipUrl($url)
-    {
-        $form = new Form(new FormConfigBuilder('name', null, new EventDispatcher()));
-        $event = new FormEvent($form, $url);
-
-        $filter = new FixUrlProtocolListener('http');
-        $filter->onSubmit($event);
-
-        $this->assertEquals($url, $event->getData());
-    }
 }

From debb866f07e91897e094d808d6412cd3f0f7342d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 28 Jan 2022 11:53:35 +0100
Subject: [PATCH 06/56] Bump Symfony version to 4.4.38

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index ebedc776896b5..61c18ff703eb3 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '4.4.37';
-    public const VERSION_ID = 40437;
+    public const VERSION = '4.4.38-DEV';
+    public const VERSION_ID = 40438;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 37;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 38;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';

From afada38d4229b4717cd14413706cf3b5e5f55eea Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <ogizanagi@users.noreply.github.com>
Date: Sat, 29 Jan 2022 12:55:21 +0100
Subject: [PATCH 07/56] Remove 5.3 from PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5b76de89c7bee..e6333054fe172 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 6.1 for features / 4.4, 5.3, 5.4 or 6.0 for bug fixes <!-- see below -->
+| Branch?       | 6.1 for features / 4.4, 5.4 or 6.0 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->

From aab2f2a72940097052d0f297ed209e47a844777c Mon Sep 17 00:00:00 2001
From: Justin Hileman <justin@justinhileman.info>
Date: Sat, 29 Jan 2022 16:14:18 -0500
Subject: [PATCH 08/56] [Console] Revert StringInput bc break from #45088

---
 src/Symfony/Component/Console/Input/StringInput.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
index 76f1d5030a7a7..56bb66cbfd143 100644
--- a/src/Symfony/Component/Console/Input/StringInput.php
+++ b/src/Symfony/Component/Console/Input/StringInput.php
@@ -24,7 +24,8 @@
  */
 class StringInput extends ArgvInput
 {
-    public const REGEX_STRING = '([^\s\\\\]+?)';
+    public const REGEX_STRING = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+    public const REGEX_UNQUOTED_STRING = '([^\s\\\\]+?)';
     public const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
     /**
@@ -64,7 +65,7 @@ private function tokenize(string $input): array
                 $token .= $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, -1)));
             } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
                 $token .= stripcslashes(substr($match[0], 1, -1));
-            } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, 0, $cursor)) {
+            } elseif (preg_match('/'.self::REGEX_UNQUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
                 $token .= $match[1];
             } else {
                 // should never happen

From 0f85ba030b8725642ed0fdef804e969d88fcd7e5 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Thu, 27 Jan 2022 15:49:15 +0100
Subject: [PATCH 09/56] [Validator] Fix minRatio and maxRatio when getting
 rounded

---
 .../Validator/Constraints/ImageValidator.php  |   8 +++---
 .../Tests/Constraints/Fixtures/test_16by9.gif | Bin 0 -> 102 bytes
 .../Tests/Constraints/ImageValidatorTest.php  |  23 ++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/Fixtures/test_16by9.gif

diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
index aa087bdc6f4e3..f199f1d177d30 100644
--- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
@@ -169,10 +169,10 @@ public function validate($value, Constraint $constraint)
                 throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio.', $constraint->minRatio));
             }
 
-            if ($ratio < $constraint->minRatio) {
+            if ($ratio < round($constraint->minRatio, 2)) {
                 $this->context->buildViolation($constraint->minRatioMessage)
                     ->setParameter('{{ ratio }}', $ratio)
-                    ->setParameter('{{ min_ratio }}', $constraint->minRatio)
+                    ->setParameter('{{ min_ratio }}', round($constraint->minRatio, 2))
                     ->setCode(Image::RATIO_TOO_SMALL_ERROR)
                     ->addViolation();
             }
@@ -183,10 +183,10 @@ public function validate($value, Constraint $constraint)
                 throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio.', $constraint->maxRatio));
             }
 
-            if ($ratio > $constraint->maxRatio) {
+            if ($ratio > round($constraint->maxRatio, 2)) {
                 $this->context->buildViolation($constraint->maxRatioMessage)
                     ->setParameter('{{ ratio }}', $ratio)
-                    ->setParameter('{{ max_ratio }}', $constraint->maxRatio)
+                    ->setParameter('{{ max_ratio }}', round($constraint->maxRatio, 2))
                     ->setCode(Image::RATIO_TOO_BIG_ERROR)
                     ->addViolation();
             }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/test_16by9.gif b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/test_16by9.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dab14ec1a0224c3b8fd56e247f03a2dc55eaa3d8
GIT binary patch
literal 102
zcmZ?wbhEHb6ky<F_`tyM|Nnmm1_s5SEI<-S|L6A1O-xVqO-#>B&gM%`%*{=-HPACL
x1wjVIe}c|Msfi`2DGKG8B^e6tp1uJLIv{-@!x)&jTKZR>e#^gj&J<AwYXID69Torp

literal 0
HcmV?d00001

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 5ae1e035225c9..81ba1224bbfe5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -48,6 +48,7 @@ protected function setUp(): void
         $this->imageLandscape = __DIR__.'/Fixtures/test_landscape.gif';
         $this->imagePortrait = __DIR__.'/Fixtures/test_portrait.gif';
         $this->image4By3 = __DIR__.'/Fixtures/test_4by3.gif';
+        $this->image16By9 = __DIR__.'/Fixtures/test_16by9.gif';
         $this->imageCorrupted = __DIR__.'/Fixtures/test_corrupted.gif';
     }
 
@@ -304,6 +305,28 @@ public function testMaxRatioUsesTwoDecimalsOnly()
         $this->assertNoViolation();
     }
 
+    public function testMinRatioUsesInputMoreDecimals()
+    {
+        $constraint = new Image([
+            'minRatio' => 4 / 3,
+        ]);
+
+        $this->validator->validate($this->image4By3, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public function testMaxRatioUsesInputMoreDecimals()
+    {
+        $constraint = new Image([
+            'maxRatio' => 16 / 9,
+        ]);
+
+        $this->validator->validate($this->image16By9, $constraint);
+
+        $this->assertNoViolation();
+    }
+
     public function testInvalidMinRatio()
     {
         $this->expectException(ConstraintDefinitionException::class);

From 7802c1f52c88ff5c8af4abcc077b4d51387562bf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 31 Jan 2022 15:01:05 +0100
Subject: [PATCH 10/56] [DomCrawler] ignore bad charsets

---
 src/Symfony/Component/DomCrawler/Crawler.php  | 21 +++++++------------
 .../DomCrawler/Tests/AbstractCrawlerTest.php  |  4 ++++
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index 36c7a41e5fbc7..aacb94ad37f2f 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -156,24 +156,17 @@ public function addContent($content, $type = null)
             return;
         }
 
-        $charset = null;
-        if (false !== $pos = stripos($type, 'charset=')) {
-            $charset = substr($type, $pos + 8);
-            if (false !== $pos = strpos($charset, ';')) {
-                $charset = substr($charset, 0, $pos);
-            }
-        }
+        $charset = preg_match('//u', $content) ? 'UTF-8' : 'ISO-8859-1';
 
         // http://www.w3.org/TR/encoding/#encodings
         // http://www.w3.org/TR/REC-xml/#NT-EncName
-        if (null === $charset &&
-            preg_match('/\<meta[^\>]+charset *= *["\']?([a-zA-Z\-0-9_:.]+)/i', $content, $matches)) {
-            $charset = $matches[1];
-        }
+        $content = preg_replace_callback('/(charset *= *["\']?)([a-zA-Z\-0-9_:.]+)/i', function ($m) use (&$charset) {
+            if ('charset=' === $this->convertToHtmlEntities('charset=', $m[2])) {
+                $charset = $m[2];
+            }
 
-        if (null === $charset) {
-            $charset = preg_match('//u', $content) ? 'UTF-8' : 'ISO-8859-1';
-        }
+            return $m[1].$charset;
+        }, $content, 1);
 
         if ('x' === $xmlMatches[1]) {
             $this->addXmlContent($content, $charset);
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
index 697306c53ee28..96d9177673c25 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -187,6 +187,10 @@ public function testAddContent()
         $crawler = $this->createCrawler();
         $crawler->addContent($this->getDoctype().'<html><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><span>中文</span></html>');
         $this->assertEquals('中文', $crawler->filterXPath('//span')->text(), '->addContent() guess wrong charset');
+
+        $crawler = $this->createCrawler();
+        $crawler->addContent($this->getDoctype().'<html><meta http-equiv="Content-Type" content="text/html; charset=unicode" /><div class="foo"></html></html>');
+        $this->assertEquals('foo', $crawler->filterXPath('//div')->attr('class'), '->addContent() ignores bad charset');
     }
 
     /**

From 5cd10b0fa2042e8b68dcfffa1be9193461a8f20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CFilip?= <filip@bratia.sk>
Date: Mon, 31 Jan 2022 13:49:45 +0100
Subject: [PATCH 11/56] [PropertyAccess] Fix handling of uninitialized property
 of parent class

---
 .../PropertyAccess/PropertyAccessor.php       |  6 ++---
 .../ExtendedUninitializedProperty.php         | 17 ++++++++++++++
 .../Tests/Fixtures/UninitializedProperty.php  | 11 +++++++++
 .../Tests/PropertyAccessorTest.php            | 23 +++++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Component/PropertyAccess/Tests/Fixtures/ExtendedUninitializedProperty.php

diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index d389992ca68fb..aedc7ab068325 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -401,7 +401,7 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid
                         && $object instanceof $trace['class']
                         && preg_match('/Return value (?:of .*::\w+\(\) )?must be of (?:the )?type (\w+), null returned$/', $e->getMessage(), $matches)
                     ) {
-                        throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Did you forget to initialize a property or to make the return type nullable using "?%3$s"?', !str_contains(\get_class($object), "@anonymous\0") ? \get_class($object) : (get_parent_class($object) ?: 'class').'@anonymous', $access[self::ACCESS_NAME], $matches[1]), 0, $e);
+                        throw new AccessException(sprintf('The method "%s::%s()" returned "null", but expected type "%3$s". Did you forget to initialize a property or to make the return type nullable using "?%3$s"?', get_debug_type($object), $access[self::ACCESS_NAME], $matches[1]), 0, $e);
                     }
 
                     throw $e;
@@ -436,8 +436,8 @@ private function readProperty(array $zval, string $property, bool $ignoreInvalid
             }
         } catch (\Error $e) {
             // handle uninitialized properties in PHP >= 7.4
-            if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ('.preg_quote(get_debug_type($object), '/').')::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {
-                $r = new \ReflectionProperty($class, $matches[2]);
+            if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\\@]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {
+                $r = new \ReflectionProperty(str_contains($matches[1], '@anonymous') ? $class : $matches[1], $matches[2]);
                 $type = ($type = $r->getType()) instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
 
                 throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $matches[1], $r->getName(), $type), 0, $e);
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/ExtendedUninitializedProperty.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/ExtendedUninitializedProperty.php
new file mode 100644
index 0000000000000..e0c5950d258ec
--- /dev/null
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/ExtendedUninitializedProperty.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class ExtendedUninitializedProperty extends UninitializedProperty
+{
+
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php
index ac757b4022563..8e057ba9ca165 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/UninitializedProperty.php
@@ -14,4 +14,15 @@
 class UninitializedProperty
 {
     public string $uninitialized;
+    private string $privateUninitialized;
+
+    public function getPrivateUninitialized(): string
+    {
+        return $this->privateUninitialized;
+    }
+
+    public function setPrivateUninitialized(string $privateUninitialized): void
+    {
+        $this->privateUninitialized = $privateUninitialized;
+    }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
index bcecf16ac6168..5e9eca16e758e 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\PropertyAccess\Tests\Fixtures\ExtendedUninitializedProperty;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\ReturnTyped;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidArgumentLength;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestAdderRemoverInvalidMethods;
@@ -211,6 +212,28 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyOfAnonymousCla
         $this->propertyAccessor->getValue($object, 'uninitialized');
     }
 
+    /**
+     * @requires PHP 7.4
+     */
+    public function testGetValueThrowsExceptionIfUninitializedNotNullableOfParentClass()
+    {
+        $this->expectException(AccessException::class);
+        $this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$uninitialized" is not readable because it is typed "string". You should initialize it or declare a default value instead.');
+
+        $this->propertyAccessor->getValue(new ExtendedUninitializedProperty(), 'uninitialized');
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testGetValueThrowsExceptionIfUninitializedNotNullablePropertyWithGetterOfParentClass()
+    {
+        $this->expectException(AccessException::class);
+        $this->expectExceptionMessage('The property "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedProperty::$privateUninitialized" is not readable because it is typed "string". You should initialize it or declare a default value instead.');
+
+        $this->propertyAccessor->getValue(new ExtendedUninitializedProperty(), 'privateUninitialized');
+    }
+
     public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAnonymousStdClass()
     {
         $this->expectException(AccessException::class);

From c11d6640ed468c3c1df4c92b3f8d953de8e6501a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 31 Jan 2022 18:35:43 +0100
Subject: [PATCH 12/56] [DependencyInjection] Don't dump polyfilled classes in
 preload script

---
 src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index f76daf03aea5d..4bc1d3cb9e597 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -316,7 +316,7 @@ public function dump(array $options = [])
                     if (!$class || str_contains($class, '$')) {
                         continue;
                     }
-                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
+                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || ((new \ReflectionClass($class))->isUserDefined() && !\in_array($class, ['Attribute', 'JsonException', 'ReturnTypeWillChange', 'Stringable', 'UnhandledMatchError', 'ValueError'], true))) {
                         $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);
                     }
                 }

From f5c2e6ef35a39a2300877a3c56c1ca8c14ad87d0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 31 Jan 2022 19:19:20 +0100
Subject: [PATCH 13/56] [HttpClient] Fix Content-Length header when possible

---
 .../Component/HttpClient/HttpClientTrait.php  |  8 ++++
 .../HttpClient/Tests/HttpClientTestCase.php   | 14 +++++++
 .../HttpClient/Tests/MockHttpClientTest.php   | 37 +++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index c763cbe10c232..46ea64ffde4a5 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -86,6 +86,14 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         if (isset($options['body'])) {
             $options['body'] = self::normalizeBody($options['body']);
+
+            if (\is_string($options['body'])
+                && (string) \strlen($options['body']) !== substr($h = $options['normalized_headers']['content-length'][0] ?? '', 16)
+                && ('' !== $h || ('' !== $options['body'] && !isset($options['normalized_headers']['transfer-encoding'])))
+            ) {
+                $options['normalized_headers']['content-length'] = [substr_replace($h ?: 'Content-Length: ', \strlen($options['body']), 16)];
+                $options['headers'] = array_merge(...array_values($options['normalized_headers']));
+            }
         }
 
         if (isset($options['peer_fingerprint'])) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
index 0fc6dc45fb1d2..e8b97a0ba8447 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -180,6 +180,20 @@ public function testDebugInfoOnDestruct()
         $this->assertNotEmpty($traceInfo['debug']);
     }
 
+    public function testFixContentLength()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => 'abc=def',
+            'headers' => ['Content-Length: 4'],
+        ]);
+
+        $body = $response->toArray();
+
+        $this->assertSame(['abc' => 'def', 'REQUEST_METHOD' => 'POST'], $body);
+    }
+
     public function testNegativeTimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
index 714e35eaf21de..076604b0a6196 100644
--- a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -73,6 +73,43 @@ public function testZeroStatusCode()
         $this->assertSame(0, $response->getStatusCode());
     }
 
+    public function testFixContentLength()
+    {
+        $client = new MockHttpClient();
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => 'abc=def',
+            'headers' => ['Content-Length: 4'],
+        ]);
+
+        $requestOptions = $response->getRequestOptions();
+        $this->assertSame('Content-Length: 7', $requestOptions['headers'][0]);
+        $this->assertSame(['Content-Length: 7'], $requestOptions['normalized_headers']['content-length']);
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => 'abc=def',
+        ]);
+
+        $requestOptions = $response->getRequestOptions();
+        $this->assertSame('Content-Length: 7', $requestOptions['headers'][1]);
+        $this->assertSame(['Content-Length: 7'], $requestOptions['normalized_headers']['content-length']);
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => 'abc=def',
+            'headers' => ['Transfer-Encoding: chunked'],
+        ]);
+
+        $requestOptions = $response->getRequestOptions();
+        $this->assertFalse(isset($requestOptions['normalized_headers']['content-length']));
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => '',
+        ]);
+
+        $requestOptions = $response->getRequestOptions();
+        $this->assertFalse(isset($requestOptions['normalized_headers']['content-length']));
+    }
+
     public function testThrowExceptionInBodyGenerator()
     {
         $mockHttpClient = new MockHttpClient([

From 494ceaf6cc02ca7b55e12381d1869c5c589bd4aa Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 2 Feb 2022 16:57:39 +0100
Subject: [PATCH 14/56] [FrameworkBundle] Fix log channel of TagAwareAdapter

---
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 3 ++-
 .../Tests/DependencyInjection/FrameworkExtensionTest.php       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index eb3b19991bb92..0d52c684b27d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1962,7 +1962,8 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
                 if (method_exists(TagAwareAdapter::class, 'setLogger')) {
                     $container
                         ->getDefinition($name)
-                        ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
+                        ->addMethodCall('setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+                        ->addTag('monolog.logger', ['channel' => 'cache']);
                 }
 
                 $pool['name'] = $name;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 396a04e8b4bf9..b66d0837c3a37 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1520,6 +1520,7 @@ public function testCachePoolServices()
             $this->assertEquals([
                 ['setLogger', [new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]],
             ], $tagAwareDefinition->getMethodCalls());
+            $this->assertSame([['channel' => 'cache']], $tagAwareDefinition->getTag('monolog.logger'));
         }
     }
 

From db257f3500317a740cb93d6cf507b2a9dee9a8ae Mon Sep 17 00:00:00 2001
From: Anatoly Pashin <anatoly.pashin@gmail.com>
Date: Fri, 4 Feb 2022 13:20:12 +1000
Subject: [PATCH 15/56] [PropertyAccessor] Add missing TypeError catch

---
 .../PropertyAccess/PropertyAccessor.php         | 11 +++++++++++
 .../Tests/Fixtures/TestClassTypedProperty.php   | 17 +++++++++++++++++
 .../Tests/PropertyAccessorTest.php              | 13 +++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypedProperty.php

diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index aedc7ab068325..f73e148a89b74 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -188,6 +188,12 @@ private static function throwInvalidArgumentException(string $message, array $tr
         }
 
         if (\PHP_VERSION_ID < 80000) {
+            if (preg_match('/^Typed property \S+::\$\S+ must be (\S+), (\S+) used$/', $message, $matches)) {
+                [, $expectedType, $actualType] = $matches;
+
+                throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath), 0, $previous);
+            }
+
             if (!str_starts_with($message, 'Argument ')) {
                 return;
             }
@@ -204,6 +210,11 @@ private static function throwInvalidArgumentException(string $message, array $tr
         if (preg_match('/^\S+::\S+\(\): Argument #\d+ \(\$\S+\) must be of type (\S+), (\S+) given/', $message, $matches)) {
             [, $expectedType, $actualType] = $matches;
 
+            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath), 0, $previous);
+        }
+        if (preg_match('/^Cannot assign (\S+) to property \S+::\$\S+ of type (\S+)$/', $message, $matches)) {
+            [, $actualType, $expectedType] = $matches;
+
             throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', $expectedType, 'NULL' === $actualType ? 'null' : $actualType, $propertyPath), 0, $previous);
         }
     }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypedProperty.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypedProperty.php
new file mode 100644
index 0000000000000..1c4344c390d2d
--- /dev/null
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TestClassTypedProperty.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests\Fixtures;
+
+class TestClassTypedProperty
+{
+    public float $publicProperty;
+}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
index 5e9eca16e758e..6498fab2bfd90 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -29,6 +29,7 @@
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicCall;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassMagicGet;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassSetValue;
+use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassTypedProperty;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestClassTypeErrorInsideCall;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestPublicPropertyDynamicallyCreated;
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TestPublicPropertyGetterOnObject;
@@ -945,4 +946,16 @@ public function testGetDynamicPublicPropertyWithMagicGetterAllow()
         $object = new TestPublicPropertyGetterOnObjectMagicGet();
         $this->assertSame($value, $this->propertyAccessor->getValue($object, $path));
     }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testSetValueWrongTypeShouldThrowWrappedException()
+    {
+        $object = new TestClassTypedProperty();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected argument of type "float", "string" given at property path "publicProperty"');
+        $this->propertyAccessor->setValue($object, 'publicProperty', 'string');
+    }
 }

From ac3661711985479ee150013f1b0aaf68f79f225f Mon Sep 17 00:00:00 2001
From: Maxime Steinhausser <maxime.steinhausser@elao.com>
Date: Mon, 31 Jan 2022 17:33:23 +0100
Subject: [PATCH 16/56] [DependencyInjection][FrameworkBundle] Fix using PHP
 8.1 enum as parameters

---
 .../Console/Descriptor/Descriptor.php         | 14 +++++++++
 .../Console/Descriptor/JsonDescriptor.php     |  8 +++++
 .../Console/Descriptor/TextDescriptor.php     |  2 ++
 .../Console/Descriptor/XmlDescriptor.php      |  3 ++
 .../Controller/AbstractController.php         |  2 +-
 .../FrameworkBundle/Controller/Controller.php |  2 +-
 .../FrameworkBundle/Test/TestContainer.php    |  2 +-
 .../Descriptor/AbstractDescriptorTest.php     |  7 ++++-
 .../Console/Descriptor/ObjectsProvider.php    | 30 ++++++++++++++-----
 .../definition_arguments_with_enum.json       | 15 ++++++++++
 .../definition_arguments_with_enum.md         |  9 ++++++
 .../definition_arguments_with_enum.txt        | 16 ++++++++++
 .../definition_arguments_with_enum.xml        |  4 +++
 .../Fixtures/Descriptor/parameters_enums.json | 17 +++++++++++
 .../Fixtures/Descriptor/parameters_enums.md   |  7 +++++
 .../Fixtures/Descriptor/parameters_enums.txt  | 11 +++++++
 .../Fixtures/Descriptor/parameters_enums.xml  |  7 +++++
 .../Tests/Fixtures/FooUnitEnum.php            | 18 +++++++++++
 .../FrameworkBundle/Tests/Fixtures/Suit.php   | 20 +++++++++++++
 .../Bundle/FrameworkBundle/composer.json      |  2 +-
 .../DependencyInjection/Container.php         |  6 ++--
 .../ContainerInterface.php                    |  6 ++--
 .../DependencyInjection/Dumper/PhpDumper.php  | 14 +++++----
 .../ParameterBag/ContainerBag.php             |  2 +-
 .../ParameterBag/ParameterBagInterface.php    |  6 ++--
 .../Tests/Dumper/PhpDumperTest.php            | 24 ++++++++++++++-
 .../Tests/Dumper/XmlDumperTest.php            |  3 ++
 .../Tests/Dumper/YamlDumperTest.php           |  3 ++
 .../Tests/Fixtures/FooUnitEnum.php            |  1 +
 .../Tests/Fixtures/php/services10.php         |  2 +-
 .../Tests/Fixtures/php/services12.php         |  2 +-
 .../Tests/Fixtures/php/services19.php         |  2 +-
 .../Tests/Fixtures/php/services26.php         |  2 +-
 .../Tests/Fixtures/php/services8.php          |  2 +-
 .../Tests/Fixtures/php/services9_as_files.txt |  2 +-
 .../Tests/Fixtures/php/services9_compiled.php |  2 +-
 .../php/services9_inlined_factories.txt       |  2 +-
 .../php/services9_lazy_inlined_factories.txt  |  2 +-
 .../Fixtures/php/services_array_params.php    |  2 +-
 .../Fixtures/php/services_base64_env.php      |  2 +-
 .../Tests/Fixtures/php/services_csv_env.php   |  2 +-
 .../Fixtures/php/services_default_env.php     |  2 +-
 .../Tests/Fixtures/php/services_env_in_id.php |  2 +-
 .../php/services_errored_definition.php       |  2 +-
 .../Fixtures/php/services_inline_requires.php |  2 +-
 .../Tests/Fixtures/php/services_json_env.php  |  2 +-
 .../php/services_query_string_env.php         |  2 +-
 .../Tests/Fixtures/php/services_rot13_env.php |  2 +-
 .../php/services_unsupported_characters.php   |  2 +-
 .../Tests/Fixtures/php/services_url_env.php   |  2 +-
 .../xml/services_with_enumeration.xml         |  7 +++++
 .../yaml/services_with_enumeration.yml        |  3 ++
 .../DependencyInjection/composer.json         |  4 +--
 53 files changed, 265 insertions(+), 52 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.json
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.md
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.txt
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.json
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.md
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.txt
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/FooUnitEnum.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Suit.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index fb89768bf5f33..ed8a9118b4309 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -168,6 +168,20 @@ protected function formatValue($value): string
      */
     protected function formatParameter($value): string
     {
+        if ($value instanceof \UnitEnum) {
+            return var_export($value, true);
+        }
+
+        // Recursively search for enum values, so we can replace it
+        // before json_encode (which will not display anything for \UnitEnum otherwise)
+        if (\is_array($value)) {
+            array_walk_recursive($value, static function (&$value) {
+                if ($value instanceof \UnitEnum) {
+                    $value = var_export($value, true);
+                }
+            });
+        }
+
         if (\is_bool($value) || \is_array($value) || (null === $value)) {
             $jsonString = json_encode($value);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index 038ba3313d2e4..0b38ebf31c0f4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -158,6 +158,14 @@ private function writeData(array $data, array $options)
     {
         $flags = $options['json_encoding'] ?? 0;
 
+        // Recursively search for enum values, so we can replace it
+        // before json_encode (which will not display anything for \UnitEnum otherwise)
+        array_walk_recursive($data, static function (&$value) {
+            if ($value instanceof \UnitEnum) {
+                $value = var_export($value, true);
+            }
+        });
+
         $this->write(json_encode($data, $flags | \JSON_PRETTY_PRINT)."\n");
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index f287467d8221b..3441536ab8404 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -342,6 +342,8 @@ protected function describeContainerDefinition(Definition $definition, array $op
                     $argumentsInformation[] = sprintf('Service locator (%d element(s))', \count($argument->getValues()));
                 } elseif ($argument instanceof Definition) {
                     $argumentsInformation[] = 'Inlined Service';
+                } elseif ($argument instanceof \UnitEnum) {
+                    $argumentsInformation[] = var_export($argument, true);
                 } else {
                     $argumentsInformation[] = \is_array($argument) ? sprintf('Array (%d element(s))', \count($argument)) : $argument;
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 66c441f14e069..44a79a8fa90bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -386,6 +386,9 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom): array
                 foreach ($this->getArgumentNodes($argument, $dom) as $childArgumentXML) {
                     $argumentXML->appendChild($childArgumentXML);
                 }
+            } elseif ($argument instanceof \UnitEnum) {
+                $argumentXML->setAttribute('type', 'constant');
+                $argumentXML->appendChild(new \DOMText(var_export($argument, true)));
             } else {
                 $argumentXML->appendChild(new \DOMText($argument));
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
index ac3701675c66f..5a2112daf9ed2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -58,7 +58,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
     /**
      * Gets a container parameter by its name.
      *
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      *
      * @final
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index de68e41381793..a7d8f9425c0d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -31,7 +31,7 @@ abstract class Controller implements ContainerAwareInterface
     /**
      * Gets a container configuration parameter by its name.
      *
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      *
      * @final
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
index 31fd0a32c3d66..d5aec6830317e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
@@ -59,7 +59,7 @@ public function getParameterBag(): ParameterBagInterface
     /**
      * {@inheritdoc}
      *
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
index 550dcb46cab4c..d45814da781e6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -121,6 +122,10 @@ public function getDescribeContainerDefinitionWithArgumentsShownTestData()
             $definitionsWithArgs[str_replace('definition_', 'definition_arguments_', $key)] = $definition;
         }
 
+        if (\PHP_VERSION_ID >= 80100) {
+            $definitionsWithArgs['definition_arguments_with_enum'] = (new Definition('definition_with_enum'))->setArgument(0, FooUnitEnum::FOO);
+        }
+
         return $this->getDescriptionTestData($definitionsWithArgs);
     }
 
@@ -248,7 +253,7 @@ private function assertDescription($expectedDescription, $describedObject, array
         }
     }
 
-    private function getDescriptionTestData(array $objects)
+    private function getDescriptionTestData(iterable $objects)
     {
         $data = [];
         foreach ($objects as $name => $object) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
index 071ca83ca68b3..e44fcf6395164 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
 
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Suit;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -61,14 +63,26 @@ public static function getRoutes()
 
     public static function getContainerParameters()
     {
-        return [
-            'parameters_1' => new ParameterBag([
-                'integer' => 12,
-                'string' => 'Hello world!',
-                'boolean' => true,
-                'array' => [12, 'Hello world!', true],
-            ]),
-        ];
+        yield 'parameters_1' => new ParameterBag([
+            'integer' => 12,
+            'string' => 'Hello world!',
+            'boolean' => true,
+            'array' => [12, 'Hello world!', true],
+        ]);
+
+        if (\PHP_VERSION_ID < 80100) {
+            return;
+        }
+
+        yield 'parameters_enums' => new ParameterBag([
+            'unit_enum' => FooUnitEnum::BAR,
+            'backed_enum' => Suit::Hearts,
+            'array_of_enums' => Suit::cases(),
+            'map' => [
+                'mixed' => [Suit::Hearts, FooUnitEnum::BAR],
+                'single' => FooUnitEnum::BAR,
+            ],
+        ]);
     }
 
     public static function getContainerParameter()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.json
new file mode 100644
index 0000000000000..d5580ee3334a4
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.json
@@ -0,0 +1,15 @@
+{
+    "class": "definition_with_enum",
+    "public": false,
+    "synthetic": false,
+    "lazy": false,
+    "shared": true,
+    "abstract": false,
+    "autowire": false,
+    "autoconfigure": false,
+    "arguments": [
+        "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\FooUnitEnum::FOO"
+    ],
+    "file": null,
+    "tags": []
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.md
new file mode 100644
index 0000000000000..78ef17f14b1fa
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.md
@@ -0,0 +1,9 @@
+- Class: `definition_with_enum`
+- Public: no
+- Synthetic: no
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- Arguments: yes
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.txt
new file mode 100644
index 0000000000000..9556f9b832f4e
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.txt
@@ -0,0 +1,16 @@
+ ---------------- ---------------------------------------------------------------- 
+  Option           Value                                                           
+ ---------------- ---------------------------------------------------------------- 
+  Service ID       -                                                               
+  Class            definition_with_enum                                            
+  Tags             -                                                               
+  Public           no                                                              
+  Synthetic        no                                                              
+  Lazy             no                                                              
+  Shared           yes                                                             
+  Abstract         no                                                              
+  Autowired        no                                                              
+  Autoconfigured   no                                                              
+  Arguments        Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum::FOO  
+ ---------------- ---------------------------------------------------------------- 
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.xml
new file mode 100644
index 0000000000000..cb58a6d935e97
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_with_enum.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition class="definition_with_enum" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
+  <argument type="constant">Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum::FOO</argument>
+</definition>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.json
new file mode 100644
index 0000000000000..34d9e8f773d15
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.json
@@ -0,0 +1,17 @@
+{
+    "array_of_enums": [
+        "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Hearts",
+        "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Diamonds",
+        "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Clubs",
+        "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Spades"
+    ],
+    "backed_enum": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Hearts",
+    "map": {
+        "mixed": [
+            "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::Hearts",
+            "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\FooUnitEnum::BAR"
+        ],
+        "single": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\FooUnitEnum::BAR"
+    },
+    "unit_enum": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\FooUnitEnum::BAR"
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.md
new file mode 100644
index 0000000000000..e129a6c07ff0d
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.md
@@ -0,0 +1,7 @@
+Container parameters
+====================
+
+- `array_of_enums`: `["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::H...`
+- `backed_enum`: `Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Suit::Hearts`
+- `map`: `{"mixed":["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures...`
+- `unit_enum`: `Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum::BAR`
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.txt
new file mode 100644
index 0000000000000..42c6938150d7c
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.txt
@@ -0,0 +1,11 @@
+Symfony Container Parameters
+============================
+
+ ---------------- ----------------------------------------------------------------- 
+  Parameter        Value                                                            
+ ---------------- ----------------------------------------------------------------- 
+  array_of_enums   ["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::H...  
+  backed_enum      Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Suit::Hearts       
+  map              {"mixed":["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures...  
+  unit_enum        Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum::BAR   
+ ---------------- -----------------------------------------------------------------
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.xml
new file mode 100644
index 0000000000000..8fd512337916a
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_enums.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameters>
+  <parameter key="array_of_enums">["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures\\Suit::H...</parameter>
+  <parameter key="backed_enum">Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Suit::Hearts</parameter>
+  <parameter key="map">{"mixed":["Symfony\\Bundle\\FrameworkBundle\\Tests\\Fixtures...</parameter>
+  <parameter key="unit_enum">Symfony\Bundle\FrameworkBundle\Tests\Fixtures\FooUnitEnum::BAR</parameter>
+</parameters>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/FooUnitEnum.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/FooUnitEnum.php
new file mode 100644
index 0000000000000..02366bcf59c40
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/FooUnitEnum.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+enum FooUnitEnum
+{
+    case BAR;
+    case FOO;
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Suit.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Suit.php
new file mode 100644
index 0000000000000..6d9baba4c7ab6
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Suit.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+enum Suit: string
+{
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 6562fa2d1e241..1e382f1dcf0cb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/cache": "^4.4|^5.0",
         "symfony/config": "^4.4.11|~5.0.11|^5.1.3",
-        "symfony/dependency-injection": "^4.4.1|^5.0.1",
+        "symfony/dependency-injection": "^4.4.38|^5.0.1",
         "symfony/error-handler": "^4.4.1|^5.0.1",
         "symfony/http-foundation": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4",
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 789c8f7275ca3..24a90fbd9da2b 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -109,7 +109,7 @@ public function getParameterBag()
      *
      * @param string $name The parameter name
      *
-     * @return array|bool|string|int|float|null
+     * @return array|bool|string|int|float|\UnitEnum|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -133,8 +133,8 @@ public function hasParameter($name)
     /**
      * Sets a parameter.
      *
-     * @param string                           $name  The parameter name
-     * @param array|bool|string|int|float|null $value The parameter value
+     * @param string                                     $name  The parameter name
+     * @param array|bool|string|int|float|\UnitEnum|null $value The parameter value
      */
     public function setParameter($name, $value)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
index a3acbbde28785..e47e7f9fb888e 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -74,7 +74,7 @@ public function initialized($id);
      *
      * @param string $name The parameter name
      *
-     * @return array|bool|string|int|float|null
+     * @return array|bool|string|int|float|\UnitEnum|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -92,8 +92,8 @@ public function hasParameter($name);
     /**
      * Sets a parameter.
      *
-     * @param string                           $name  The parameter name
-     * @param array|bool|string|int|float|null $value The parameter value
+     * @param string                                     $name  The parameter name
+     * @param array|bool|string|int|float|\UnitEnum|null $value The parameter value
      */
     public function setParameter($name, $value);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 4bc1d3cb9e597..e2abcc2b94d49 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1436,10 +1436,11 @@ private function addDefaultParametersMethod(): string
             if ($key !== $resolvedKey = $this->container->resolveEnvPlaceholders($key)) {
                 throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: "%s".', $resolvedKey));
             }
-            $export = $this->exportParameters([$value]);
+            $hasEnum = false;
+            $export = $this->exportParameters([$value], '', 12, $hasEnum);
             $export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);
 
-            if (preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
+            if ($hasEnum || preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
                 $dynamicPhp[$key] = sprintf('%scase %s: $value = %s; break;', $export[0], $this->export($key), $export[1]);
             } else {
                 $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
@@ -1450,7 +1451,7 @@ private function addDefaultParametersMethod(): string
         $code = <<<'EOF'
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
@@ -1545,12 +1546,12 @@ protected function getDefaultParameters(): array
     /**
      * @throws InvalidArgumentException
      */
-    private function exportParameters(array $parameters, string $path = '', int $indent = 12): string
+    private function exportParameters(array $parameters, string $path = '', int $indent = 12, bool &$hasEnum = false): string
     {
         $php = [];
         foreach ($parameters as $key => $value) {
             if (\is_array($value)) {
-                $value = $this->exportParameters($value, $path.'/'.$key, $indent + 4);
+                $value = $this->exportParameters($value, $path.'/'.$key, $indent + 4, $hasEnum);
             } elseif ($value instanceof ArgumentInterface) {
                 throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain special arguments. "%s" found in "%s".', \get_class($value), $path.'/'.$key));
             } elseif ($value instanceof Variable) {
@@ -1561,6 +1562,9 @@ private function exportParameters(array $parameters, string $path = '', int $ind
                 throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain references to other services (reference to service "%s" found in "%s").', $value, $path.'/'.$key));
             } elseif ($value instanceof Expression) {
                 throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain expressions. Expression "%s" found in "%s".', $value, $path.'/'.$key));
+            } elseif ($value instanceof \UnitEnum) {
+                $hasEnum = true;
+                $value = sprintf('\%s::%s', \get_class($value), $value->name);
             } else {
                 $value = $this->export($value);
             }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
index 724a94e6dcc9a..966122765f320 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
@@ -36,7 +36,7 @@ public function all()
     /**
      * {@inheritdoc}
      *
-     * @return array|bool|string|int|float|null
+     * @return array|bool|string|int|float|\UnitEnum|null
      */
     public function get($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
index eb033bf4f245f..cbba67cd330a4 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -47,7 +47,7 @@ public function all();
      *
      * @param string $name The parameter name
      *
-     * @return array|bool|string|int|float|null
+     * @return array|bool|string|int|float|\UnitEnum|null
      *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
@@ -63,8 +63,8 @@ public function remove($name);
     /**
      * Sets a service container parameter.
      *
-     * @param string                           $name  The parameter name
-     * @param array|bool|string|int|float|null $value The parameter value
+     * @param string                                     $name  The parameter name
+     * @param array|bool|string|int|float|\UnitEnum|null $value The parameter value
      *
      * @throws LogicException if the parameter can not be set
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 61040d3255d28..d5b0056efae54 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -22,6 +22,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
@@ -1217,16 +1218,37 @@ public function testDumpHandlesEnumeration()
             ->setPublic(true)
             ->addArgument(FooUnitEnum::BAR);
 
+        $container->setParameter('unit_enum', FooUnitEnum::BAR);
+        $container->setParameter('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        eval('?>'.$dumper->dump([
+        eval('?>'.$dumpedContainer = $dumper->dump([
             'class' => 'Symfony_DI_PhpDumper_Test_Enumeration',
         ]));
 
+        /** @var Container $container */
         $container = new \Symfony_DI_PhpDumper_Test_Enumeration();
 
         $this->assertSame(FooUnitEnum::BAR, $container->get('foo')->getBar());
+        $this->assertSame(FooUnitEnum::BAR, $container->getParameter('unit_enum'));
+        $this->assertSame([FooUnitEnum::BAR, FooUnitEnum::FOO], $container->getParameter('enum_array'));
+        $this->assertStringMatchesFormat(<<<'PHP'
+%A
+    private function getDynamicParameter(string $name)
+    {
+        switch ($name) {
+            case 'unit_enum': $value = \Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR; break;
+            case 'enum_array': $value = [
+                0 => \Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR,
+                1 => \Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::FOO,
+            ]; break;
+            default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
+        }
+%A
+PHP
+            , $dumpedContainer
+        );
     }
 
     public function testUninitializedSyntheticReference()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 18caa150f278e..34878972a62b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -263,6 +263,9 @@ public function testDumpHandlesEnumeration()
             ->setPublic(true)
             ->addArgument(FooUnitEnum::BAR);
 
+        $container->setParameter('unit_enum', FooUnitEnum::BAR);
+        $container->setParameter('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
+
         $container->compile();
         $dumper = new XmlDumper($container);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
index 9a973afe69df7..4632835babc61 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -142,6 +142,9 @@ public function testDumpHandlesEnumeration()
             ->setPublic(true)
             ->addArgument(FooUnitEnum::BAR);
 
+        $container->setParameter('unit_enum', FooUnitEnum::BAR);
+        $container->setParameter('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
+
         $container->compile();
         $dumper = new YamlDumper($container);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooUnitEnum.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooUnitEnum.php
index d51cf9c995e26..e6ce9639193a6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooUnitEnum.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooUnitEnum.php
@@ -5,4 +5,5 @@
 enum FooUnitEnum
 {
     case BAR;
+    case FOO;
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index ce53539210c8f..76cbe12ae2dfd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -60,7 +60,7 @@ protected function getTestService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 36f55be0012df..12967160482f9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -60,7 +60,7 @@ protected function getTestService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index 2344547145658..efe2265747f02 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -75,7 +75,7 @@ protected function getServiceWithMethodCallAndFactoryService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index 5b6d6d7ba4bbb..1028cb4fe203f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -71,7 +71,7 @@ protected function getTestService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index a2473e1c3173f..c99cdb5ece054 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index d3ef7465d51bf..bafa3d43a98c1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -461,7 +461,7 @@ class ProjectServiceContainer extends Container
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index ddc9228b64841..53b89d9e01223 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -410,7 +410,7 @@ protected function getFactorySimpleService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index 2ce28b8a370c0..e3b6921da8a9f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -459,7 +459,7 @@ class ProjectServiceContainer extends Container
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 6c50daf2a4970..3332884c20f1d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -95,7 +95,7 @@ class ProjectServiceContainer extends Container
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 044e4e9f8aac5..13de0aa45cae6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -64,7 +64,7 @@ protected function getBarService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index fd7da6241f715..08dba3ff31f7e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
index 1f89a77b73af4..b272f1e892f56 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
index 8d30fcae95944..5ff213f316b39 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
index 716a52a3f1d63..6206018451b28 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
@@ -73,7 +73,7 @@ protected function getFooService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index 015949d4fecc0..c69fcf53f9781 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -410,7 +410,7 @@ protected function getFactorySimpleService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index ba3c0cba8939a..d3d9674e5a408 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -93,7 +93,7 @@ protected function getC2Service()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
index f2368dc216966..e58d91d732650 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
index c62cd98e340f6..32a59c514a8cd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 8b3fe88c485d4..d282e0481ca9e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -78,7 +78,7 @@ protected function getContainer_EnvVarProcessorsLocatorService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
index 77d28cda7cab9..d60ba7b6a4f1a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -82,7 +82,7 @@ protected function getFooohnoService()
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
index 347724324983b..d49c03fd93f23 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
@@ -47,7 +47,7 @@ public function getRemovedIds(): array
     }
 
     /**
-     * @return array|bool|float|int|string|null
+     * @return array|bool|float|int|string|\UnitEnum|null
      */
     public function getParameter($name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_enumeration.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_enumeration.xml
index 30e80f0053d2d..3f26d968a0ee1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_enumeration.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_enumeration.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <parameters>
+    <parameter key="unit_enum" type="constant">Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR</parameter>
+    <parameter key="enum_array" type="collection">
+      <parameter type="constant">Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR</parameter>
+      <parameter type="constant">Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::FOO</parameter>
+    </parameter>
+  </parameters>
   <services>
     <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
     <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute" class="Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute" public="true">
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_enumeration.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_enumeration.yml
index 46bf505d44b80..0d335703383bc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_enumeration.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_enumeration.yml
@@ -1,3 +1,6 @@
+parameters:
+    unit_enum: !php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR
+    enum_array: [!php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR, !php/const Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::FOO]
 
 services:
     service_container:
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 15c0150872e28..ab08cb1cd964c 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -22,7 +22,7 @@
         "symfony/service-contracts": "^1.1.6|^2"
     },
     "require-dev": {
-        "symfony/yaml": "^4.4|^5.0",
+        "symfony/yaml": "^4.4.26|^5.0",
         "symfony/config": "^4.3",
         "symfony/expression-language": "^3.4|^4.0|^5.0"
     },
@@ -37,7 +37,7 @@
         "symfony/config": "<4.3|>=5.0",
         "symfony/finder": "<3.4",
         "symfony/proxy-manager-bridge": "<3.4",
-        "symfony/yaml": "<3.4"
+        "symfony/yaml": "<4.4.26"
     },
     "provide": {
         "psr/container-implementation": "1.0",

From 28d23af5d0a5f7ddaf63ab7c0cef3460875b80de Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 4 Feb 2022 18:06:06 +0100
Subject: [PATCH 17/56] [Messenger] Retain correlation id from \AmqpEnvelope
 when retrying a message

---
 .../Messenger/Tests/Transport/AmqpExt/AmqpStampTest.php  | 9 ++++++++-
 .../Component/Messenger/Transport/AmqpExt/AmqpStamp.php  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpStampTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpStampTest.php
index 732be411c1474..14fc7c14d0fff 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpStampTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpStampTest.php
@@ -42,6 +42,7 @@ public function testCreateFromAmqpEnvelope()
         $amqpEnvelope->method('getDeliveryMode')->willReturn(2);
         $amqpEnvelope->method('getPriority')->willReturn(5);
         $amqpEnvelope->method('getAppId')->willReturn('appid');
+        $amqpEnvelope->method('getCorrelationId')->willReturn('foo');
 
         $stamp = AmqpStamp::createFromAmqpEnvelope($amqpEnvelope);
 
@@ -49,6 +50,7 @@ public function testCreateFromAmqpEnvelope()
         $this->assertSame($amqpEnvelope->getDeliveryMode(), $stamp->getAttributes()['delivery_mode']);
         $this->assertSame($amqpEnvelope->getPriority(), $stamp->getAttributes()['priority']);
         $this->assertSame($amqpEnvelope->getAppId(), $stamp->getAttributes()['app_id']);
+        $this->assertSame($amqpEnvelope->getCorrelationId(), $stamp->getAttributes()['correlation_id']);
         $this->assertSame(\AMQP_NOPARAM, $stamp->getFlags());
     }
 
@@ -59,8 +61,12 @@ public function testCreateFromAmqpEnvelopeWithPreviousStamp()
         $amqpEnvelope->method('getDeliveryMode')->willReturn(2);
         $amqpEnvelope->method('getPriority')->willReturn(5);
         $amqpEnvelope->method('getAppId')->willReturn('appid');
+        $amqpEnvelope->method('getCorrelationId')->willReturn('foo');
 
-        $previousStamp = new AmqpStamp('otherroutingkey', \AMQP_MANDATORY, ['priority' => 8]);
+        $previousStamp = new AmqpStamp('otherroutingkey', \AMQP_MANDATORY, [
+            'priority' => 8,
+            'correlation_id' => 'bar',
+        ]);
 
         $stamp = AmqpStamp::createFromAmqpEnvelope($amqpEnvelope, $previousStamp);
 
@@ -68,6 +74,7 @@ public function testCreateFromAmqpEnvelopeWithPreviousStamp()
         $this->assertSame($amqpEnvelope->getDeliveryMode(), $stamp->getAttributes()['delivery_mode']);
         $this->assertSame(8, $stamp->getAttributes()['priority']);
         $this->assertSame($amqpEnvelope->getAppId(), $stamp->getAttributes()['app_id']);
+        $this->assertSame('bar', $stamp->getAttributes()['correlation_id']);
         $this->assertSame(\AMQP_MANDATORY, $stamp->getFlags());
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php
index 9b0aeb31ddc09..85c6074a1d224 100644
--- a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php
+++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php
@@ -61,6 +61,7 @@ public static function createFromAmqpEnvelope(\AMQPEnvelope $amqpEnvelope, self
         $attr['expiration'] = $attr['expiration'] ?? $amqpEnvelope->getExpiration();
         $attr['type'] = $attr['type'] ?? $amqpEnvelope->getType();
         $attr['reply_to'] = $attr['reply_to'] ?? $amqpEnvelope->getReplyTo();
+        $attr['correlation_id'] = $attr['correlation_id'] ?? $amqpEnvelope->getCorrelationId();
 
         return new self($previousStamp->routingKey ?? $amqpEnvelope->getRoutingKey(), $previousStamp->flags ?? \AMQP_NOPARAM, $attr);
     }

From 214fdd16329abe12c773cb1c8b7e0b127c36cf8f Mon Sep 17 00:00:00 2001
From: Andrey Lebedev <andrew.lebedev@gmail.com>
Date: Wed, 2 Feb 2022 13:14:39 +0300
Subject: [PATCH 18/56] [Cache] Fix connecting to Redis via a socket file

---
 .github/workflows/integration-tests.yml       | 16 +++++++++++-
 phpunit.xml.dist                              |  1 +
 .../Tests/Functional/CachePoolsTest.php       |  2 +-
 .../app/CachePools/redis_custom_config.yml    |  4 +--
 .../Adapter/AbstractRedisAdapterTest.php      |  4 +--
 .../Cache/Tests/Adapter/PredisAdapterTest.php |  7 ++---
 .../Adapter/PredisClusterAdapterTest.php      |  2 +-
 .../Cache/Tests/Adapter/RedisAdapterTest.php  | 26 ++++++++++++++-----
 .../Tests/Simple/AbstractRedisCacheTest.php   |  2 +-
 .../Component/Cache/Traits/RedisTrait.php     |  2 +-
 src/Symfony/Component/Cache/phpunit.xml.dist  |  1 +
 .../AbstractRedisSessionHandlerTestCase.php   |  2 +-
 .../PredisClusterSessionHandlerTest.php       |  2 +-
 .../Handler/PredisSessionHandlerTest.php      |  2 +-
 .../Handler/RedisSessionHandlerTest.php       |  2 +-
 .../Lock/Tests/Store/CombinedStoreTest.php    |  2 +-
 .../Lock/Tests/Store/PredisStoreTest.php      |  4 +--
 .../Lock/Tests/Store/RedisArrayStoreTest.php  |  2 +-
 .../Lock/Tests/Store/RedisStoreTest.php       |  4 +--
 .../Tests/Store/RetryTillSaveStoreTest.php    |  2 +-
 .../RedisExt/RedisTransportFactoryTest.php    |  2 +-
 .../Tests/Caster/RedisCasterTest.php          |  8 +++---
 22 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 44aff90b5a81c..d1a4c29f0952c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -33,7 +33,7 @@ jobs:
       redis:
         image: redis:6.0.0
         ports:
-          - 6379:6379
+          - 16379:6379
       redis-cluster:
         image: grokzen/redis-cluster:5.0.4
         ports:
@@ -67,6 +67,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Install system dependencies
+        run: |
+          echo "::group::apt-get update"
+          sudo apt-get update
+          echo "::endgroup::"
+
+          echo "::group::install tools & libraries"
+          sudo apt-get install redis-server
+          sudo -- sh -c 'echo unixsocket /var/run/redis/redis-server.sock >> /etc/redis/redis.conf'
+          sudo -- sh -c 'echo unixsocketperm 777 >> /etc/redis/redis.conf'
+          sudo service redis-server restart
+          echo "::endgroup::"
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -99,6 +112,7 @@ jobs:
       - name: Run tests
         run: ./phpunit --group integration -v
         env:
+          REDIS_HOST: 'localhost:16379'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0c4dd3ee87287..cd85992d44d55 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -18,6 +18,7 @@
         <env name="LDAP_HOST" value="localhost" />
         <env name="LDAP_PORT" value="3389" />
         <env name="REDIS_HOST" value="localhost" />
+        <env name="REDIS_SOCKET" value="/var/run/redis/redis-server.sock" />
         <env name="MESSENGER_REDIS_DSN" value="redis://localhost/messages" />
         <env name="MEMCACHED_HOST" value="localhost" />
         <env name="MONGODB_HOST" value="localhost" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
index b7f29a0857852..fc53e26661993 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -121,7 +121,7 @@ protected static function createKernel(array $options = []): KernelInterface
     private function skipIfRedisUnavailable()
     {
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             self::markTestSkipped($e->getMessage());
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
index df20c5357f7a4..8681e59a7bb4a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -8,8 +8,8 @@ services:
     cache.test_redis_connection:
         public: false
         class: Redis
-        calls:
-            - [connect, ['%env(REDIS_HOST)%']]
+        factory: ['Symfony\Component\Cache\Adapter\RedisAdapter', 'createConnection']
+        arguments: ['redis://%env(REDIS_HOST)%']
 
     cache.app:
         parent: cache.adapter.redis
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
index cb0876d541b3e..a1e8d19edc5cc 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -36,9 +36,9 @@ public static function setUpBeforeClass(): void
             throw new SkippedTestSuiteError('Extension redis required.');
         }
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
-            throw new SkippedTestSuiteError($e->getMessage());
+            throw new SkippedTestSuiteError(getenv('REDIS_HOST').': '.$e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
index a1a2b4dda3fc8..f785499a7b733 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
@@ -22,7 +22,7 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')], ['prefix' => 'prefix_']);
+        self::$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]), ['prefix' => 'prefix_']);
     }
 
     public function testCreateConnection()
@@ -35,10 +35,11 @@ public function testCreateConnection()
         $connection = $redis->getConnection();
         $this->assertInstanceOf(StreamConnection::class, $connection);
 
+        $redisHost = explode(':', $redisHost);
         $params = [
             'scheme' => 'tcp',
-            'host' => $redisHost,
-            'port' => 6379,
+            'host' => $redisHost[0],
+            'port' => (int) ($redisHost[1] ?? 6379),
             'persistent' => 0,
             'timeout' => 3,
             'read_write_timeout' => 0,
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
index e2f09cd23ae44..936c04aad49fb 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -19,7 +19,7 @@ class PredisClusterAdapterTest extends AbstractRedisAdapterTest
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]], ['prefix' => 'prefix_']);
+        self::$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]), ['prefix' => 'prefix_']);
     }
 
     public static function tearDownAfterClass(): void
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
index b020ddc9f43a8..aa2ce75a4555d 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
@@ -40,30 +40,42 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n
         return $adapter;
     }
 
-    public function testCreateConnection()
+    public function testCreateHostConnection()
     {
         $redis = RedisAdapter::createConnection('redis:?host[h1]&host[h2]&host[/foo:]');
         $this->assertInstanceOf(\RedisArray::class, $redis);
         $this->assertSame(['h1:6379', 'h2:6379', '/foo'], $redis->_hosts());
         @$redis = null; // some versions of phpredis connect on destruct, let's silence the warning
 
-        $redisHost = getenv('REDIS_HOST');
+        $this->doTestCreateConnection(getenv('REDIS_HOST'));
+    }
+
+    public function testCreateSocketConnection()
+    {
+        if (!getenv('REDIS_SOCKET') || !file_exists(getenv('REDIS_SOCKET'))) {
+            $this->markTestSkipped('Redis socket not found');
+        }
+
+        $this->doTestCreateConnection(getenv('REDIS_SOCKET'));
+    }
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
+    private function doTestCreateConnection(string $uri)
+    {
+        $redis = RedisAdapter::createConnection('redis://'.$uri);
         $this->assertInstanceOf(\Redis::class, $redis);
         $this->assertTrue($redis->isConnected());
         $this->assertSame(0, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
+        $redis = RedisAdapter::createConnection('redis://'.$uri.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$uri, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
+        $redis = RedisAdapter::createConnection('redis://'.$uri.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection('redis://'.$uri, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
index 40830fc7fba1f..3e8ededc0f470 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void
             throw new SkippedTestSuiteError('Extension redis required.');
         }
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             throw new SkippedTestSuiteError($e->getMessage());
         }
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index d2e73ae566e6f..ce0a695ed4474 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -185,7 +185,7 @@ public static function createConnection($dsn, array $options = [])
 
             $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts, $tls) {
                 $host = $hosts[0]['host'] ?? $hosts[0]['path'];
-                $port = $hosts[0]['port'] ?? 6379;
+                $port = $hosts[0]['port'] ?? 0;
 
                 if (isset($hosts[0]['host']) && $tls) {
                     $host = 'tls://'.$host;
diff --git a/src/Symfony/Component/Cache/phpunit.xml.dist b/src/Symfony/Component/Cache/phpunit.xml.dist
index 591046cf1c41c..552fa55a2bc47 100644
--- a/src/Symfony/Component/Cache/phpunit.xml.dist
+++ b/src/Symfony/Component/Cache/phpunit.xml.dist
@@ -11,6 +11,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="REDIS_HOST" value="localhost" />
+        <env name="REDIS_SOCKET" value="/var/run/redis/redis-server.sock" />
         <env name="MEMCACHED_HOST" value="localhost" />
     </php>
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
index 3dcb3c51dbba3..c4da2b8673ae0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -45,7 +45,7 @@ protected function setUp(): void
             self::markTestSkipped('Extension redis required.');
         }
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             self::markTestSkipped($e->getMessage());
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
index 8926fb1a93a14..fd4a13bef5fdf 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -20,6 +20,6 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
 {
     protected function createRedisClient(string $host): Client
     {
-        return new Client([['host' => $host]]);
+        return new Client([array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])]);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
index bb33a3d9a56e2..0dc194ba1d19f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
@@ -20,6 +20,6 @@ class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     protected function createRedisClient(string $host): Client
     {
-        return new Client(['host' => $host]);
+        return new Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]));
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
index e7fb1ca196ef4..7db8909919f52 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -22,7 +22,7 @@ class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
     protected function createRedisClient(string $host)
     {
         $client = new \Redis();
-        $client->connect($host);
+        $client->connect(...explode(':', $host));
 
         return $client;
     }
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
index a1b6a53fe718a..991208f8b204e 100644
--- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -41,7 +41,7 @@ protected function getClockDelay()
      */
     public function getStore(): PersistingStoreInterface
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {
diff --git a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
index 179a8246f7b78..a74f404ba60a7 100644
--- a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
@@ -21,7 +21,7 @@ class PredisStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass(): void
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {
@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
 
     protected function getRedisConnection()
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         $redis->connect();
 
         return $redis;
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
index 3b194d7c92f57..6574ac1a859c7 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
@@ -27,7 +27,7 @@ public static function setUpBeforeClass(): void
             throw new SkippedTestSuiteError('The RedisArray class is required.');
         }
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             throw new SkippedTestSuiteError($e->getMessage());
         }
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
index 0f01e26407bae..15eb3292e477f 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
@@ -26,7 +26,7 @@ class RedisStoreTest extends AbstractRedisStoreTest
     public static function setUpBeforeClass(): void
     {
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             throw new SkippedTestSuiteError($e->getMessage());
         }
@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void
     protected function getRedisConnection()
     {
         $redis = new \Redis();
-        $redis->connect(getenv('REDIS_HOST'));
+        $redis->connect(...explode(':', getenv('REDIS_HOST')));
 
         return $redis;
     }
diff --git a/src/Symfony/Component/Lock/Tests/Store/RetryTillSaveStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RetryTillSaveStoreTest.php
index 12d7d7a1494fa..6de1f803fd6ad 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RetryTillSaveStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RetryTillSaveStoreTest.php
@@ -24,7 +24,7 @@ class RetryTillSaveStoreTest extends AbstractStoreTest
 
     public function getStore(): PersistingStoreInterface
     {
-        $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
+        $redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
         try {
             $redis->connect();
         } catch (\Exception $e) {
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php
index 7e02c0d46acb5..bb8cf18da3395 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/RedisTransportFactoryTest.php
@@ -48,7 +48,7 @@ public function testCreateTransport()
     private function skipIfRedisUnavailable()
     {
         try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
+            (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
             self::markTestSkipped($e->getMessage());
         }
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
index 7060a7ddec0f4..058b95d0d0ab6 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
@@ -38,10 +38,10 @@ public function testNotConnected()
 
     public function testConnected()
     {
-        $redisHost = getenv('REDIS_HOST');
+        $redisHost = explode(':', getenv('REDIS_HOST')) + [1 => 6379];
         $redis = new \Redis();
         try {
-            $redis->connect($redisHost);
+            $redis->connect(...$redisHost);
         } catch (\Exception $e) {
             self::markTestSkipped($e->getMessage());
         }
@@ -49,8 +49,8 @@ public function testConnected()
         $xCast = <<<EODUMP
 Redis {%A
   isConnected: true
-  host: "$redisHost"
-  port: 6379
+  host: "{$redisHost[0]}"
+  port: {$redisHost[1]}
   auth: null
   mode: ATOMIC
   dbNum: 0

From 2094f4bdf1a56b82f7d0d9ec6e43782cafc8dce3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 4 Feb 2022 19:44:03 +0100
Subject: [PATCH 19/56] [HttpClient] fix destructing CurlResponse

---
 src/Symfony/Component/HttpClient/Response/CurlResponse.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
index cbd70e9e07ce4..ee0d3f655a6fb 100644
--- a/src/Symfony/Component/HttpClient/Response/CurlResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -233,7 +233,9 @@ public function __destruct()
 
             $this->doDestruct();
         } finally {
-            curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
+            if (\is_resource($this->handle) || $this->handle instanceof \CurlHandle) {
+                curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
+            }
         }
     }
 

From 48fbcc69dcc9a02b1c27576eb8ba00f07d4af340 Mon Sep 17 00:00:00 2001
From: Dilek Erkut <dlkerkut@gmail.com>
Date: Sun, 6 Feb 2022 16:51:19 +0100
Subject: [PATCH 20/56] 43460: add missing validator component turkish
 translations

---
 .../Resources/translations/validators.tr.xlf         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
index 8dc9c70de500d..715137d5890a9 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf
@@ -390,6 +390,18 @@
                 <source>This value should be a valid expression.</source>
                 <target>Bu değer geçerli bir ifade olmalıdır.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Bu değer geçerli bir CSS rengi değil.</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>This value is not a valid CIDR notation.</source>
+                <target>Bu değer geçerli bir CIDR yazımı değil.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
+                <target>Netmask'in değeri {{ min }} ve {{ max }} arasında olmaldır.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 3c59e0fde8b63745e8f8b5a13845027035893848 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 7 Feb 2022 19:30:07 +0100
Subject: [PATCH 21/56] [Cache] fix error handling

---
 .../Component/Cache/Adapter/AbstractAdapter.php   |  7 ++++++-
 .../Cache/Adapter/AbstractTagAwareAdapter.php     | 15 ++++++++++++---
 .../Cache/Adapter/RedisTagAwareAdapter.php        | 12 ++++++++++--
 src/Symfony/Component/Cache/Traits/RedisTrait.php |  3 ++-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 3b281bc87e8a8..59fe570b3123d 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -157,7 +157,12 @@ public function commit()
         $retry = $this->deferred = [];
 
         if ($expiredIds) {
-            $this->doDelete($expiredIds);
+            try {
+                $this->doDelete($expiredIds);
+            } catch (\Exception $e) {
+                $ok = false;
+                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
+            }
         }
         foreach ($byLifetime as $lifetime => $values) {
             try {
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
index 16029f3608ce7..6b62ae9826481 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -181,7 +181,12 @@ public function commit(): bool
 
         if ($expiredIds) {
             // Tags are not cleaned up in this case, however that is done on invalidateTags().
-            $this->doDelete($expiredIds);
+            try {
+                $this->doDelete($expiredIds);
+            } catch (\Exception $e) {
+                $ok = false;
+                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
+            }
         }
         foreach ($byLifetime as $lifetime => $values) {
             try {
@@ -295,8 +300,12 @@ public function invalidateTags(array $tags)
             $tagIds[] = $this->getId(self::TAGS_PREFIX.$tag);
         }
 
-        if ($this->doInvalidate($tagIds)) {
-            return true;
+        try {
+            if ($this->doInvalidate($tagIds)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to invalidate tags: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
         }
 
         return false;
diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
index b8b4b6f7b3134..3d950f9352756 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -14,6 +14,7 @@
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -58,6 +59,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
      * @var string|null detected eviction policy used on Redis server
      */
     private $redisEvictionPolicy;
+    private $namespace;
 
     /**
      * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis           The redis client
@@ -81,6 +83,7 @@ public function __construct($redis, string $namespace = '', int $defaultLifetime
         }
 
         $this->init($redis, $namespace, $defaultLifetime, new TagAwareMarshaller($marshaller));
+        $this->namespace = $namespace;
     }
 
     /**
@@ -160,7 +163,7 @@ protected function doDeleteYieldTags(array $ids): iterable
         });
 
         foreach ($results as $id => $result) {
-            if ($result instanceof \RedisException) {
+            if ($result instanceof \RedisException || $result instanceof ErrorInterface) {
                 CacheItem::log($this->logger, 'Failed to delete key "{key}": '.$result->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $result]);
 
                 continue;
@@ -254,7 +257,7 @@ protected function doInvalidate(array $tagIds): bool
 
         $success = true;
         foreach ($results as $id => $values) {
-            if ($values instanceof \RedisException) {
+            if ($values instanceof \RedisException || $values instanceof ErrorInterface) {
                 CacheItem::log($this->logger, 'Failed to invalidate key "{key}": '.$values->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $values]);
                 $success = false;
 
@@ -303,6 +306,11 @@ private function getRedisEvictionPolicy(): string
 
         foreach ($hosts as $host) {
             $info = $host->info('Memory');
+
+            if ($info instanceof ErrorInterface) {
+                continue;
+            }
+
             $info = $info['Memory'] ?? $info;
 
             return $this->redisEvictionPolicy = $info['maxmemory_policy'];
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index ce0a695ed4474..efff27296628d 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -14,6 +14,7 @@
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -386,7 +387,7 @@ protected function doClear($namespace)
             }
 
             $info = $host->info('Server');
-            $info = $info['Server'] ?? $info;
+            $info = !$info instanceof ErrorInterface ? $info['Server'] ?? $info : ['redis_version' => '2.0'];
 
             if (!$host instanceof \Predis\ClientInterface) {
                 $prefix = \defined('Redis::SCAN_PREFIX') && (\Redis::SCAN_PREFIX & $host->getOption(\Redis::OPT_SCAN)) ? '' : $host->getOption(\Redis::OPT_PREFIX);

From 7310ea562d2ef1904e816dd971fbc38f7e0475bd Mon Sep 17 00:00:00 2001
From: Clemens Krack <c.krack@wikando.de>
Date: Mon, 7 Feb 2022 16:42:49 +0100
Subject: [PATCH 22/56] [Mailer] Fix string-cast of exceptions thrown by
 authenticator in EsmtpTransport

---
 src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
index adfcb55eaa3fb..e3c30487ca6c4 100644
--- a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -173,7 +173,7 @@ private function handleAuth(array $modes): void
                 }
 
                 // keep the error message, but tries the other authenticators
-                $errors[$authenticator->getAuthKeyword()] = $e;
+                $errors[$authenticator->getAuthKeyword()] = $e->getMessage();
             }
         }
 

From 6cf0c68979d33c2f2592f830ab908eccba471b6f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 9 Feb 2022 09:45:10 +0100
Subject: [PATCH 23/56] Remove $supportedFeatureSetVersion static properties
 from form-related tests

---
 .../Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php      | 2 --
 src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php  | 2 --
 .../Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php       | 2 --
 .../Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php  | 2 --
 .../Twig/Tests/Extension/FormExtensionTableLayoutTest.php       | 2 --
 5 files changed, 10 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
index 42c0c5fb8c639..4b0a93884be3c 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -31,8 +31,6 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
      */
     private $em;
 
-    protected static $supportedFeatureSetVersion = 404;
-
     protected function getExtensions()
     {
         $manager = $this->createMock(ManagerRegistry::class);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index 7dc883badb0e1..cb7eeed32bbf2 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -63,8 +63,6 @@ class EntityTypeTest extends BaseTypeTest
      */
     private $emRegistry;
 
-    protected static $supportedFeatureSetVersion = 404;
-
     protected function setUp(): void
     {
         $this->em = DoctrineTestHelper::createTestEntityManager();
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 44cf60db3ac5c..eb40559ef6b55 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -17,8 +17,6 @@
 
 abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
 {
-    protected static $supportedFeatureSetVersion = 404;
-
     public function testLabelOnForm()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index ff9357627579c..99477a617229c 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -32,8 +32,6 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
      */
     private $renderer;
 
-    protected static $supportedFeatureSetVersion = 404;
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index 301a74ed94449..967e25ec6ec45 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -31,8 +31,6 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
      */
     private $renderer;
 
-    protected static $supportedFeatureSetVersion = 404;
-
     protected function setUp(): void
     {
         parent::setUp();

From 3f22483bf1b2f30d1d6e55adbc7bd0e8c3616512 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 9 Feb 2022 16:11:22 +0100
Subject: [PATCH 24/56] [Cache] Fix phpdoc

---
 .../Cache/Tests/Adapter/TagAwareAdapterTest.php     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
index 2ac5a459e7cbf..17913f980be71 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Tests\Fixtures\PrunableAdapter;
 
 /**
@@ -197,9 +198,9 @@ public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags
     }
 
     /**
-     * @return MockObject&PruneableCacheInterface
+     * @return PruneableInterface&MockObject
      */
-    private function getPruneableMock(): AdapterInterface
+    private function getPruneableMock(): PruneableInterface
     {
         $pruneable = $this->createMock(PrunableAdapter::class);
 
@@ -211,7 +212,10 @@ private function getPruneableMock(): AdapterInterface
         return $pruneable;
     }
 
-    private function getFailingPruneableMock(): AdapterInterface
+    /**
+     * @return PruneableInterface&MockObject
+     */
+    private function getFailingPruneableMock(): PruneableInterface
     {
         $pruneable = $this->createMock(PrunableAdapter::class);
 
@@ -223,6 +227,9 @@ private function getFailingPruneableMock(): AdapterInterface
         return $pruneable;
     }
 
+    /**
+     * @return AdapterInterface&MockObject
+     */
     private function getNonPruneableMock(): AdapterInterface
     {
         return $this->createMock(AdapterInterface::class);

From 9ce4531a551ce876cacb1b83717cfb33b942b54e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 10 Feb 2022 11:25:12 +0100
Subject: [PATCH 25/56] [Ldap] fix deprecation on PHP 8.1

---
 src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
index 0e2087f63cee1..a2e2d02b8dcda 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -105,7 +105,7 @@ public function rename(Entry $entry, $newRdn, $removeOldRdn = true)
     {
         $con = $this->getConnectionResource();
 
-        if (!@ldap_rename($con, $entry->getDn(), $newRdn, null, $removeOldRdn)) {
+        if (!@ldap_rename($con, $entry->getDn(), $newRdn, '', $removeOldRdn)) {
             throw new LdapException(sprintf('Could not rename entry "%s" to "%s": ', $entry->getDn(), $newRdn).ldap_error($con));
         }
     }

From 4b9692ca96005739b30c5a0f0dfb1f4d780f7a1b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 11 Feb 2022 12:47:24 +0100
Subject: [PATCH 26/56] [Cache] conflict with ext-memcached <= 3.1.5 on PHP 8.1

See https://github.com/php-memcached-dev/php-memcached/issues/496
---
 src/Symfony/Component/Cache/Traits/MemcachedTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
index b0c48d72a9797..853c8a712b2c9 100644
--- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
+++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -45,13 +45,13 @@ trait MemcachedTrait
 
     public static function isSupported()
     {
-        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
+        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');
     }
 
     private function init(\Memcached $client, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         if ('Memcached' === \get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);

From 9bb2552c5004034ad5861ecd810e16db4eb86c71 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 11 Feb 2022 12:50:02 +0100
Subject: [PATCH 27/56] [Cache] fix tests

---
 .../Component/Cache/Tests/Adapter/MemcachedAdapterTest.php      | 2 +-
 src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php | 2 +-
 src/Symfony/Component/Cache/Traits/MemcachedTrait.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
index 1a1faed9e7379..ef024c97bbd43 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -33,7 +33,7 @@ class MemcachedAdapterTest extends AdapterTestCase
     public static function setUpBeforeClass(): void
     {
         if (!MemcachedAdapter::isSupported()) {
-            throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.');
+            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
         }
         self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
         self::$client->get('foo');
diff --git a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
index 1f47faa16cf30..9da19ff11a1d8 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/MemcachedCacheTest.php
@@ -34,7 +34,7 @@ class MemcachedCacheTest extends CacheTestCase
     public static function setUpBeforeClass(): void
     {
         if (!MemcachedCache::isSupported()) {
-            throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.');
+            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
         }
         self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'));
         self::$client->get('foo');
diff --git a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
index 853c8a712b2c9..ebcb160c61888 100644
--- a/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
+++ b/src/Symfony/Component/Cache/Traits/MemcachedTrait.php
@@ -92,7 +92,7 @@ public static function createConnection($servers, array $options = [])
             throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', \gettype($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {

From 9b5c564a8e808ddd1ff13585490bc982cdd5a020 Mon Sep 17 00:00:00 2001
From: Arend Hummeling <arend@adivare.nl>
Date: Fri, 11 Feb 2022 14:23:17 +0100
Subject: [PATCH 28/56] fix sorting bug

Fixed incorrect assumption that the minimum priority is zero
leading to an unsorted list of negative priorities.
---
 .../Console/Descriptor/Descriptor.php         |  2 +-
 .../Console/Descriptor/ObjectsProvider.php    |  8 ++++++++
 .../Descriptor/builder_priority_tag.json      | 19 +++++++++++++++++++
 .../Descriptor/builder_priority_tag.md        | 14 ++++++++++++++
 .../Descriptor/builder_priority_tag.txt       |  1 +
 .../Descriptor/builder_priority_tag.xml       |  7 +++++++
 6 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index ed8a9118b4309..ab77fbf23b0c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -261,7 +261,7 @@ protected function sortTaggedServicesByPriority(array $services): array
     {
         $maxPriority = [];
         foreach ($services as $service => $tags) {
-            $maxPriority[$service] = 0;
+            $maxPriority[$service] = \PHP_INT_MIN;
             foreach ($tags as $tag) {
                 $currentPriority = $tag['priority'] ?? 0;
                 if ($maxPriority[$service] < $currentPriority) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
index e44fcf6395164..05031fa7fcfb6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -171,6 +171,7 @@ public static function getContainerDefinitionsWithPriorityTags()
         $definition1 = new Definition('Full\\Qualified\\Class1');
         $definition2 = new Definition('Full\\Qualified\\Class2');
         $definition3 = new Definition('Full\\Qualified\\Class3');
+        $definition4 = new Definition('Full\\Qualified\\Class4');
 
         return [
             'definition_1' => $definition1
@@ -199,6 +200,13 @@ public static function getContainerDefinitionsWithPriorityTags()
                 ->setAbstract(false)
                 ->addTag('tag1', ['attr1' => 'val1', 'attr2' => 'val2', 'priority' => 0])
                 ->addTag('tag1', ['attr3' => 'val3', 'priority' => 40]),
+            'definition_4' => $definition4
+                ->setPublic(true)
+                ->setSynthetic(true)
+                ->setFile('/path/to/file')
+                ->setLazy(false)
+                ->setAbstract(false)
+                ->addTag('tag1', ['priority' => 0]),
         ];
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.json
index fe47af88b8d2d..a9d9697847fdb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.json
@@ -63,6 +63,25 @@
                 }
             ]
         },
+        "definition_4": {
+            "class": "Full\\Qualified\\Class4",
+            "public": true,
+            "synthetic": true,
+            "lazy": false,
+            "shared": true,
+            "abstract": false,
+            "autowire": false,
+            "autoconfigure": false,
+            "file": "\/path\/to\/file",
+            "tags": [
+                {
+                    "name": "tag1",
+                    "parameters": {
+                        "priority": 0
+                    }
+                }
+            ]
+        },
         "definition_2": {
             "class": "Full\\Qualified\\Class2",
             "public": true,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.md
index 4ed3e82f0297b..8c0fef6aa3bea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.md
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.md
@@ -44,6 +44,20 @@ Definitions
     - Attr2: val2
 - Tag: `tag2`
 
+### definition_4
+
+- Class: `Full\Qualified\Class4`
+- Public: yes
+- Synthetic: yes
+- Lazy: no
+- Shared: yes
+- Abstract: no
+- Autowired: no
+- Autoconfigured: no
+- File: `/path/to/file`
+- Tag: `tag1`
+    - Priority: 0
+
 ### definition_2
 
 - Class: `Full\Qualified\Class2`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.txt
index 3cbca0110bcce..7884a05c2a690 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.txt
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.txt
@@ -9,6 +9,7 @@
     "            val1    val2    0                                         
   definition_1   val1            30                 Full\Qualified\Class1  
     "                    val2                                              
+  definition_4                   0                  Full\Qualified\Class4  
   definition_2   val1    val2    -20                Full\Qualified\Class2  
  -------------- ------- ------- ---------- ------- ----------------------- 
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.xml
index 8e886bed25579..2e00c99955257 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_priority_tag.xml
@@ -29,6 +29,13 @@
       <tag name="tag2"/>
     </tags>
   </definition>
+  <definition id="definition_4" class="Full\Qualified\Class4" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
+    <tags>
+      <tag name="tag1">
+        <parameter name="priority">0</parameter>
+      </tag>
+    </tags>
+  </definition>
   <definition id="definition_2" class="Full\Qualified\Class2" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
     <tags>
       <tag name="tag1">

From abe18a0f321762edd61d409e1164a7469d9aee71 Mon Sep 17 00:00:00 2001
From: benjaminmal <bbenben778@gmail.com>
Date: Sat, 5 Feb 2022 17:00:56 +0100
Subject: [PATCH 29/56] [Serializer] Fix ignored callbacks in denormalization

---
 .../Normalizer/AbstractNormalizer.php         |  74 +++++--
 .../Normalizer/AbstractObjectNormalizer.php   |  28 +--
 .../Normalizer/Features/CallbacksObject.php   |  23 +-
 .../Features/CallbacksTestTrait.php           | 207 +++++++++++++++++-
 .../Normalizer/GetSetMethodNormalizerTest.php |   9 +-
 .../Tests/Normalizer/ObjectNormalizerTest.php |   7 +-
 .../Normalizer/PropertyNormalizerTest.php     |   7 +-
 7 files changed, 299 insertions(+), 56 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 8457b5eef6c3a..7a43e63c9b7a4 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -79,15 +79,15 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
     public const DEFAULT_CONSTRUCTOR_ARGUMENTS = 'default_constructor_arguments';
 
     /**
-     * Hashmap of field name => callable to normalize this field.
+     * Hashmap of field name => callable to (de)normalize this field.
      *
      * The callable is called if the field is encountered with the arguments:
      *
-     * - mixed  $attributeValue value of this field
-     * - object $object         the whole object being normalized
-     * - string $attributeName  name of the attribute being normalized
-     * - string $format         the requested format
-     * - array  $context        the serialization context
+     * - mixed         $attributeValue value of this field
+     * - object|string $object         the whole object being normalized or the object's class being denormalized
+     * - string        $attributeName  name of the attribute being (de)normalized
+     * - string        $format         the requested format
+     * - array         $context        the serialization context
      */
     public const CALLBACKS = 'callbacks';
 
@@ -168,17 +168,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         $this->nameConverter = $nameConverter;
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
 
-        if (isset($this->defaultContext[self::CALLBACKS])) {
-            if (!\is_array($this->defaultContext[self::CALLBACKS])) {
-                throw new InvalidArgumentException(sprintf('The "%s" default context option must be an array of callables.', self::CALLBACKS));
-            }
-
-            foreach ($this->defaultContext[self::CALLBACKS] as $attribute => $callback) {
-                if (!\is_callable($callback)) {
-                    throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s" default context option.', $attribute, self::CALLBACKS));
-                }
-            }
-        }
+        $this->validateCallbackContext($this->defaultContext, 'default');
 
         if (isset($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]) && !\is_callable($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER])) {
             throw new InvalidArgumentException(sprintf('Invalid callback found in the "%s" default context option.', self::CIRCULAR_REFERENCE_HANDLER));
@@ -220,11 +210,11 @@ public function setCircularReferenceHandler(callable $circularReferenceHandler)
     }
 
     /**
-     * Sets normalization callbacks.
+     * Sets (de)normalization callbacks.
      *
      * @deprecated since Symfony 4.2
      *
-     * @param callable[] $callbacks Help normalize the result
+     * @param callable[] $callbacks Help (de)normalize the result
      *
      * @return self
      *
@@ -532,7 +522,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
                     throw new LogicException(sprintf('Cannot create an instance of "%s" from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameterClass, static::class));
                 }
 
-                return $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $parameterName, $format));
+                $parameterData = $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $parameterName, $format));
             }
         } catch (\ReflectionException $e) {
             throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $parameterName), 0, $e);
@@ -544,7 +534,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
             return null;
         }
 
-        return $parameterData;
+        return $this->applyCallbacks($parameterData, $class->getName(), $parameterName, $format, $context);
     }
 
     /**
@@ -565,4 +555,46 @@ protected function createChildContext(array $parentContext, $attribute/*, ?strin
 
         return $parentContext;
     }
+
+    /**
+     * Validate callbacks set in context.
+     *
+     * @param string $contextType Used to specify which context is invalid in exceptions
+     *
+     * @throws InvalidArgumentException
+     */
+    final protected function validateCallbackContext(array $context, string $contextType = ''): void
+    {
+        if (!isset($context[self::CALLBACKS])) {
+            return;
+        }
+
+        if (!\is_array($context[self::CALLBACKS])) {
+            throw new InvalidArgumentException(sprintf('The "%s"%s context option must be an array of callables.', self::CALLBACKS, '' !== $contextType ? " $contextType" : ''));
+        }
+
+        foreach ($context[self::CALLBACKS] as $attribute => $callback) {
+            if (!\is_callable($callback)) {
+                throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s"%s context option.', $attribute, self::CALLBACKS, '' !== $contextType ? " $contextType" : ''));
+            }
+        }
+    }
+
+    /**
+     * Apply callbacks set in context.
+     *
+     * @param mixed         $value
+     * @param object|string $object Can be either the object being normalizing or the object's class being denormalized
+     *
+     * @return mixed
+     */
+    final protected function applyCallbacks($value, $object, string $attribute, ?string $format, array $context)
+    {
+        /**
+         * @var callable|null
+         */
+        $callback = $context[self::CALLBACKS][$attribute] ?? $this->defaultContext[self::CALLBACKS][$attribute] ?? $this->callbacks[$attribute] ?? null;
+
+        return $callback ? $callback($value, $object, $attribute, $format, $context) : $value;
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 57df0b6b8e521..388ba10373594 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -145,17 +145,7 @@ public function normalize($object, $format = null, array $context = [])
             $context['cache_key'] = $this->getCacheKey($format, $context);
         }
 
-        if (isset($context[self::CALLBACKS])) {
-            if (!\is_array($context[self::CALLBACKS])) {
-                throw new InvalidArgumentException(sprintf('The "%s" context option must be an array of callables.', self::CALLBACKS));
-            }
-
-            foreach ($context[self::CALLBACKS] as $attribute => $callback) {
-                if (!\is_callable($callback)) {
-                    throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s" context option.', $attribute, self::CALLBACKS));
-                }
-            }
-        }
+        $this->validateCallbackContext($context);
 
         if ($this->isCircularReference($object, $context)) {
             return $this->handleCircularReference($object, $format, $context);
@@ -203,13 +193,7 @@ public function normalize($object, $format = null, array $context = [])
                 $attributeValue = $maxDepthHandler($attributeValue, $object, $attribute, $format, $context);
             }
 
-            /**
-             * @var callable|null
-             */
-            $callback = $context[self::CALLBACKS][$attribute] ?? $this->defaultContext[self::CALLBACKS][$attribute] ?? $this->callbacks[$attribute] ?? null;
-            if ($callback) {
-                $attributeValue = $callback($attributeValue, $object, $attribute, $format, $context);
-            }
+            $attributeValue = $this->applyCallbacks($attributeValue, $object, $attribute, $format, $context);
 
             if (null !== $attributeValue && !is_scalar($attributeValue)) {
                 $stack[$attribute] = $attributeValue;
@@ -346,6 +330,8 @@ public function denormalize($data, $type, $format = null, array $context = [])
             $context['cache_key'] = $this->getCacheKey($format, $context);
         }
 
+        $this->validateCallbackContext($context);
+
         $allowedAttributes = $this->getAllowedAttributes($type, $context, true);
         $normalizedData = $this->prepareForDenormalization($data);
         $extraAttributes = [];
@@ -375,6 +361,8 @@ public function denormalize($data, $type, $format = null, array $context = [])
             }
 
             $value = $this->validateAndDenormalize($resolvedClass, $attribute, $value, $format, $context);
+            $value = $this->applyCallbacks($value, $resolvedClass, $attribute, $format, $context);
+
             try {
                 $this->setAttributeValue($object, $attribute, $value, $format, $context);
             } catch (InvalidArgumentException $e) {
@@ -509,7 +497,9 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
             return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);
         }
 
-        return $this->validateAndDenormalize($class->getName(), $parameterName, $parameterData, $format, $context);
+        $parameterData = $this->validateAndDenormalize($class->getName(), $parameterName, $parameterData, $format, $context);
+
+        return $this->applyCallbacks($parameterData, $class->getName(), $parameterName, $format, $context);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php
index d2290e6dda0e5..4ed3ff1c4f0a4 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksObject.php
@@ -6,13 +6,34 @@ class CallbacksObject
 {
     public $bar;
 
-    public function __construct($bar = null)
+    /**
+     * @var string|null
+     */
+    public $foo;
+
+    public function __construct($bar = null, string $foo = null)
     {
         $this->bar = $bar;
+        $this->foo = $foo;
     }
 
     public function getBar()
     {
         return $this->bar;
     }
+
+    public function setBar($bar)
+    {
+        $this->bar = $bar;
+    }
+
+    public function getFoo(): ?string
+    {
+        return $this->foo;
+    }
+
+    public function setFoo(?string $foo)
+    {
+        $this->foo = $foo;
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
index 459b01c92408f..4a14693002bd9 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
@@ -2,6 +2,9 @@
 
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
+use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
+use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -12,20 +15,92 @@ trait CallbacksTestTrait
 {
     abstract protected function getNormalizerForCallbacks(): NormalizerInterface;
 
+    abstract protected function getNormalizerForCallbacksWithPropertyTypeExtractor(): NormalizerInterface;
+
     /**
-     * @dataProvider provideCallbacks
+     * @dataProvider provideNormalizeCallbacks
      */
-    public function testCallbacks($callbacks, $valueBar, $result)
+    public function testNormalizeCallbacks($callbacks, $valueBar, $result)
     {
         $normalizer = $this->getNormalizerForCallbacks();
 
         $obj = new CallbacksObject();
         $obj->bar = $valueBar;
 
-        $this->assertEquals(
-            $result,
-            $normalizer->normalize($obj, 'any', ['callbacks' => $callbacks])
-        );
+        $this->assertSame($result, $normalizer->normalize($obj, 'any', ['callbacks' => $callbacks]));
+    }
+
+    /**
+     * @dataProvider provideNormalizeCallbacks
+     */
+    public function testNormalizeCallbacksWithTypedProperty($callbacks, $valueBar, $result)
+    {
+        $normalizer = $this->getNormalizerForCallbacksWithPropertyTypeExtractor();
+
+        $obj = new CallbacksObject();
+        $obj->bar = $valueBar;
+
+        $this->assertSame($result, $normalizer->normalize($obj, 'any', ['callbacks' => $callbacks]));
+    }
+
+    /**
+     * @dataProvider provideNormalizeCallbacks
+     */
+    public function testNormalizeCallbacksWithNoConstructorArgument($callbacks, $valueBar, $result)
+    {
+        $normalizer = $this->getNormalizerForCallbacksWithPropertyTypeExtractor();
+
+        $obj = new class() extends CallbacksObject {
+            public function __construct()
+            {
+            }
+        };
+
+        $obj->bar = $valueBar;
+
+        $this->assertSame($result, $normalizer->normalize($obj, 'any', ['callbacks' => $callbacks]));
+    }
+
+    /**
+     * @dataProvider provideDenormalizeCallbacks
+     */
+    public function testDenormalizeCallbacks($callbacks, $valueBar, $result)
+    {
+        $normalizer = $this->getNormalizerForCallbacks();
+
+        $obj = $normalizer->denormalize(['bar' => $valueBar], CallbacksObject::class, 'any', ['callbacks' => $callbacks]);
+        $this->assertInstanceof(CallbacksObject::class, $obj);
+        $this->assertEquals($result, $obj);
+    }
+
+    /**
+     * @dataProvider providerDenormalizeCallbacksWithTypedProperty
+     */
+    public function testDenormalizeCallbacksWithTypedProperty($callbacks, $valueBar, $result)
+    {
+        $normalizer = $this->getNormalizerForCallbacksWithPropertyTypeExtractor();
+
+        $obj = $normalizer->denormalize(['foo' => $valueBar], CallbacksObject::class, 'any', ['callbacks' => $callbacks]);
+        $this->assertInstanceof(CallbacksObject::class, $obj);
+        $this->assertEquals($result, $obj);
+    }
+
+    /**
+     * @dataProvider providerDenormalizeCallbacksWithTypedProperty
+     */
+    public function testDenormalizeCallbacksWithNoConstructorArgument($callbacks, $valueBar, $result)
+    {
+        $normalizer = $this->getNormalizerForCallbacksWithPropertyTypeExtractor();
+
+        $objWithNoConstructorArgument = new class() extends CallbacksObject {
+            public function __construct()
+            {
+            }
+        };
+
+        $obj = $normalizer->denormalize(['foo' => $valueBar], \get_class($objWithNoConstructorArgument), 'any', ['callbacks' => $callbacks]);
+        $this->assertInstanceof(\get_class($objWithNoConstructorArgument), $obj);
+        $this->assertEquals($result->getBar(), $obj->getBar());
     }
 
     /**
@@ -42,7 +117,7 @@ public function testUncallableCallbacks($callbacks)
         $normalizer->normalize($obj, null, ['callbacks' => $callbacks]);
     }
 
-    public function provideCallbacks()
+    public function provideNormalizeCallbacks()
     {
         return [
             'Change a string' => [
@@ -54,7 +129,7 @@ public function provideCallbacks()
                     },
                 ],
                 'baz',
-                ['bar' => 'baz'],
+                ['bar' => 'baz', 'foo' => null],
             ],
             'Null an item' => [
                 [
@@ -67,7 +142,7 @@ public function provideCallbacks()
                     },
                 ],
                 'baz',
-                ['bar' => null],
+                ['bar' => null, 'foo' => null],
             ],
             'Format a date' => [
                 [
@@ -78,7 +153,71 @@ public function provideCallbacks()
                     },
                 ],
                 new \DateTime('2011-09-10 06:30:00'),
-                ['bar' => '10-09-2011 06:30:00'],
+                ['bar' => '10-09-2011 06:30:00', 'foo' => null],
+            ],
+            'Collect a property' => [
+                [
+                    'bar' => function (array $bars) {
+                        $result = '';
+                        foreach ($bars as $bar) {
+                            $result .= $bar->bar;
+                        }
+
+                        return $result;
+                    },
+                ],
+                [new CallbacksObject('baz'), new CallbacksObject('quux')],
+                ['bar' => 'bazquux', 'foo' => null],
+            ],
+            'Count a property' => [
+                [
+                    'bar' => function (array $bars) {
+                        return \count($bars);
+                    },
+                ],
+                [new CallbacksObject(), new CallbacksObject()],
+                ['bar' => 2, 'foo' => null],
+            ],
+        ];
+    }
+
+    public function provideDenormalizeCallbacks(): array
+    {
+        return [
+            'Change a string' => [
+                [
+                    'bar' => function ($bar) {
+                        $this->assertEquals('bar', $bar);
+
+                        return $bar;
+                    },
+                ],
+                'bar',
+                new CallbacksObject('bar'),
+            ],
+            'Null an item' => [
+                [
+                    'bar' => function ($value, $object, $attributeName, $format, $context) {
+                        $this->assertSame('baz', $value);
+                        $this->assertTrue(is_a($object, CallbacksObject::class, true));
+                        $this->assertSame('bar', $attributeName);
+                        $this->assertSame('any', $format);
+                        $this->assertIsArray($context);
+                    },
+                ],
+                'baz',
+                new CallbacksObject(null),
+            ],
+            'Format a date' => [
+                [
+                    'bar' => function ($bar) {
+                        $this->assertIsString($bar);
+
+                        return \DateTime::createFromFormat('d-m-Y H:i:s', $bar);
+                    },
+                ],
+                '10-09-2011 06:30:00',
+                new CallbacksObject(new \DateTime('2011-09-10 06:30:00')),
             ],
             'Collect a property' => [
                 [
@@ -92,7 +231,7 @@ public function provideCallbacks()
                     },
                 ],
                 [new CallbacksObject('baz'), new CallbacksObject('quux')],
-                ['bar' => 'bazquux'],
+                new CallbacksObject('bazquux'),
             ],
             'Count a property' => [
                 [
@@ -101,7 +240,37 @@ public function provideCallbacks()
                     },
                 ],
                 [new CallbacksObject(), new CallbacksObject()],
-                ['bar' => 2],
+                new CallbacksObject(2),
+            ],
+        ];
+    }
+
+    public function providerDenormalizeCallbacksWithTypedProperty(): array
+    {
+        return [
+            'Change a typed string' => [
+                [
+                    'foo' => function ($foo) {
+                        $this->assertEquals('foo', $foo);
+
+                        return $foo;
+                    },
+                ],
+                'foo',
+                new CallbacksObject(null, 'foo'),
+            ],
+            'Null an typed item' => [
+                [
+                    'foo' => function ($value, $object, $attributeName, $format, $context) {
+                        $this->assertSame('fool', $value);
+                        $this->assertTrue(is_a($object, CallbacksObject::class, true));
+                        $this->assertSame('foo', $attributeName);
+                        $this->assertSame('any', $format);
+                        $this->assertIsArray($context);
+                    },
+                ],
+                'fool',
+                new CallbacksObject(null, null),
             ],
         ];
     }
@@ -113,4 +282,18 @@ public function provideInvalidCallbacks()
             [['bar' => 'thisisnotavalidfunction']],
         ];
     }
+
+    protected function getCallbackPropertyTypeExtractor(): PropertyInfoExtractor
+    {
+        $reflectionExtractor = new ReflectionExtractor();
+        $phpDocExtractor = new PhpDocExtractor();
+
+        return new PropertyInfoExtractor(
+            [$reflectionExtractor, $phpDocExtractor],
+            [$reflectionExtractor, $phpDocExtractor],
+            [$reflectionExtractor, $phpDocExtractor],
+            [$reflectionExtractor, $phpDocExtractor],
+            [$reflectionExtractor, $phpDocExtractor]
+        );
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index 0a542f4ea53f3..117a157f0024c 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -227,6 +227,13 @@ public function testConstructorWArgWithPrivateMutator()
         $this->assertEquals('bar', $obj->getFoo());
     }
 
+    protected function getNormalizerForCallbacksWithPropertyTypeExtractor(): GetSetMethodNormalizer
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+
+        return new GetSetMethodNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory), $this->getCallbackPropertyTypeExtractor());
+    }
+
     protected function getNormalizerForCallbacks(): GetSetMethodNormalizer
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
@@ -235,7 +242,7 @@ protected function getNormalizerForCallbacks(): GetSetMethodNormalizer
     }
 
     /**
-     * @dataProvider provideCallbacks
+     * @dataProvider provideNormalizeCallbacks
      */
     public function testLegacyCallbacks($callbacks, $value, $result)
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 50ed2ad0f0c43..c6c02bfb8568e 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -399,7 +399,7 @@ protected function getNormalizerForCallbacks(): ObjectNormalizer
     }
 
     /**
-     * @dataProvider provideCallbacks
+     * @dataProvider provideNormalizeCallbacks
      */
     public function testLegacyCallbacks($callbacks, $value, $result)
     {
@@ -422,6 +422,11 @@ public function testLegacyUncallableCallbacks($callbacks)
         $this->normalizer->setCallbacks($callbacks);
     }
 
+    protected function getNormalizerForCallbacksWithPropertyTypeExtractor(): ObjectNormalizer
+    {
+        return new ObjectNormalizer(null, null, null, $this->getCallbackPropertyTypeExtractor());
+    }
+
     // circular reference
 
     protected function getNormalizerForCircularReference(array $defaultContext): ObjectNormalizer
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
index be8b17124b592..c2c907d225faa 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -188,7 +188,7 @@ protected function getNormalizerForCallbacks(): PropertyNormalizer
     }
 
     /**
-     * @dataProvider provideCallbacks
+     * @dataProvider provideNormalizeCallbacks
      */
     public function testLegacyCallbacks($callbacks, $value, $result)
     {
@@ -212,6 +212,11 @@ public function testLegacyUncallableCallbacks($callbacks)
         $this->normalizer->setCallbacks($callbacks);
     }
 
+    protected function getNormalizerForCallbacksWithPropertyTypeExtractor(): PropertyNormalizer
+    {
+        return new PropertyNormalizer(null, null, $this->getCallbackPropertyTypeExtractor());
+    }
+
     protected function getNormalizerForCircularReference(array $defaultContext): PropertyNormalizer
     {
         $normalizer = new PropertyNormalizer(null, null, null, null, null, $defaultContext);

From 2ba3b71df4d48dd7354ccec0f26c634c3f68b803 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 11 Feb 2022 16:49:07 +0100
Subject: [PATCH 30/56] [Lock] fix tests

---
 src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php b/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
index 31abcdf5894c4..51f06d9bfef53 100644
--- a/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\MemcachedAdapter;
 use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Lock\Store\FlockStore;
 use Symfony\Component\Lock\Store\MemcachedStore;
@@ -56,7 +57,7 @@ public function validConnections()
         if (\extension_loaded('sysvsem')) {
             yield ['semaphore', SemaphoreStore::class];
         }
-        if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) {
+        if (class_exists(AbstractAdapter::class) && MemcachedAdapter::isSupported()) {
             yield ['memcached://server.com', MemcachedStore::class];
             yield ['memcached:?host[localhost]&host[localhost:12345]', MemcachedStore::class];
         }

From 224712bdb9da5afc4f235c463076ce467c132a9f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 11 Feb 2022 17:01:04 +0100
Subject: [PATCH 31/56] [Lock] fix tests

---
 src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
index a0b308d2ab835..2f94ee4f3a4b4 100644
--- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
@@ -29,6 +29,10 @@ class MemcachedStoreTest extends AbstractStoreTest
 
     public static function setUpBeforeClass(): void
     {
+        if (version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '<')) {
+            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
+        }
+
         $memcached = new \Memcached();
         $memcached->addServer(getenv('MEMCACHED_HOST'), 11211);
         $memcached->get('foo');

From a0f50691a472a454a456d61e14be93ea1d10e42a Mon Sep 17 00:00:00 2001
From: Cantepie <adrien.cantepie@6tm.com>
Date: Wed, 24 Nov 2021 22:22:17 +0100
Subject: [PATCH 32/56] Initialize
 Symfony\Component\Security\Core\Exception\AccountStatusException:: property

---
 .../Security/Core/Exception/AccountStatusException.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
index 1b4e818a1157b..880ad3de5e243 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
@@ -27,7 +27,7 @@ abstract class AccountStatusException extends AuthenticationException
     /**
      * Get the user.
      *
-     * @return UserInterface
+     * @return UserInterface|null
      */
     public function getUser()
     {

From 2c75e27d6da5bcd89f965430807a318eb6ad587b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20B=C3=B6nner?= <boenner@users.noreply.github.com>
Date: Wed, 1 Dec 2021 00:08:04 +0100
Subject: [PATCH 33/56] Make document type nodes ignorable

---
 .../Serializer/Encoder/XmlEncoder.php         |  5 +++-
 .../Tests/Encoder/XmlEncoderTest.php          | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index a091cfab69a07..4339d3fee2b4e 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -154,10 +154,13 @@ public function decode($data, $format, array $context = [])
         $rootNode = null;
         $decoderIgnoredNodeTypes = $context[self::DECODER_IGNORED_NODE_TYPES] ?? $this->defaultContext[self::DECODER_IGNORED_NODE_TYPES];
         foreach ($dom->childNodes as $child) {
+            if (\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {
+                continue;
+            }
             if (\XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new NotEncodableValueException('Document types are not allowed.');
             }
-            if (!$rootNode && !\in_array($child->nodeType, $decoderIgnoredNodeTypes, true)) {
+            if (!$rootNode) {
                 $rootNode = $child;
             }
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 0752021605b72..2d35bf43be736 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -587,6 +587,33 @@ public function testDecodeIgnoreComments()
         $this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
     }
 
+    public function testDecodeIgnoreDocumentType()
+    {
+        $source = <<<'XML'
+<?xml version="1.0"?>
+<!DOCTYPE people>
+<people>
+    <person>
+        <firstname>Benjamin</firstname>
+        <lastname>Alexandre</lastname>
+    </person>
+    <person>
+        <firstname>Damien</firstname>
+        <lastname>Clay</lastname>
+    </person>
+</people>
+XML;
+        $expected = ['person' => [
+          ['firstname' => 'Benjamin', 'lastname' => 'Alexandre'],
+          ['firstname' => 'Damien', 'lastname' => 'Clay'],
+        ]];
+        $this->assertEquals($expected, $this->encoder->decode(
+            $source,
+            'xml',
+            [XmlEncoder::DECODER_IGNORED_NODE_TYPES => [\XML_DOCUMENT_TYPE_NODE]]
+        ));
+    }
+
     public function testDecodePreserveComments()
     {
         $this->doTestDecodePreserveComments();

From 893874a4203680f40d0d704f395128a09f45d819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Vasseur?= <jerome.vasseur@thetribe.io>
Date: Tue, 15 Feb 2022 18:04:52 +0100
Subject: [PATCH 34/56] Remove duplicated test

---
 .../DependencyInjection/Tests/Dumper/XmlDumperTest.php     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 34878972a62b1..91d0d7d90fe0f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -47,13 +47,6 @@ public function testExportParameters()
         $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services8.xml', $dumper->dump(), '->dump() dumps parameters');
     }
 
-    public function testAddParameters()
-    {
-        $container = include self::$fixturesPath.'//containers/container8.php';
-        $dumper = new XmlDumper($container);
-        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services8.xml', $dumper->dump(), '->dump() dumps parameters');
-    }
-
     public function testAddService()
     {
         $container = include self::$fixturesPath.'/containers/container9.php';

From 37540189a4c58bd7fb58cd7e1f16dbbf0dae1e76 Mon Sep 17 00:00:00 2001
From: Volodymyr Panivko <sveneld300@gmail.com>
Date: Tue, 15 Feb 2022 09:26:57 +0200
Subject: [PATCH 35/56] Fix type binding

---
 .../RegisterControllerArgumentLocatorsPass.php                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index 871e3807c6b3e..bcf2b5d9a788b 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -151,12 +151,12 @@ public function process(ContainerBuilder $container)
                             $args[$p->name] = $bindingValue;
                         }
 
+                        continue;
+                    } elseif (!$type || !$autowire || '\\' !== $target[0]) {
                         continue;
                     } elseif (is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
                         continue;
-                    } elseif (!$type || !$autowire || '\\' !== $target[0]) {
-                        continue;
                     } elseif (!$p->allowsNull()) {
                         $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                     }

From 85123858fbf8287adb2ebc0f53b9e5b47267c005 Mon Sep 17 00:00:00 2001
From: Alexandre Beaujour <alexandre.beaujour@hotmail.fr>
Date: Thu, 17 Feb 2022 09:47:47 -0400
Subject: [PATCH 36/56] [Intl] fix wrong offset timezone PHP 8.1

---
 src/Symfony/Component/Intl/Tests/TimezonesTest.php |  6 ++++++
 src/Symfony/Component/Intl/Timezones.php           | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/Intl/Tests/TimezonesTest.php b/src/Symfony/Component/Intl/Tests/TimezonesTest.php
index 025a9cbba52f0..f47af2105af12 100644
--- a/src/Symfony/Component/Intl/Tests/TimezonesTest.php
+++ b/src/Symfony/Component/Intl/Tests/TimezonesTest.php
@@ -663,4 +663,10 @@ public function provideCountries(): iterable
             return [$country];
         }, Countries::getCountryCodes());
     }
+
+    public function testGetRawOffsetChangeTimeCountry()
+    {
+        $this->assertSame(7200, Timezones::getRawOffset('Europe/Paris', (new \DateTime('2022-07-16 00:00:00+00:00'))->getTimestamp()));
+        $this->assertSame(3600, Timezones::getRawOffset('Europe/Paris', (new \DateTime('2022-02-16 00:00:00+00:00'))->getTimestamp()));
+    }
 }
diff --git a/src/Symfony/Component/Intl/Timezones.php b/src/Symfony/Component/Intl/Timezones.php
index dd72d35925f40..265d0ede416cf 100644
--- a/src/Symfony/Component/Intl/Timezones.php
+++ b/src/Symfony/Component/Intl/Timezones.php
@@ -68,17 +68,9 @@ public static function getNames(string $displayLocale = null): array
      */
     public static function getRawOffset(string $timezone, int $timestamp = null): int
     {
-        if (null === $timestamp) {
-            $timestamp = time();
-        }
-
-        $transitions = (new \DateTimeZone($timezone))->getTransitions($timestamp, $timestamp);
-
-        if (!isset($transitions[0]['offset'])) {
-            throw new RuntimeException('No timezone transitions available.');
-        }
+        $dateTimeImmutable = new \DateTimeImmutable(date('Y-m-d H:i:s', $timestamp ?? time()), new \DateTimeZone($timezone));
 
-        return $transitions[0]['offset'];
+        return $dateTimeImmutable->getOffset();
     }
 
     public static function getGmtOffset(string $timezone, int $timestamp = null, string $displayLocale = null): string

From 7b1ada07cd933d2455ef449ade3687a1d28d8114 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 17 Feb 2022 20:25:49 +0100
Subject: [PATCH 37/56] [HttpKernel] Fix extracting controller name from
 closures

---
 .../ArgumentMetadataFactory.php               | 20 +++++++++++--------
 .../ArgumentMetadataFactoryTest.php           | 11 ++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index 05a68229a331a..6141b53edd267 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -27,14 +27,19 @@ public function createArgumentMetadata($controller): array
 
         if (\is_array($controller)) {
             $reflection = new \ReflectionMethod($controller[0], $controller[1]);
+            $class = $reflection->class;
         } elseif (\is_object($controller) && !$controller instanceof \Closure) {
-            $reflection = (new \ReflectionObject($controller))->getMethod('__invoke');
+            $reflection = new \ReflectionMethod($controller, '__invoke');
+            $class = $reflection->class;
         } else {
             $reflection = new \ReflectionFunction($controller);
+            if ($class = str_contains($reflection->name, '{closure}') ? null : $reflection->getClosureScopeClass()) {
+                $class = $class->name;
+            }
         }
 
         foreach ($reflection->getParameters() as $param) {
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection, $class), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
         }
 
         return $arguments;
@@ -43,20 +48,19 @@ public function createArgumentMetadata($controller): array
     /**
      * Returns an associated type to the given parameter if available.
      */
-    private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function): ?string
+    private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function, ?string $class): ?string
     {
         if (!$type = $parameter->getType()) {
             return null;
         }
         $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
 
-        if ($function instanceof \ReflectionMethod) {
-            $lcName = strtolower($name);
-            switch ($lcName) {
+        if (null !== $class) {
+            switch (strtolower($name)) {
                 case 'self':
-                    return $function->getDeclaringClass()->name;
+                    return $class;
                 case 'parent':
-                    return ($parent = $function->getDeclaringClass()->getParentClass()) ? $parent->name : null;
+                    return get_parent_class($class) ?: null;
             }
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
index dfab909802f80..cbef2d3cf2ec1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -105,6 +105,17 @@ public function testBasicTypesSignature()
         ], $arguments);
     }
 
+    public function testNamedClosure()
+    {
+        $arguments = $this->factory->createArgumentMetadata(\Closure::fromCallable([$this, 'signature1']));
+
+        $this->assertEquals([
+            new ArgumentMetadata('foo', self::class, false, false, null),
+            new ArgumentMetadata('bar', 'array', false, false, null),
+            new ArgumentMetadata('baz', 'callable', false, false, null),
+        ], $arguments);
+    }
+
     public function testNullableTypesSignature()
     {
         $arguments = $this->factory->createArgumentMetadata([new NullableController(), 'action']);

From a18c510c8dfefd02d6aae82380d17010f93562ca Mon Sep 17 00:00:00 2001
From: core23 <mail@core23.de>
Date: Sun, 13 Feb 2022 13:22:48 +0100
Subject: [PATCH 38/56] KernelTestCase resets internal state on tearDown

---
 .../FrameworkBundle/Test/KernelTestCase.php    |  1 +
 .../Functional/TestServiceContainerTest.php    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 442649ac1bac4..b87018bbd6b3f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -44,6 +44,7 @@ abstract class KernelTestCase extends TestCase
     private function doTearDown()
     {
         static::ensureKernelShutdown();
+        static::$class = null;
         static::$kernel = null;
         static::$booted = false;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
index bf4f9f8779f44..4122a749dfd1d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
@@ -44,4 +44,22 @@ public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()
         $this->assertTrue(static::$container->has('private_service'));
         $this->assertFalse(static::$container->has(UnusedPrivateService::class));
     }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testBootKernel()
+    {
+        static::bootKernel(['test_case' => 'TestServiceContainer']);
+    }
+
+    /**
+     * @depends testBootKernel
+     */
+    public function testKernelIsNotInitialized()
+    {
+        self::assertNull(self::$class);
+        self::assertNull(self::$kernel);
+        self::assertFalse(self::$booted);
+    }
 }

From 7712d806c21be691177075527e8f8d52515ddf44 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 18 Feb 2022 10:52:26 +0100
Subject: [PATCH 39/56] [SecurityBundle] fix autoconfiguring Monolog's
 ProcessorInterface

---
 .../Compiler/RegisterTokenUsageTrackingPass.php                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
index 1cd90fe70af1a..6aa50f4196c8b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler;
 
-use Symfony\Bridge\Monolog\Processor\ProcessorInterface;
+use Monolog\Processor\ProcessorInterface;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

From 11c1381fbdde80e25ba89d7aaef4d78a3b97168f Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 18 Feb 2022 16:34:20 +0100
Subject: [PATCH 40/56] [Stopwatch] Fix test expectation

---
 src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
index 717ff9d56aeeb..e01849d474869 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchPeriodTest.php
@@ -60,7 +60,8 @@ public function provideDurationValues()
         yield [0.0, 0.0, false, 0];
         yield [0.0, 0.0, true, 0.0];
         yield [2, 3.14, false, 1];
-        yield [2, 3.14, true, 1.14];
+        yield [2, 3.14, true, 1.1400000000000001];
+        yield [2, 3.13, true, 1.13];
         yield [2.71, 3.14, false, 1];
         yield [2.71, 3.14, true, 0.43];
     }

From dbe29decaadd0131586c443153b14718f5073d7c Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 18 Feb 2022 17:12:55 +0100
Subject: [PATCH 41/56] [HttpKernel] Remove unused argument in
 ArgumentMetadataFactory

---
 .../HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index 6141b53edd267..994d5310968fb 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -39,7 +39,7 @@ public function createArgumentMetadata($controller): array
         }
 
         foreach ($reflection->getParameters() as $param) {
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection, $class), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $class), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
         }
 
         return $arguments;
@@ -48,7 +48,7 @@ public function createArgumentMetadata($controller): array
     /**
      * Returns an associated type to the given parameter if available.
      */
-    private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function, ?string $class): ?string
+    private function getType(\ReflectionParameter $parameter, ?string $class): ?string
     {
         if (!$type = $parameter->getType()) {
             return null;

From 592a00a3dc13cda0635854d804666fc69d59a20b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 19 Feb 2022 00:07:57 +0100
Subject: [PATCH 42/56] [HttpKernel] Reset services between requests performed
 by KernelBrowser

---
 src/Symfony/Bundle/FrameworkBundle/Client.php               | 6 ++++++
 .../Bundle/FrameworkBundle/Tests/KernelBrowserTest.php      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php
index 174b024e21c79..a27a7141dfba2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Client.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Client.php
@@ -19,6 +19,7 @@
 use Symfony\Component\HttpKernel\HttpKernelBrowser;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Client simulates a browser and makes requests to a Kernel object.
@@ -116,7 +117,12 @@ protected function doRequest($request)
         // avoid shutting down the Kernel if no request has been performed yet
         // WebTestCase::createClient() boots the Kernel but do not handle a request
         if ($this->hasPerformedRequest && $this->reboot) {
+            $container = $this->kernel->getContainer();
             $this->kernel->shutdown();
+
+            if ($container instanceof ResetInterface) {
+                $container->reset();
+            }
         } else {
             $this->hasPerformedRequest = true;
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php
index 2770813d8a696..96eaaea7612af 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/KernelBrowserTest.php
@@ -54,7 +54,7 @@ public function testEnableRebootKernel()
     private function getKernelMock()
     {
         $mock = $this->getMockBuilder($this->getKernelClass())
-            ->setMethods(['shutdown', 'boot', 'handle'])
+            ->setMethods(['shutdown', 'boot', 'handle', 'getContainer'])
             ->disableOriginalConstructor()
             ->getMock();
 

From 8e26644ef860abaf8fbf760490bf962b847e3b30 Mon Sep 17 00:00:00 2001
From: developer-av <developer.av1996@gmail.com>
Date: Sat, 19 Feb 2022 14:42:09 +0200
Subject: [PATCH 43/56] [Cache] Add missing log when saving namespace

---
 .../Component/Cache/Traits/AbstractTrait.php  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
index 04660dcab9698..a2914fa3578b6 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -119,13 +119,16 @@ public function clear(/*string $prefix = ''*/)
                 }
             }
             $namespaceToClear = $this->namespace.$namespaceVersionToClear;
-            $namespaceVersion = strtr(substr_replace(base64_encode(pack('V', mt_rand())), static::NS_SEPARATOR, 5), '/', '_');
+            $namespaceVersion = self::formatNamespaceVersion(mt_rand());
             try {
-                $cleared = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
+                $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
             } catch (\Exception $e) {
-                $cleared = false;
             }
-            if ($cleared = true === $cleared || [] === $cleared) {
+            if (true !== $e && [] !== $e) {
+                $cleared = false;
+                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
+            } else {
                 $this->namespaceVersion = $namespaceVersion;
                 $this->ids = [];
             }
@@ -267,12 +270,17 @@ private function getId($key): string
                 foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
                     $this->namespaceVersion = $v;
                 }
+                $e = true;
                 if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {
-                    $this->namespaceVersion = strtr(substr_replace(base64_encode(pack('V', time())), static::NS_SEPARATOR, 5), '/', '_');
-                    $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
+                    $this->namespaceVersion = self::formatNamespaceVersion(time());
+                    $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
                 }
             } catch (\Exception $e) {
             }
+            if (true !== $e && [] !== $e) {
+                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
+                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
+            }
         }
 
         if (\is_string($key) && isset($this->ids[$key])) {
@@ -304,4 +312,9 @@ public static function handleUnserializeCallback($class)
     {
         throw new \DomainException('Class not found: '.$class);
     }
+
+    private static function formatNamespaceVersion(int $value): string
+    {
+        return strtr(substr_replace(base64_encode(pack('V', $value)), static::NS_SEPARATOR, 5), '/', '_');
+    }
 }

From 89e6eeda81caebe9b63b894a70477a7321295d3a Mon Sep 17 00:00:00 2001
From: luxemate <luxemate1@gmail.com>
Date: Mon, 21 Feb 2022 15:35:47 +0200
Subject: [PATCH 44/56] Fix missing ReturnTypeWillChange attributes

---
 .../Session/Storage/Handler/MongoDbSessionHandler.php           | 2 ++
 .../Session/Storage/Handler/RedisSessionHandler.php             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 51b8023e9fb10..2c3cb53c1e6dd 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -82,6 +82,7 @@ public function __construct(\MongoDB\Client $mongo, array $options)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function close()
     {
         return true;
@@ -135,6 +136,7 @@ protected function doWrite($sessionId, $data)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
         $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
index a9c4e392e94c7..51bec203dfa17 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -97,6 +97,7 @@ protected function doDestroy($sessionId): bool
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function close(): bool
     {
         return true;
@@ -116,6 +117,7 @@ public function gc($maxlifetime)
     /**
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
         return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));

From 88cc3af6076927fd299b34d3e5c1ce35feb5b084 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 21 Feb 2022 15:35:47 +0100
Subject: [PATCH 45/56] [VarDumper] Fix dumping mysqli_driver instances

---
 .../VarDumper/Caster/MysqliCaster.php         | 33 ++++++++++++++++
 .../VarDumper/Cloner/AbstractCloner.php       |  2 +
 .../Tests/Caster/MysqliCasterTest.php         | 39 +++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 src/Symfony/Component/VarDumper/Caster/MysqliCaster.php
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php

diff --git a/src/Symfony/Component/VarDumper/Caster/MysqliCaster.php b/src/Symfony/Component/VarDumper/Caster/MysqliCaster.php
new file mode 100644
index 0000000000000..bfe6f0822d65a
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Caster/MysqliCaster.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class MysqliCaster
+{
+    public static function castMysqliDriver(\mysqli_driver $c, array $a, Stub $stub, bool $isNested): array
+    {
+        foreach ($a as $k => $v) {
+            if (isset($c->$k)) {
+                $a[$k] = $c->$k;
+            }
+        }
+
+        return $a;
+    }
+}
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index eeac88295399e..d2e5039b8daf1 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -144,6 +144,8 @@ abstract class AbstractCloner implements ClonerInterface
         'Ds\Pair' => ['Symfony\Component\VarDumper\Caster\DsCaster', 'castPair'],
         'Symfony\Component\VarDumper\Caster\DsPairStub' => ['Symfony\Component\VarDumper\Caster\DsCaster', 'castPairStub'],
 
+        'mysqli_driver' => ['Symfony\Component\VarDumper\Caster\MysqliCaster', 'castMysqliDriver'],
+
         'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
         ':curl' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php
new file mode 100644
index 0000000000000..e05ae41b1b19f
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @requires extension mysqli
+ * @group integration
+ */
+class MysqliCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testNotConnected()
+    {
+        $driver = new \mysqli_driver();
+        $driver->report_mode = 3;
+
+        $xCast = <<<EODUMP
+mysqli_driver {%A
+  +reconnect: false
+  +report_mode: 3
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xCast, $driver);
+    }
+}

From 1a82c716ba05bb198727b9b4eed403b5361ad879 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Tue, 22 Feb 2022 14:36:57 +0100
Subject: [PATCH 46/56] [Validator] Improve tests for the Image and File
 constraints

---
 .../Tests/Constraints/FileValidatorTest.php     |  3 +++
 .../Tests/Constraints/Fixtures/ccc.txt          |  1 +
 .../Tests/Constraints/ImageValidatorTest.php    | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ccc.txt

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index 7178b07cf39e6..72bdc950343b9 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -185,6 +185,9 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
     public function provideMaxSizeNotExceededTests()
     {
         return [
+            // 0 has no effect
+            [100, 0],
+
             // limit in bytes
             [1000, 1000],
             [1000000, 1000000],
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ccc.txt b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ccc.txt
new file mode 100644
index 0000000000000..323fae03f4606
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/Fixtures/ccc.txt
@@ -0,0 +1 @@
+foobar
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 81ba1224bbfe5..01a0154870e46 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -34,6 +34,7 @@ class ImageValidatorTest extends ConstraintValidatorTestCase
     protected $imagePortrait;
     protected $image4By3;
     protected $imageCorrupted;
+    protected $notAnImage;
 
     protected function createValidator()
     {
@@ -50,6 +51,7 @@ protected function setUp(): void
         $this->image4By3 = __DIR__.'/Fixtures/test_4by3.gif';
         $this->image16By9 = __DIR__.'/Fixtures/test_16by9.gif';
         $this->imageCorrupted = __DIR__.'/Fixtures/test_corrupted.gif';
+        $this->notAnImage = __DIR__.'/Fixtures/ccc.txt';
     }
 
     public function testNullIsValid()
@@ -416,4 +418,19 @@ public function testCorrupted()
             ->setCode(Image::CORRUPTED_IMAGE_ERROR)
             ->assertRaised();
     }
+
+    public function testInvalidMimeType()
+    {
+        $this->validator->validate($this->notAnImage, $constraint = new Image());
+
+        $this->assertSame('image/*', $constraint->mimeTypes);
+
+        $this->buildViolation('This file is not a valid image.')
+            ->setParameter('{{ file }}', sprintf('"%s"', $this->notAnImage))
+            ->setParameter('{{ type }}', '"text/plain"')
+            ->setParameter('{{ types }}', '"image/*"')
+            ->setParameter('{{ name }}', '"ccc.txt"')
+            ->setCode(Image::INVALID_MIME_TYPE_ERROR)
+            ->assertRaised();
+    }
 }

From 786d79ef4300db3dbbd4f747a12c28853e5ef5ca Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 23 Feb 2022 10:49:51 +0100
Subject: [PATCH 47/56] [GHA] Cancel running CI jobs when a PR is updated

---
 .github/workflows/integration-tests.yml | 4 ++++
 .github/workflows/intl-data-tests.yml   | 4 ++++
 .github/workflows/phpunit-bridge.yml    | 4 ++++
 .github/workflows/psalm.yml             | 4 ++++
 .github/workflows/unit-tests.yml        | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index d1a4c29f0952c..cf6787a8d8e77 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -8,6 +8,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
 
   tests:
diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
index 450826f443874..bb54e306c3d4d 100644
--- a/.github/workflows/intl-data-tests.yml
+++ b/.github/workflows/intl-data-tests.yml
@@ -12,6 +12,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
   tests:
     name: Tests
diff --git a/.github/workflows/phpunit-bridge.yml b/.github/workflows/phpunit-bridge.yml
index b503ce48d8a17..e8a19360a8b32 100644
--- a/.github/workflows/phpunit-bridge.yml
+++ b/.github/workflows/phpunit-bridge.yml
@@ -12,6 +12,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
   lint:
     name: Lint
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index c5c9bfecf4d09..f607bf8d5eb05 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -7,6 +7,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
   psalm:
     name: Psalm
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 2bea6308930c9..426086892fd33 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -8,6 +8,10 @@ defaults:
   run:
     shell: bash
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
+
 jobs:
 
   tests:

From f5c6abf42b67b6988c90fa1f0b61f15faae1a745 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 23 Feb 2022 14:18:10 +0100
Subject: [PATCH 48/56] [DependencyInjection] Clarify that using expressions in
 parameters is not allowed

---
 .../Loader/Configurator/ParametersConfigurator.php          | 6 ++++++
 .../Component/DependencyInjection/Loader/YamlFileLoader.php | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
index 244da04fb19d9..f0cf177d7baeb 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\ExpressionLanguage\Expression;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -34,6 +36,10 @@ public function __construct(ContainerBuilder $container)
      */
     final public function set(string $name, $value): self
     {
+        if ($value instanceof Expression) {
+            throw new InvalidArgumentException(sprintf('Using an expression in parameter "%s" is not allowed.', $name));
+        }
+
         $this->container->setParameter($name, static::processValue($value, true));
 
         return $this;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 66d0335265847..f15fc3492bd34 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -822,6 +822,10 @@ private function resolveServices($value, string $file, bool $isParameter = false
                 $value[$k] = $this->resolveServices($v, $file, $isParameter);
             }
         } elseif (\is_string($value) && str_starts_with($value, '@=')) {
+            if ($isParameter) {
+                throw new InvalidArgumentException(sprintf('Using expressions in parameters is not allowed in "%s".', $file));
+            }
+
             if (!class_exists(Expression::class)) {
                 throw new \LogicException('The "@=" expression syntax cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
             }

From 37ac416621a85db3ef7b1ff8bd43f8ac54e080b7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 23 Feb 2022 16:04:51 +0100
Subject: [PATCH 49/56] [HttpClient] Fix overriding default options with null

---
 src/Symfony/Component/HttpClient/HttpClientTrait.php   |  6 +-----
 .../Component/HttpClient/Tests/MockHttpClientTest.php  | 10 ++++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index 46ea64ffde4a5..c8351f55bc2ba 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -187,11 +187,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
         // Option "query" is never inherited from defaults
         $options['query'] = $options['query'] ?? [];
 
-        foreach ($defaultOptions as $k => $v) {
-            if ('normalized_headers' !== $k && !isset($options[$k])) {
-                $options[$k] = $v;
-            }
-        }
+        $options += $defaultOptions;
 
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
index 076604b0a6196..e324dc107be3f 100644
--- a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpClient\Chunk\DataChunk;
 use Symfony\Component\HttpClient\Chunk\ErrorChunk;
 use Symfony\Component\HttpClient\Chunk\FirstChunk;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
@@ -150,6 +151,15 @@ public function testThrowExceptionInBodyGenerator()
         $this->assertSame('bar ccc', $chunks[2]->getError());
     }
 
+    public function testMergeDefaultOptions()
+    {
+        $mockHttpClient = new MockHttpClient(null, 'https://example.com');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: scheme is missing');
+        $mockHttpClient->request('GET', '/foo', ['base_uri' => null]);
+    }
+
     protected function getHttpClient(string $testCase): HttpClientInterface
     {
         $responses = [];

From fac5418cd82a9937f73682682315b3430daa577f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 23 Feb 2022 17:48:39 +0100
Subject: [PATCH 50/56] [DependencyInjection] Don't reset env placeholders
 during compilation

---
 .../MergeExtensionConfigurationPass.php       |  8 ---
 .../Compiler/ValidateEnvPlaceholdersPass.php  | 58 +++++++++----------
 2 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index 5e4dd399617a9..0d20899e9c462 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -79,10 +79,6 @@ public function process(ContainerBuilder $container)
                     $container->getParameterBag()->mergeEnvPlaceholders($resolvingBag);
                 }
 
-                if ($configAvailable) {
-                    BaseNode::resetPlaceholders();
-                }
-
                 throw $e;
             }
 
@@ -95,10 +91,6 @@ public function process(ContainerBuilder $container)
             $container->getParameterBag()->add($parameters);
         }
 
-        if ($configAvailable) {
-            BaseNode::resetPlaceholders();
-        }
-
         $container->addDefinitions($definitions);
         $container->addAliases($aliases);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
index cae01c61dda77..3fb2af1bf07a0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -48,45 +48,41 @@ public function process(ContainerBuilder $container)
 
         $defaultBag = new ParameterBag($resolvingBag->all());
         $envTypes = $resolvingBag->getProvidedTypes();
-        try {
-            foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
-                $values = [];
-                if (false === $i = strpos($env, ':')) {
-                    $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
-                    $defaultType = null !== $default ? self::getType($default) : 'string';
-                    $values[$defaultType] = $default;
-                } else {
-                    $prefix = substr($env, 0, $i);
-                    foreach ($envTypes[$prefix] ?? ['string'] as $type) {
-                        $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
-                    }
-                }
-                foreach ($placeholders as $placeholder) {
-                    BaseNode::setPlaceholder($placeholder, $values);
+        foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
+            $values = [];
+            if (false === $i = strpos($env, ':')) {
+                $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
+                $defaultType = null !== $default ? self::getType($default) : 'string';
+                $values[$defaultType] = $default;
+            } else {
+                $prefix = substr($env, 0, $i);
+                foreach ($envTypes[$prefix] ?? ['string'] as $type) {
+                    $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
                 }
             }
+            foreach ($placeholders as $placeholder) {
+                BaseNode::setPlaceholder($placeholder, $values);
+            }
+        }
 
-            $processor = new Processor();
+        $processor = new Processor();
 
-            foreach ($extensions as $name => $extension) {
-                if (!$extension instanceof ConfigurationExtensionInterface || !$config = array_filter($container->getExtensionConfig($name))) {
-                    // this extension has no semantic configuration or was not called
-                    continue;
-                }
+        foreach ($extensions as $name => $extension) {
+            if (!$extension instanceof ConfigurationExtensionInterface || !$config = array_filter($container->getExtensionConfig($name))) {
+                // this extension has no semantic configuration or was not called
+                continue;
+            }
 
-                $config = $resolvingBag->resolveValue($config);
+            $config = $resolvingBag->resolveValue($config);
 
-                if (null === $configuration = $extension->getConfiguration($config, $container)) {
-                    continue;
-                }
+            if (null === $configuration = $extension->getConfiguration($config, $container)) {
+                continue;
+            }
 
-                try {
-                    $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
-                } catch (TreeWithoutRootNodeException $e) {
-                }
+            try {
+                $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
+            } catch (TreeWithoutRootNodeException $e) {
             }
-        } finally {
-            BaseNode::resetPlaceholders();
         }
 
         $resolvingBag->clearUnusedEnvPlaceholders();

From da7d8c0d5fd5c61cd376a5537e9ff78b2d060c82 Mon Sep 17 00:00:00 2001
From: Erwin Dirks <e.dirks@kennisnet.nl>
Date: Wed, 23 Feb 2022 18:02:03 +0100
Subject: [PATCH 51/56] [Serializer] Fix passing null to str_contains()

---
 .../Serializer/Normalizer/AbstractObjectNormalizer.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 388ba10373594..5a6d3b78e61d9 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -472,7 +472,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
             // PHP's json_decode automatically converts Numbers without a decimal part to integers.
             // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
             // a float is expected.
-            if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && str_contains($format, JsonEncoder::FORMAT)) {
+            if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
                 return (float) $data;
             }
 

From 39aec09f93a27f19dde035b0421376b586abd7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Sat, 26 Feb 2022 19:41:34 +0100
Subject: [PATCH 52/56] [HttpClient] Handle requests with null body

---
 .../Component/HttpClient/HttpClientTrait.php  | 27 ++++++++++++++++---
 .../HttpClient/Tests/CurlHttpClientTest.php   | 11 ++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index c8351f55bc2ba..1f5dc4d012756 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -23,6 +23,7 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
+    private static $emptyDefaults;
 
     /**
      * Validates and normalizes method, URL and options, and merges them with defaults.
@@ -40,6 +41,16 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             }
         }
 
+        if (null === self::$emptyDefaults) {
+            self::$emptyDefaults = [];
+
+            foreach ($defaultOptions as $k => $v) {
+                if (null !== $v) {
+                    self::$emptyDefaults[$k] = $v;
+                }
+            }
+        }
+
         $options = self::mergeDefaultOptions($options, $defaultOptions, $allowExtraOptions);
 
         $buffer = $options['buffer'] ?? true;
@@ -189,6 +200,16 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
+        if (null === self::$emptyDefaults) {
+            self::$emptyDefaults = [];
+        }
+
+        foreach (self::$emptyDefaults as $k => $v) {
+            if (!isset($options[$k])) {
+                $options[$k] = $v;
+            }
+        }
+
         if (isset($defaultOptions['extra'])) {
             $options['extra'] += $defaultOptions['extra'];
         }
@@ -221,9 +242,9 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
             $alternatives = [];
 
-            foreach ($defaultOptions as $key => $v) {
-                if (levenshtein($name, $key) <= \strlen($name) / 3 || str_contains($key, $name)) {
-                    $alternatives[] = $key;
+            foreach ($defaultOptions as $k => $v) {
+                if (levenshtein($name, $k) <= \strlen($name) / 3 || str_contains($k, $name)) {
+                    $alternatives[] = $k;
                 }
             }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
index e932470d2a98c..dd5bef04d08ae 100644
--- a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -148,6 +148,17 @@ public function testHandleIsReinitOnReset()
         self::assertNotSame($initialShareId, $clientState->share);
     }
 
+    public function testNullBody()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $httpClient->request('POST', 'http://localhost:8057/post', [
+            'body' => null,
+        ]);
+
+        $this->expectNotToPerformAssertions();
+    }
+
     public function testProcessAfterReset()
     {
         $client = $this->getHttpClient(__FUNCTION__);

From 65609d88e92f4a38a7fbb820271ffa81d2b945cf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 27 Feb 2022 09:40:01 +0100
Subject: [PATCH 53/56] [HttpClient] fix

---
 .../Component/HttpClient/CurlHttpClient.php     |  1 +
 .../Component/HttpClient/HttpClientTrait.php    | 17 +----------------
 .../Component/HttpClient/NativeHttpClient.php   |  1 +
 .../HttpClient/Tests/CurlHttpClientTest.php     | 11 -----------
 .../HttpClient/Tests/HttpClientTestCase.php     | 11 +++++++++++
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index 86e4d682fb54f..e77eb86c4c452 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -40,6 +40,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
         'auth_ntlm' => null, // array|string - an array containing the username as first value, and optionally the
                              //   password as the second one; or string like username:password - enabling NTLM auth
     ];
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS + ['auth_ntlm' => null];
 
     /**
      * @var LoggerInterface|null
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index 1f5dc4d012756..de1689490e623 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -23,7 +23,6 @@
 trait HttpClientTrait
 {
     private static $CHUNK_SIZE = 16372;
-    private static $emptyDefaults;
 
     /**
      * Validates and normalizes method, URL and options, and merges them with defaults.
@@ -41,16 +40,6 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             }
         }
 
-        if (null === self::$emptyDefaults) {
-            self::$emptyDefaults = [];
-
-            foreach ($defaultOptions as $k => $v) {
-                if (null !== $v) {
-                    self::$emptyDefaults[$k] = $v;
-                }
-            }
-        }
-
         $options = self::mergeDefaultOptions($options, $defaultOptions, $allowExtraOptions);
 
         $buffer = $options['buffer'] ?? true;
@@ -200,11 +189,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
-        if (null === self::$emptyDefaults) {
-            self::$emptyDefaults = [];
-        }
-
-        foreach (self::$emptyDefaults as $k => $v) {
+        foreach (self::$emptyDefaults ?? [] as $k => $v) {
             if (!isset($options[$k])) {
                 $options[$k] = $v;
             }
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index f74e773048049..4394e51400cec 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -36,6 +36,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
     use LoggerAwareTrait;
 
     private $defaultOptions = self::OPTIONS_DEFAULTS;
+    private static $emptyDefaults = self::OPTIONS_DEFAULTS;
 
     /** @var NativeClientState */
     private $multi;
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
index dd5bef04d08ae..e932470d2a98c 100644
--- a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -148,17 +148,6 @@ public function testHandleIsReinitOnReset()
         self::assertNotSame($initialShareId, $clientState->share);
     }
 
-    public function testNullBody()
-    {
-        $httpClient = $this->getHttpClient(__FUNCTION__);
-
-        $httpClient->request('POST', 'http://localhost:8057/post', [
-            'body' => null,
-        ]);
-
-        $this->expectNotToPerformAssertions();
-    }
-
     public function testProcessAfterReset()
     {
         $client = $this->getHttpClient(__FUNCTION__);
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
index e8b97a0ba8447..189788cce8ca9 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -202,4 +202,15 @@ public function testNegativeTimeout()
             'timeout' => -1,
         ])->getStatusCode());
     }
+
+    public function testNullBody()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $httpClient->request('POST', 'http://localhost:8057/post', [
+            'body' => null,
+        ]);
+
+        $this->expectNotToPerformAssertions();
+    }
 }

From 1f060a07d11dd5a088bf926117cac40f4e9c2bf1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 28 Feb 2022 08:43:13 +0100
Subject: [PATCH 54/56] Update CHANGELOG for 4.4.38

---
 CHANGELOG-4.4.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md
index 323705a5c8a53..af2b1a47f2ce5 100644
--- a/CHANGELOG-4.4.md
+++ b/CHANGELOG-4.4.md
@@ -7,6 +7,42 @@ in 4.4 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.4.0...v4.4.1
 
+* 4.4.38 (2022-02-28)
+
+ * bug #44570 [WebProfilerBundle] add nonces to profiler (garak)
+ * bug #44839 MailerInterface: failed exception contract when enabling messenger (Giorgio Premi)
+ * bug #45529 [DependencyInjection] Don't reset env placeholders during compilation (nicolas-grekas)
+ * bug #45527 [HttpClient] Fix overriding default options with null (nicolas-grekas)
+ * bug #45531 [Serializer] Fix passing null to str_contains() (Erwin Dirks)
+ * bug #42458 [Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations (fancyweb)
+ * bug #45496 [VarDumper] Fix dumping mysqli_driver instances (nicolas-grekas)
+ * bug #45495 [HttpFoundation] Fix missing ReturnTypeWillChange attributes (luxemate)
+ * bug #45482 [Cache] Add missing log when saving namespace (developer-av)
+ * bug #45479 [HttpKernel] Reset services between requests performed by KernelBrowser (nicolas-grekas)
+ * bug #44650 [Serializer] Make document type nodes ignorable (boenner)
+ * bug #45469 [SecurityBundle] fix autoconfiguring Monolog's ProcessorInterface (nicolas-grekas)
+ * bug #45414 [FrameworkBundle] KernelTestCase resets internal state on tearDown (core23)
+ * bug #45460 [Intl] fix wrong offset timezone PHP 8.1 (Lenny4)
+ * bug #45462 [HttpKernel] Fix extracting controller name from closures (nicolas-grekas)
+ * bug #45424 [DependencyInjection] Fix type binding (sveneld)
+ * bug #44259 [Security] AccountStatusException::$user should be nullable (Cantepie)
+ * bug #45323 [Serializer] Fix ignored callbacks in denormalization (benjaminmal)
+ * bug #45399 [FrameworkBundle] Fix sorting bug in sorting of tagged services by priority (Ahummeling)
+ * bug #45338 [Mailer] Fix string-cast of exceptions thrown by authenticator in EsmtpTransport (wikando-ck)
+ * bug #45339 [Cache] fix error handling when using Redis (nicolas-grekas)
+ * bug #45281 [Cache] Fix connecting to Redis via a socket file (alebedev80)
+ * bug #45289 [FrameworkBundle] Fix log channel of TagAwareAdapter (fancyweb)
+ * bug #45306 [PropertyAccessor] Add missing TypeError catch (b1rdex)
+ * bug #44868 [DependencyInjection][FrameworkBundle] Fix using PHP 8.1 enum as parameters (ogizanagi)
+ * bug #45261 [HttpClient] Fix Content-Length header when possible (nicolas-grekas)
+ * bug #45258 [DependencyInjection] Don't dump polyfilled classes in preload script (nicolas-grekas)
+ * bug #38534 [Serializer] make XmlEncoder stateless thus reentrant (connorhu)
+ * bug #42253 [Form] Do not fix URL protocol for relative URLs (bogkonstantin)
+ * bug #45256 [DomCrawler] ignore bad charsets (nicolas-grekas)
+ * bug #45255 [PropertyAccess] Fix handling of uninitialized property of parent class (filiplikavcan)
+ * bug #45204 [Validator] Fix minRatio and maxRatio when getting rounded (alexander-schranz)
+ * bug #45240 [Console] Revert StringInput bc break from #45088 (bobthecow)
+
 * 4.4.37 (2022-01-28)
 
  * bug #44939 [Form] UrlType should not add protocol to emails (GromNaN)

From 8e1157d36341d6be4b172111537f375b108d7b04 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 28 Feb 2022 08:43:17 +0100
Subject: [PATCH 55/56] Update CONTRIBUTORS for 4.4.38

---
 CONTRIBUTORS.md | 78 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d287e27ee871e..c8eb4764f6c53 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -12,13 +12,13 @@ The Symfony Connect username in parenthesis allows to get more information
  - Tobias Schultze (tobion)
  - Robin Chalas (chalas_r)
  - Christophe Coevoet (stof)
- - Wouter De Jong (wouterj)
  - Jérémy DERUSSÉ (jderusse)
+ - Wouter De Jong (wouterj)
  - Grégoire Pineau (lyrixx)
  - Maxime Steinhausser (ogizanagi)
  - Kévin Dunglas (dunglas)
- - Jordi Boggiano (seldaek)
  - Thomas Calvet (fancyweb)
+ - Jordi Boggiano (seldaek)
  - Victor Berchet (victor)
  - Javier Eguiluz (javier.eguiluz)
  - Ryan Weaver (weaverryan)
@@ -76,8 +76,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Saša Stamenković (umpirsky)
  - Peter Rehm (rpet)
  - Henrik Bjørnskov (henrikbjorn)
- - Miha Vrhovnik
  - Antoine M (amakdessi)
+ - Miha Vrhovnik
  - Diego Saint Esteben (dii3g0)
  - Mathieu Piot (mpiot)
  - Konstantin Kudryashov (everzet)
@@ -93,18 +93,18 @@ The Symfony Connect username in parenthesis allows to get more information
  - Eric Clemmons (ericclemmons)
  - Graham Campbell (graham)
  - Charles Sarrazin (csarrazi)
+ - Alexander Schranz (alexander-schranz)
  - Vasilij Dusko
  - Douglas Greenshields (shieldo)
  - David Buchmann (dbu)
- - Alexander Schranz (alexander-schranz)
  - Arnout Boks (aboks)
  - Deni
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
  - Fran Moreno (franmomu)
+ - Jérôme Vasseur (jvasseur)
  - Mathieu Santostefano (welcomattic)
  - Dariusz Ruminski
- - Jérôme Vasseur (jvasseur)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
@@ -119,11 +119,11 @@ The Symfony Connect username in parenthesis allows to get more information
  - Alexandre Daubois (alexandre-daubois)
  - Julien Falque (julienfalque)
  - Baptiste Clavié (talus)
+ - Massimiliano Arione (garak)
+ - Mathias Arlaud (mtarld)
  - Antoine Hérault (herzult)
  - Paráda József (paradajozsef)
  - Vincent Langlet (deviling)
- - Massimiliano Arione (garak)
- - Mathias Arlaud (mtarld)
  - Arnaud Le Blanc (arnaud-lb)
  - Przemysław Bogusz (przemyslaw-bogusz)
  - Maxime STEINHAUSSER
@@ -182,6 +182,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Juti Noppornpitak (shiroyuki)
  - Simon Berger
  - Anthony MARTIN (xurudragon)
+ - Alexander Menshchikov (zmey_kk)
  - Sebastian Hörl (blogsh)
  - Daniel Gomes (danielcsgomes)
  - Hidenori Goto (hidenorigoto)
@@ -192,7 +193,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Guilherme Blanco (guilhermeblanco)
  - Marco Pivetta (ocramius)
  - SpacePossum
- - Alexander Menshchikov (zmey_kk)
  - Pablo Godel (pgodel)
  - Andreas Braun
  - Jérémie Augustin (jaugustin)
@@ -236,6 +236,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Matthieu Ouellette-Vachon (maoueh)
  - Michał Pipa (michal.pipa)
  - Dawid Nowak
+ - Martin Hujer (martinhujer)
  - Roman Martinuk (a2a4)
  - Amal Raghav (kertz)
  - Jonathan Ingram (jonathaningram)
@@ -264,7 +265,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dorian Villet (gnutix)
  - Michaël Perrin (michael.perrin)
  - Sergey Linnik (linniksa)
- - Martin Hujer (martinhujer)
  - Richard Miller (mr_r_miller)
  - Mario A. Alvarez Garcia (nomack84)
  - Dennis Benkert (denderello)
@@ -281,6 +281,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Benjamin Dulau (dbenjamin)
  - Baptiste Lafontaine (magnetik)
  - Mathieu Lemoine (lemoinem)
+ - Justin Hileman (bobthecow)
  - Denis Brumann (dbrumann)
  - Christian Schmidt
  - Andreas Hucks (meandmymonkey)
@@ -308,6 +309,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dominique Bongiraud
  - dFayet
  - Jeremy Livingston (jeremylivingston)
+ - Karoly Gossler (connorhu)
  - soyuka
  - Michael Lee (zerustech)
  - Matthieu Auger (matthieuauger)
@@ -318,7 +320,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - jeff
  - John Kary (johnkary)
  - fd6130 (fdtvui)
- - Justin Hileman (bobthecow)
  - Blanchon Vincent (blanchonvincent)
  - Maciej Malarz (malarzm)
  - Michele Orselli (orso)
@@ -346,7 +347,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Mantis Development
  - Loïc Faugeron
  - quentin neyrat (qneyrat)
- - Karoly Gossler (connorhu)
  - Marcin Szepczynski (czepol)
  - Rob Frawley 2nd (robfrawley)
  - Ahmed Raafat
@@ -415,8 +415,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Wodor Wodorski
  - Guilhem N (guilhemn)
  - Mohammad Emran Hasan (phpfour)
+ - Christopher Davis (chrisguitarguy)
  - Dmitriy Mamontov (mamontovdmitriy)
  - Ben Ramsey (ramsey)
+ - Hugo Alliaume (kocal)
  - Laurent Masforné (heisenberg)
  - Sergey (upyx)
  - Giorgio Premi
@@ -482,6 +484,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Aurelijus Valeiša (aurelijus)
  - Jan Decavele (jandc)
  - Gustavo Piltcher
+ - flack (flack)
  - Stepan Tanasiychuk (stfalcon)
  - Ivan Kurnosov
  - Tiago Ribeiro (fixe)
@@ -508,7 +511,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Mark Challoner (markchalloner)
  - Loïc Frémont (loic425)
  - Oleksandr Barabolia (oleksandrbarabolia)
- - Christopher Davis (chrisguitarguy)
  - ivan
  - Greg Anderson
  - Tri Pham (phamuyentri)
@@ -539,6 +541,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dmytro Borysovskyi (dmytr0)
  - Tomasz Kowalczyk (thunderer)
  - Artur Eshenbrener
+ - Dries Vints
  - Thomas Perez (scullwm)
  - Yoann RENARD (yrenard)
  - Felix Labrecque
@@ -548,6 +551,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Tim Goudriaan (codedmonkey)
  - Tarmo Leppänen (tarlepp)
  - Martin Auswöger
+ - Hubert Lenoir (hubert_lenoir)
  - Robbert Klarenbeek (robbertkl)
  - Hamza Makraz (makraz)
  - Eric Masoero (eric-masoero)
@@ -556,7 +560,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - hossein zolfi (ocean)
  - Clément Gautier (clementgautier)
  - Koen Reiniers (koenre)
- - Hugo Alliaume (kocal)
  - Sanpi
  - Eduardo Gulias (egulias)
  - giulio de donato (liuggio)
@@ -620,7 +623,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - hubert lecorche (hlecorche)
  - Vladyslav Loboda
  - fritzmg
- - flack (flack)
  - Marc Morales Valldepérez (kuert)
  - Jean-Baptiste GOMOND (mjbgo)
  - Vadim Kharitonov (virtuozzz)
@@ -716,7 +718,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Jerzy (jlekowski)
  - Raulnet
  - Christian Wahler
- - Dries Vints
  - Giso Stallenberg (gisostallenberg)
  - Gintautas Miselis
  - Rob Bast
@@ -724,6 +725,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Pierre Rineau
  - Andreas Leathley (iquito)
  - Soufian EZ-ZANTAR (soezz)
+ - Arun Philip
  - Zander Baldwin
  - Marek Zajac
  - Adam Harvey
@@ -769,6 +771,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - nikos.sotiropoulos
  - Eduardo Oliveira (entering)
  - Oleksii Zhurbytskyi
+ - Bilge
  - Ilya Antipenko (aivus)
  - Ricardo Oliveira (ricardolotr)
  - Roy Van Ginneken (rvanginneken)
@@ -799,7 +802,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - alexpods
  - Dennis Langen (nijusan)
  - Adrien Wilmet (adrienfr)
- - Hubert Lenoir (hubert_lenoir)
  - Adam Szaraniec (mimol)
  - Dariusz Ruminski
  - Erik Trapman (eriktrapman)
@@ -926,6 +928,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Nicolas Martin (cocorambo)
  - Jon Gotlin (jongotlin)
  - Adrian Nguyen (vuphuong87)
+ - benjaminmal
  - Khoo Yong Jun
  - Sebastian Blum
  - Laurent Clouet
@@ -973,6 +976,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Geoffrey Brier (geoffrey-brier)
  - Alexandre Parent
  - Roger Guasch (rogerguasch)
+ - DT Inier (gam6itko)
  - Vladimir Tsykun
  - Andrei O
  - Dustin Dobervich (dustin10)
@@ -1050,7 +1054,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - maxime.perrimond
  - Sascha Grossenbacher
  - cthulhu
- - Arun Philip
  - Rémi Leclerc
  - Jonas Hünig
  - Szijarto Tamas
@@ -1061,6 +1064,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Kristijan Kanalas
  - Stephan Vock
  - Benjamin Zikarsky (bzikarsky)
+ - “Filip
  - Marion Hurteau
  - Dmitrii Lozhkin
  - Sobhan Sharifi (50bhan)
@@ -1176,6 +1180,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Wickex
  - tuqqu
  - Neagu Cristian-Doru (cristian-neagu)
+ - Dude (b1rdex)
  - Dave Marshall (davedevelopment)
  - Jakub Kulhan (jakubkulhan)
  - Shaharia Azam
@@ -1203,6 +1208,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - SnakePin
  - vladimir.panivko
  - Josiah (josiah)
+ - Dennis Væversted (srnzitcom)
  - Guillaume Verstraete (versgui)
  - Joschi Kuphal
  - John Bohn (jbohn)
@@ -1221,7 +1227,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Christian Soronellas (theunic)
  - kick-the-bucket
  - fedor.f
- - Bilge
  - Yosmany Garcia (yosmanyga)
  - Jeremiasz Major
  - Wouter de Wild
@@ -1265,6 +1270,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Zhuravlev Alexander (scif)
  - Stefano Degenkamp (steef)
  - James Michael DuPont
+ - Christian Gripp (core23)
  - Jake (jakesoft)
  - Flinsch
  - Quentin Dreyer
@@ -1625,6 +1631,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Georgi Georgiev
  - Maximilian Berghoff (electricmaxxx)
  - nacho
+ - TristanPouliquen
  - Piotr Antosik (antek88)
  - mwos
  - Volker Killesreiter (ol0lll)
@@ -1643,6 +1650,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ken Marfilla (marfillaster)
  - benatespina (benatespina)
  - Denis Kop
+ - Andrey Lebedev (alebedev)
  - Jean-Guilhem Rouel (jean-gui)
  - Yoann MOROCUTTI
  - jfcixmedia
@@ -1690,7 +1698,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Jakub Sacha
  - Julius Kiekbusch
  - Olaf Klischat
- - benjaminmal
  - orlovv
  - Claude Dioudonnat
  - Jonathan Hedstrom
@@ -1734,6 +1741,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Péter Buri (burci)
  - Evgeny Efimov (edefimov)
  - kaiwa
+ - Daniel Badura
  - Charles Sanquer (csanquer)
  - Albert Ganiev (helios-ag)
  - Neil Katin
@@ -1762,6 +1770,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Amine Yakoubi
  - Eduardo García Sanz (coma)
  - Sergio (deverad)
+ - Arend Hummeling
  - Makdessi Alex
  - fduch (fduch)
  - Juan Miguel Besada Vidal (soutlink)
@@ -1829,13 +1838,13 @@ The Symfony Connect username in parenthesis allows to get more information
  - Vlad Gapanovich (gapik)
  - Alexander Kurilo (kamazee)
  - Nyro (nyro)
+ - Konstantin Bogomolov
  - Marco
  - Marc Torres
  - Mark Spink
  - cesar
  - Alberto Aldegheri
  - Cesar Scur (cesarscur)
- - “Filip
  - Dmitri Petmanson
  - heccjj
  - Alexandre Melard
@@ -1918,6 +1927,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - abluchet
  - Ruud Arentsen
  - Harald Tollefsen
+ - Tobias Bönner
  - Matthieu
  - Arend-Jan Tetteroo
  - Albin Kerouaton
@@ -1979,6 +1989,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Volodymyr Kupriienko (greeflas)
  - Serhiy Lunak (slunak)
  - Wojciech Błoszyk (wbloszyk)
+ - Jiri Barous
  - Giorgio Premi
  - abunch
  - tamcy
@@ -2000,6 +2011,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Frédéric Bouchery (fbouchery)
  - Patrick Daley (padrig)
  - Foxprodev
+ - developer-av
  - Max Summe
  - WedgeSama
  - Dale.Nash
@@ -2103,6 +2115,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Simon Neidhold
  - Valentin VALCIU
  - Jeremiah VALERIE
+ - Alexandre Beaujour
  - Julien Menth
  - George Yiannoulopoulos
  - Yannick Snobbert
@@ -2116,6 +2129,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - bill moll
  - Benjamin Bender
  - PaoRuby
+ - Bizley
  - Jared Farrish
  - karl.rixon
  - raplider
@@ -2236,12 +2250,14 @@ The Symfony Connect username in parenthesis allows to get more information
  - riadh26
  - Konstantinos Alexiou
  - Andrii Boiko
+ - Dilek Erkut
  - Harold Iedema
  - WaiSkats
  - Morimoto Ryosuke
  - Ikhsan Agustian
  - Arnau González (arnaugm)
  - Simon Bouland (bouland)
+ - Christoph König (chriskoenig)
  - Jibé Barth (jibbarth)
  - Jm Aribau (jmaribau)
  - Matthew Foster (mfoster)
@@ -2266,6 +2282,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Phil Davis
  - Gleb Sidora
  - David Stone
+ - Giorgio Premi
  - Gerhard Seidel (gseidel)
  - Jovan Perovic (jperovic)
  - Pablo Maria Martelletti (pmartelletti)
@@ -2295,7 +2312,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Mickael GOETZ
  - Maciej Schmidt
  - botbotbot
- - Dennis Væversted
  - Timon van der Vorm
  - nuncanada
  - František Bereň
@@ -2390,6 +2406,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Roy-Orbison
  - Aaron Somi
  - kshida
+ - Yasmany Cubela Medina (bitgandtter)
  - Michał Dąbrowski (defrag)
  - Aryel Tupinamba (dfkimera)
  - Hans Höchtl (hhoechtl)
@@ -2400,6 +2417,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Jawira Portugal (jawira)
  - Johannes Müller (johmue)
  - Jordi Llonch (jordillonch)
+ - Roman Igoshin (masterro)
  - Nicholas Ruunu (nicholasruunu)
  - Jeroen van den Nieuwenhuisen (nieuwenhuisen)
  - Cyril Pascal (paxal)
@@ -2454,6 +2472,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Adam
  - Ivo
  - Ismo Vuorinen
+ - Valentin
  - Sören Bernstein
  - devel
  - taiiiraaa
@@ -2556,6 +2575,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Veres Lajos
  - Ernest Hymel
  - Andrea Civita
+ - Nicolás Alonso
  - LoginovIlya
  - Nick Chiu
  - grifx
@@ -2596,10 +2616,12 @@ The Symfony Connect username in parenthesis allows to get more information
  - David Windell
  - Frank Jogeleit
  - Ondřej Frei
+ - Volodymyr Panivko
  - Gabriel Birke
  - skafandri
  - Derek Bonner
  - martijn
+ - Jenne van der Meer
  - Storkeus
  - Alan Chen
  - Anton Zagorskii
@@ -2610,10 +2632,12 @@ The Symfony Connect username in parenthesis allows to get more information
  - Even André Fiskvik
  - Agata
  - dakur
+ - Matthias Schmidt
  - florian-michael-mast
  - Александр Ли
  - Arjan Keeman
  - Vlad Dumitrache
+ - Alex Kalineskou
  - Erik van Wingerden
  - Valouleloup
  - robmro27
@@ -2675,6 +2699,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Kevin Verschaeve (keversc)
  - Kevin Herrera (kherge)
  - Luis Ramón López López (lrlopez)
+ - Vladislav Nikolayev (luxemate)
  - Martin Mandl (m2mtech)
  - Mehdi Mabrouk (mehdidev)
  - Bart Reunes (metalarend)
@@ -2693,6 +2718,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Pablo Monterde Perez (plebs)
  - Pierre-Olivier Vares (povares)
  - Jimmy Leger (redpanda)
+ - Samaël Villette (samadu61)
  - Marcin Szepczynski (szepczynski)
  - Cyrille Jouineau (tuxosaurus)
  - Vladimir Chernyshev (volch)
@@ -2721,6 +2747,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Gabriel Moreira
  - Alexey Popkov
  - ChS
+ - michal
  - Alexis MARQUIS
  - Joseph Deray
  - Damian Sromek
@@ -2792,6 +2819,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Michel Bardelmeijer
  - Tomas Kmieliauskas
  - Ikko Ashimine
+ - Erwin Dirks
  - Brad Jones
  - Billie Thompson
  - lol768
@@ -2801,6 +2829,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Johannes
  - Jörg Rühl
  - George Dietrich
+ - jannick-holm
  - wesleyh
  - sergey
  - Menno Holtkamp
@@ -2811,6 +2840,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Michael Genereux
  - patrick-mcdougle
  - Dariusz Czech
+ - Clemens Krack
  - Bruno Baguette
  - Jack Wright
  - MrNicodemuz
@@ -2867,6 +2897,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - bokonet
  - Arrilot
  - ampaze
+ - Gabrielle Langer
+ - Chris McGehee
  - Markus Staab
  - Pierre-Louis LAUNAY
  - djama
@@ -2914,6 +2946,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ilya Bulakh
  - David Soria Parra
  - Sergiy Sokolenko
+ - Cantepie
  - detinkin
  - Ahmed Abdulrahman
  - dinitrol
@@ -2971,7 +3004,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Juan Ases García (ases)
  - Siragusa (asiragusa)
  - Daniel Basten (axhm3a)
- - Dude (b1rdex)
  - Benedict Massolle (bemas)
  - Gerard Berengue Llobera (bere)
  - Bernd Matzner (bmatzner)
@@ -2981,7 +3013,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Choong Wei Tjeng (choonge)
  - Kousuke Ebihara (co3k)
  - Loïc Vernet (coil)
- - Christian Gripp (core23)
  - Christoph Schaefer (cvschaefer)
  - Damon Jones (damon__jones)
  - Alexandre Fiocre (demos77)
@@ -3087,6 +3118,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Florent Cailhol
  - szymek
  - Ryan Linnit
+ - a.dmitryuk
  - Kovacs Nicolas
  - craigmarvelley
  - Stano Turza

From 85e4a8fd67b3789fc82e67e4d367928c9503ceed Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 28 Feb 2022 08:43:20 +0100
Subject: [PATCH 56/56] Update VERSION for 4.4.38

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 61c18ff703eb3..74a8e904ac9e9 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '4.4.38-DEV';
+    public const VERSION = '4.4.38';
     public const VERSION_ID = 40438;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
     public const RELEASE_VERSION = 38;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';