From 69fcd075eb641b5a24b2ecfed9632f578006df57 Mon Sep 17 00:00:00 2001
From: Alexandre Parent <alexandreparent_dev@outlook.com>
Date: Thu, 21 Jan 2021 09:05:34 -0500
Subject: [PATCH 01/87] Fix console logger according to PSR-3

---
 src/Symfony/Component/Console/EventListener/ErrorListener.php | 4 ++--
 .../Console/Tests/EventListener/ErrorListenerTest.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php
index a34075793e165..897d9853f2848 100644
--- a/src/Symfony/Component/Console/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php
@@ -40,12 +40,12 @@ public function onConsoleError(ConsoleErrorEvent $event)
         $error = $event->getError();
 
         if (!$inputString = $this->getInputString($event)) {
-            $this->logger->error('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => $error->getMessage()]);
+            $this->logger->critical('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => $error->getMessage()]);
 
             return;
         }
 
-        $this->logger->error('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => $inputString, 'message' => $error->getMessage()]);
+        $this->logger->critical('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => $inputString, 'message' => $error->getMessage()]);
     }
 
     public function onConsoleTerminate(ConsoleTerminateEvent $event)
diff --git a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
index 68b4b3a3e1654..0b9fb4d367f2b 100644
--- a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
@@ -33,7 +33,7 @@ public function testOnConsoleError()
         $logger = $this->getLogger();
         $logger
             ->expects($this->once())
-            ->method('error')
+            ->method('critical')
             ->with('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => 'test:run --foo=baz buzz', 'message' => 'An error occurred'])
         ;
 
@@ -48,7 +48,7 @@ public function testOnConsoleErrorWithNoCommandAndNoInputString()
         $logger = $this->getLogger();
         $logger
             ->expects($this->once())
-            ->method('error')
+            ->method('critical')
             ->with('An error occurred while using the console. Message: "{message}"', ['exception' => $error, 'message' => 'An error occurred'])
         ;
 

From 85989c3678d243e229f929008ede8b2e24c0c3fa Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 29 Dec 2020 14:49:11 +0100
Subject: [PATCH 02/87] keep valid submitted choices when additional choices
 are submitted

---
 .../FrameworkBundle/Resources/config/form.xml |  1 +
 .../Form/Extension/Core/Type/ChoiceType.php   | 78 +++++++++++++++----
 .../Extension/Core/Type/ChoiceTypeTest.php    | 25 +++---
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 17598fa95815c..05a58c4c4cd2c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -69,6 +69,7 @@
         <service id="form.type.choice" class="Symfony\Component\Form\Extension\Core\Type\ChoiceType">
             <tag name="form.type" />
             <argument type="service" id="form.choice_list_factory"/>
+            <argument type="service" id="translator" on-invalid="ignore" />
         </service>
         <service id="form.type.file" class="Symfony\Component\Form\Extension\Core\Type\FileType" public="true">
             <tag name="form.type" />
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 4297460d34f4f..bd2985b313137 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -28,6 +28,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\ChoiceToValueTransformer;
 use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
@@ -35,18 +36,29 @@
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyPath;
+use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ChoiceType extends AbstractType
 {
     private $choiceListFactory;
+    private $translator;
 
-    public function __construct(ChoiceListFactoryInterface $choiceListFactory = null)
+    /**
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(ChoiceListFactoryInterface $choiceListFactory = null, $translator = null)
     {
         $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(
             new PropertyAccessDecorator(
                 new DefaultChoiceListFactory()
             )
         );
+
+        if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
+            throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be an instance of "%s", "%s" given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
+        }
+        $this->translator = $translator;
     }
 
     /**
@@ -54,6 +66,7 @@ public function __construct(ChoiceListFactoryInterface $choiceListFactory = null
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $unknownValues = [];
         $choiceList = $this->createChoiceList($options);
         $builder->setAttribute('choice_list', $choiceList);
 
@@ -81,10 +94,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $this->addSubForms($builder, $choiceListView->preferredChoices, $options);
             $this->addSubForms($builder, $choiceListView->choices, $options);
+        }
 
+        if ($options['expanded'] || $options['multiple']) {
             // Make sure that scalar, submitted values are converted to arrays
             // which can be submitted to the checkboxes/radio buttons
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($choiceList, $options, &$unknownValues) {
                 $form = $event->getForm();
                 $data = $event->getData();
 
@@ -99,6 +114,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 // Convert the submitted data to a string, if scalar, before
                 // casting it to an array
                 if (!\is_array($data)) {
+                    if ($options['multiple']) {
+                        throw new TransformationFailedException('Expected an array.');
+                    }
+
                     $data = (array) (string) $data;
                 }
 
@@ -110,17 +129,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $unknownValues = $valueMap;
 
                 // Reconstruct the data as mapping from child names to values
-                $data = [];
-
-                /** @var FormInterface $child */
-                foreach ($form as $child) {
-                    $value = $child->getConfig()->getOption('value');
-
-                    // Add the value to $data with the child's name as key
-                    if (isset($valueMap[$value])) {
-                        $data[$child->getName()] = $value;
-                        unset($unknownValues[$value]);
-                        continue;
+                $knownValues = [];
+
+                if ($options['expanded']) {
+                    /** @var FormInterface $child */
+                    foreach ($form as $child) {
+                        $value = $child->getConfig()->getOption('value');
+
+                        // Add the value to $data with the child's name as key
+                        if (isset($valueMap[$value])) {
+                            $knownValues[$child->getName()] = $value;
+                            unset($unknownValues[$value]);
+                            continue;
+                        }
+                    }
+                } else {
+                    foreach ($data as $value) {
+                        if ($choiceList->getChoicesForValues([$value])) {
+                            $knownValues[] = $value;
+                            unset($unknownValues[$value]);
+                        }
                     }
                 }
 
@@ -128,16 +156,34 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 // field exists for it or not
                 unset($unknownValues['']);
 
-                // Throw exception if unknown values were submitted
-                if (\count($unknownValues) > 0) {
+                // Throw exception if unknown values were submitted (multiple choices will be handled in a different event listener below)
+                if (\count($unknownValues) > 0 && !$options['multiple']) {
                     throw new TransformationFailedException(sprintf('The choices "%s" do not exist in the choice list.', implode('", "', array_keys($unknownValues))));
                 }
 
-                $event->setData($data);
+                $event->setData($knownValues);
             });
         }
 
         if ($options['multiple']) {
+            $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use (&$unknownValues) {
+                // Throw exception if unknown values were submitted
+                if (\count($unknownValues) > 0) {
+                    $form = $event->getForm();
+
+                    $clientDataAsString = is_scalar($form->getViewData()) ? (string) $form->getViewData() : \gettype($form->getViewData());
+                    $messageTemplate = 'The value {{ value }} is not valid.';
+
+                    if (null !== $this->translator) {
+                        $message = $this->translator->trans($messageTemplate, ['{{ value }}' => $clientDataAsString], 'validators');
+                    } else {
+                        $message = strtr($messageTemplate, ['{{ value }}' => $clientDataAsString]);
+                    }
+
+                    $form->addError(new FormError($message, $messageTemplate, ['{{ value }}' => $clientDataAsString], null, new TransformationFailedException(sprintf('The choices "%s" do not exist in the choice list.', implode('", "', array_keys($unknownValues))))));
+                }
+            });
+
             // <select> tag with "multiple" option or list of checkbox inputs
             $builder->addViewTransformer(new ChoicesToValuesTransformer($choiceList));
         } else {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index c07722c9e3075..b4a8415ac4220 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -806,9 +806,9 @@ public function testSubmitMultipleNonExpandedInvalidArrayChoice()
 
         $form->submit(['a', 'foobar']);
 
-        $this->assertNull($form->getData());
-        $this->assertEquals(['a', 'foobar'], $form->getViewData());
-        $this->assertFalse($form->isSynchronized());
+        $this->assertEquals(['a'], $form->getData());
+        $this->assertEquals(['a'], $form->getViewData());
+        $this->assertFalse($form->isValid());
     }
 
     public function testSubmitMultipleNonExpandedObjectChoices()
@@ -1349,17 +1349,17 @@ public function testSubmitMultipleExpandedInvalidArrayChoice()
 
         $form->submit(['a', 'foobar']);
 
-        $this->assertNull($form->getData());
-        $this->assertSame(['a', 'foobar'], $form->getViewData());
+        $this->assertSame(['a'], $form->getData());
+        $this->assertSame(['a'], $form->getViewData());
         $this->assertEmpty($form->getExtraData());
-        $this->assertFalse($form->isSynchronized());
+        $this->assertFalse($form->isValid());
 
-        $this->assertFalse($form[0]->getData());
+        $this->assertTrue($form[0]->getData());
         $this->assertFalse($form[1]->getData());
         $this->assertFalse($form[2]->getData());
         $this->assertFalse($form[3]->getData());
         $this->assertFalse($form[4]->getData());
-        $this->assertNull($form[0]->getViewData());
+        $this->assertSame('a', $form[0]->getViewData());
         $this->assertNull($form[1]->getViewData());
         $this->assertNull($form[2]->getViewData());
         $this->assertNull($form[3]->getViewData());
@@ -2033,8 +2033,13 @@ public function testTrimIsDisabled($multiple, $expanded)
         $form->submit($multiple ? (array) $submittedData : $submittedData);
 
         // When the choice does not exist the transformation fails
-        $this->assertFalse($form->isSynchronized());
-        $this->assertNull($form->getData());
+        $this->assertFalse($form->isValid());
+
+        if ($multiple) {
+            $this->assertSame([], $form->getData());
+        } else {
+            $this->assertNull($form->getData());
+        }
     }
 
     /**

From aeb15a1322ac60ecdff88b327dd7d1435c7a8010 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 27 Jan 2021 14:59:11 +0100
Subject: [PATCH 03/87] Bump Symfony version to 4.4.20

---
 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 19fead0808382..f2b1966ea5aa7 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.19';
-    public const VERSION_ID = 40419;
+    public const VERSION = '4.4.20-DEV';
+    public const VERSION_ID = 40420;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 19;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 20;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';

From b40e71f096d6dc8f265f87cd7a93de27ac02d49c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 27 Jan 2021 14:48:15 +0100
Subject: [PATCH 04/87] Replace "branch-version" by "versions" in composer.json

---
 .appveyor.yml                                       |  3 ++-
 .github/build-packages.php                          |  2 +-
 .github/workflows/tests.yml                         |  3 ++-
 .travis.yml                                         |  8 +++++---
 composer.json                                       | 12 +++++++-----
 src/Symfony/Contracts/Cache/composer.json           |  1 -
 src/Symfony/Contracts/EventDispatcher/composer.json |  1 -
 src/Symfony/Contracts/HttpClient/composer.json      |  1 -
 src/Symfony/Contracts/Service/composer.json         |  1 -
 src/Symfony/Contracts/Translation/composer.json     |  1 -
 src/Symfony/Contracts/composer.json                 |  1 -
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a2f36f9d97414..41d9c8d45d701 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -50,9 +50,10 @@ install:
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F)
+    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F)
     - php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
     - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
+    - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
     - php composer.phar update --no-progress --ansi
     - php phpunit install
 
diff --git a/.github/build-packages.php b/.github/build-packages.php
index c8c802ad595b4..30dcf0c9adce8 100644
--- a/.github/build-packages.php
+++ b/.github/build-packages.php
@@ -46,7 +46,7 @@
         passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
     }
 
-    $package->version = (isset($package->extra->{'branch-version'}) ? $package->extra->{'branch-version'} : $version).'.x-dev';
+    $package->version = preg_replace('/(?:\.x)?-dev$/', '', $package->extra->{'branch-alias'}->{'dev-main'} ?? $version).'.x-dev';
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0038195fcf9a8..9ef0b10c04ee9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -80,8 +80,9 @@ jobs:
             -   name: Configure composer
                 run: |
                     COMPOSER_HOME="$(composer config home)"
+                    composer self-update
                     ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
+                    echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
 
             -   name: Determine composer cache directory
                 id: composer-cache
diff --git a/.travis.yml b/.travis.yml
index 78e02c8c7af60..fb3910f44b1a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ addons:
 
 env:
     global:
+        - SYMFONY_VERSION=4.4
         - MIN_PHP=7.1.3
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
         - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
@@ -170,8 +171,8 @@ install:
           git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
           git rm -rq src/Symfony/Bridge/PhpUnit
           git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
-          export SYMFONY_VERSION=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref)
-          sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
+          SYMFONY_PHPUNIT_BRIDGE_REF=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref)
+          sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_PHPUNIT_BRIDGE_REF'.x@dev"/' composer.json
           rm -rf .phpunit
       fi
 
@@ -180,7 +181,6 @@ install:
       git config --global user.email ""
       git config --global user.name "Symfony"
 
-      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*')
       SYMFONY_VERSIONS=$(git ls-remote -q --heads);
 
       if [[ ! $deps ]]; then
@@ -227,6 +227,7 @@ install:
       # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
       [[ $deps = high && ${SYMFONY_VERSION%.*} != $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1 | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
 
+      export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
       if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
 
     - |
@@ -265,6 +266,7 @@ install:
                   export FLIP='^'
                   SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
                   echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
+                  export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
                   export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
                   git fetch --depth=2 origin $SYMFONY_VERSION
                   git checkout -m FETCH_HEAD
diff --git a/composer.json b/composer.json
index c228650326b27..e12e14c163dea 100644
--- a/composer.json
+++ b/composer.json
@@ -156,11 +156,13 @@
     "repositories": [
         {
             "type": "path",
-            "url": "src/Symfony/Contracts"
+            "url": "src/Symfony/Contracts",
+            "options": {
+                "versions": {
+                    "symfony/contracts": "1.1.x-dev"
+                }
+            }
         }
     ],
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-version": "4.4"
-    }
+    "minimum-stability": "dev"
 }
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index ce40614881bad..dc2b77146c525 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -33,7 +33,6 @@
         }
     },
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index 35258e78b76b9..0d14e98fea41a 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -33,7 +33,6 @@
         }
     },
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index f4bcfb2a36116..b56709738b83e 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -32,7 +32,6 @@
         }
     },
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index 4f24e1e03d66b..8134ba6b88fba 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -33,7 +33,6 @@
         }
     },
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 2b4ddbb38606d..8fd0d88df7ed8 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -32,7 +32,6 @@
         }
     },
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index ec475e2670d86..62b123dc6bed4 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -46,7 +46,6 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-version": "1.1",
         "branch-alias": {
             "dev-main": "1.1-dev"
         }

From f0409b403f2ea0a8290b417b2ae35dd0a330cec3 Mon Sep 17 00:00:00 2001
From: Julien Falque <julien.falque@gmail.com>
Date: Wed, 27 Jan 2021 17:40:30 +0100
Subject: [PATCH 05/87] [Serializer] Prevent access to private properties
 without getters

---
 .../Normalizer/ObjectNormalizer.php           | 10 ++++----
 .../DummyPrivatePropertyWithoutGetter.php     | 23 +++++++++++++++++++
 .../Tests/Normalizer/ObjectNormalizerTest.php | 10 ++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php

diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 0e1a378fe6f91..a3bd07440b581 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -107,8 +107,9 @@ protected function extractAttributes($object, $format = null, array $context = [
 
         // properties
         foreach ($reflClass->getProperties() as $reflProperty) {
+            $isPublic = $reflProperty->isPublic();
+
             if ($checkPropertyInitialization) {
-                $isPublic = $reflProperty->isPublic();
                 if (!$isPublic) {
                     $reflProperty->setAccessible(true);
                 }
@@ -116,9 +117,10 @@ protected function extractAttributes($object, $format = null, array $context = [
                     unset($attributes[$reflProperty->name]);
                     continue;
                 }
-                if (!$isPublic) {
-                    continue;
-                }
+            }
+
+            if (!$isPublic) {
+                continue;
             }
 
             if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php
new file mode 100644
index 0000000000000..d20832131b29a
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyPrivatePropertyWithoutGetter.php
@@ -0,0 +1,23 @@
+<?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;
+
+final class DummyPrivatePropertyWithoutGetter
+{
+    private $foo = 'foo';
+    private $bar = 'bar';
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 5c8c54d66cdcc..4d145a5c8b52b 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -33,6 +33,7 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\DummyPrivatePropertyWithoutGetter;
 use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
@@ -143,6 +144,15 @@ public function testNormalizeObjectWithUninitializedPrivateProperties()
         );
     }
 
+    public function testNormalizeObjectWithPrivatePropertyWithoutGetter()
+    {
+        $obj = new DummyPrivatePropertyWithoutGetter();
+        $this->assertEquals(
+            ['bar' => 'bar'],
+            $this->normalizer->normalize($obj, 'any')
+        );
+    }
+
     public function testDenormalize()
     {
         $obj = $this->normalizer->denormalize(

From 036c8d71fdc4e00091278c5b145b51c0ca8b4387 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Thu, 28 Jan 2021 12:34:38 +0100
Subject: [PATCH 06/87] use proper keys to not override appended files

---
 src/Symfony/Component/Finder/Finder.php           |  3 ++-
 src/Symfony/Component/Finder/Tests/FinderTest.php | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 4cf723bf33f53..82c2ec78dc5f3 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -669,7 +669,8 @@ public function append($iterator)
         } elseif ($iterator instanceof \Traversable || \is_array($iterator)) {
             $it = new \ArrayIterator();
             foreach ($iterator as $file) {
-                $it->append($file instanceof \SplFileInfo ? $file : new \SplFileInfo($file));
+                $file = $file instanceof \SplFileInfo ? $file : new \SplFileInfo($file);
+                $it[$file->getPathname()] = $file;
             }
             $this->iterators[] = $it;
         } else {
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index db3c4a55ef7be..dbc66cbc474c7 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -1119,6 +1119,17 @@ public function testAppendDoesNotRequireIn()
         $this->assertIterator(iterator_to_array($finder->getIterator()), $finder1->getIterator());
     }
 
+    public function testMultipleAppendCallsWithSorting()
+    {
+        $finder = $this->buildFinder()
+            ->sortByName()
+            ->append([self::$tmpDir.\DIRECTORY_SEPARATOR.'qux_1000_1.php'])
+            ->append([self::$tmpDir.\DIRECTORY_SEPARATOR.'qux_1002_0.php'])
+        ;
+
+        $this->assertOrderedIterator($this->toAbsolute(['qux_1000_1.php', 'qux_1002_0.php']), $finder->getIterator());
+    }
+
     public function testCountDirectories()
     {
         $directory = Finder::create()->directories()->in(self::$tmpDir);

From 66be87bffc92a28c5edada77b08cd424a9cba5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= <jerome@deuchnord.fr>
Date: Wed, 27 Jan 2021 17:03:07 +0100
Subject: [PATCH 07/87] [ErrorHandler] Fix strpos error when trying to call a
 method without a name

---
 .../UndefinedMethodFatalErrorHandler.php                 | 2 +-
 .../UndefinedMethodFatalErrorHandlerTest.php             | 9 +++++++++
 .../ErrorEnhancer/UndefinedMethodErrorEnhancer.php       | 2 +-
 .../ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php   | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
index 773f4dfa78c28..4f622deeca53d 100644
--- a/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -40,7 +40,7 @@ public function handleError(array $error, FatalErrorException $exception)
 
         $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
 
-        if (!class_exists($className) || null === $methods = get_class_methods($className)) {
+        if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
             // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
             return new UndefinedMethodException($message, $exception);
         }
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index 55f2f62880b23..160dc7fa05015 100644
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -48,6 +48,15 @@ public function provideUndefinedMethodData()
                 ],
                 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
             ],
+            [
+                [
+                    'type' => 1,
+                    'line' => 12,
+                    'file' => 'foo.php',
+                    'message' => 'Call to undefined method SplObjectStorage::()',
+                ],
+                'Attempted to call an undefined method named "" of class "SplObjectStorage".',
+            ],
             [
                 [
                     'type' => 1,
diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
index ad0e4b3eef00b..c4355f92ce089 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/UndefinedMethodErrorEnhancer.php
@@ -39,7 +39,7 @@ public function enhance(\Throwable $error): ?\Throwable
 
         $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
 
-        if (!class_exists($className) || null === $methods = get_class_methods($className)) {
+        if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
             // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
             return new UndefinedMethodError($message, $error);
         }
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php
index d6ac6c029c6fb..b31c6c292a8f4 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/UndefinedMethodErrorEnhancerTest.php
@@ -40,6 +40,10 @@ public function provideUndefinedMethodData()
                 'Call to undefined method SplObjectStorage::what()',
                 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
             ],
+            [
+                'Call to undefined method SplObjectStorage::()',
+                'Attempted to call an undefined method named "" of class "SplObjectStorage".',
+            ],
             [
                 'Call to undefined method SplObjectStorage::walid()',
                 "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",

From 9629dafa661db0834c424fddbdb34c77da8f5d2a Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Wed, 27 Jan 2021 14:04:45 +0100
Subject: [PATCH 08/87] Use createMock() instead of a getter

---
 .../Tests/Templating/TimedPhpEngineTest.php   |  7 +--
 .../WebDebugToolbarListenerTest.php           | 44 ++++++--------
 .../Tests/Profiler/TemplateManagerTest.php    | 20 +------
 .../Tests/EventListener/ErrorListenerTest.php | 30 ++++------
 .../Component/Form/Tests/FormFactoryTest.php  | 13 ++--
 .../CacheClearer/ChainCacheClearerTest.php    |  7 +--
 .../AddRequestFormatsListenerTest.php         | 11 +---
 .../EventListener/LocaleAwareListenerTest.php | 15 ++---
 .../EventListener/TranslatorListenerTest.php  | 15 ++---
 .../AuthenticationTrustResolverTest.php       |  4 +-
 .../Core/Tests/User/ChainUserProviderTest.php | 60 ++++++++-----------
 .../Constraints/UserPasswordValidatorTest.php |  7 +--
 .../SessionAuthenticationStrategyTest.php     | 13 ++--
 .../Tests/Mapping/Loader/FilesLoaderTest.php  |  9 +--
 14 files changed, 82 insertions(+), 173 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
index 86c6d3940c713..72e3fb0f78920 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
@@ -29,7 +29,7 @@ class TimedPhpEngineTest extends TestCase
 {
     public function testThatRenderLogsTime()
     {
-        $container = $this->getContainer();
+        $container = $this->createMock(Container::class);
         $templateNameParser = $this->getTemplateNameParser();
         $globalVariables = $this->getGlobalVariables();
         $loader = $this->getLoader($this->getStorage());
@@ -48,11 +48,6 @@ public function testThatRenderLogsTime()
         $engine->render('index.php');
     }
 
-    private function getContainer(): Container
-    {
-        return $this->createMock(Container::class);
-    }
-
     private function getTemplateNameParser(): TemplateNameParserInterface
     {
         $templateReference = $this->createMock(TemplateReferenceInterface::class);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
index 30b3edf164637..01d586346ad30 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -65,7 +65,7 @@ public function testHtmlRedirectionIsIntercepted($statusCode, $hasSession)
     {
         $response = new Response('Some content', $statusCode);
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
         $listener->onKernelResponse($event);
@@ -78,7 +78,7 @@ public function testNonHtmlRedirectionIsNotIntercepted()
     {
         $response = new Response('Some content', '301');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true);
         $listener->onKernelResponse($event);
@@ -92,7 +92,7 @@ public function testToolbarIsInjected()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -108,7 +108,7 @@ public function testToolbarIsNotInjectedOnNonHtmlContentType()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
         $response->headers->set('Content-Type', 'text/xml');
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -124,7 +124,7 @@ public function testToolbarIsNotInjectedOnContentDispositionAttachment()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
         $response->headers->set('Content-Disposition', 'attachment; filename=test.html');
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -140,7 +140,7 @@ public function testToolbarIsNotInjectedOnRedirection($statusCode, $hasSession)
     {
         $response = new Response('<html><head></head><body></body></html>', $statusCode);
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(false, 'html', $hasSession), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -165,7 +165,7 @@ public function testToolbarIsNotInjectedWhenThereIsNoNoXDebugTokenResponseHeader
     {
         $response = new Response('<html><head></head><body></body></html>');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -181,7 +181,7 @@ public function testToolbarIsNotInjectedWhenOnSubRequest()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::SUB_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::SUB_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -197,7 +197,7 @@ public function testToolbarIsNotInjectedOnIncompleteHtmlResponses()
         $response = new Response('<div>Some content</div>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -213,7 +213,7 @@ public function testToolbarIsNotInjectedOnXmlHttpRequests()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(true), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(true), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -229,7 +229,7 @@ public function testToolbarIsNotInjectedOnNonHtmlRequests()
         $response = new Response('<html><head></head><body></body></html>');
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json'), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(false, 'json'), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock());
         $listener->onKernelResponse($event);
@@ -242,7 +242,7 @@ public function testXDebugUrlHeader()
         $response = new Response();
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
@@ -250,7 +250,7 @@ public function testXDebugUrlHeader()
             ->willReturn('http://mydomain.com/_profiler/xxxxxxxx')
         ;
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
@@ -263,7 +263,7 @@ public function testThrowingUrlGenerator()
         $response = new Response();
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
@@ -271,7 +271,7 @@ public function testThrowingUrlGenerator()
             ->willThrowException(new \Exception('foo'))
         ;
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
@@ -284,7 +284,7 @@ public function testThrowingErrorCleanup()
         $response = new Response();
         $response->headers->set('X-Debug-Token', 'xxxxxxxx');
 
-        $urlGenerator = $this->getUrlGeneratorMock();
+        $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
         $urlGenerator
             ->expects($this->once())
             ->method('generate')
@@ -292,7 +292,7 @@ public function testThrowingErrorCleanup()
             ->willThrowException(new \Exception("This\nmultiline\r\ntabbed text should\tcome out\r on\n \ta single plain\r\nline"))
         ;
 
-        $event = new ResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
+        $event = new ResponseEvent($this->createMock(Kernel::class), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
 
         $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, $urlGenerator);
         $listener->onKernelResponse($event);
@@ -331,14 +331,4 @@ protected function getTwigMock($render = 'WDT')
 
         return $templating;
     }
-
-    protected function getUrlGeneratorMock()
-    {
-        return $this->createMock(UrlGeneratorInterface::class);
-    }
-
-    protected function getKernelMock()
-    {
-        return $this->createMock(Kernel::class);
-    }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
index 9b43ab5350732..5e746c63bffe3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -21,8 +21,6 @@
 use Twig\Loader\SourceContextLoaderInterface;
 
 /**
- * Test for TemplateManager class.
- *
  * @author Artur Wielogórski <wodor@wodor.net>
  */
 class TemplateManagerTest extends TestCase
@@ -38,7 +36,7 @@ class TemplateManagerTest extends TestCase
     protected $profiler;
 
     /**
-     * @var \Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager
+     * @var TemplateManager
      */
     protected $templateManager;
 
@@ -46,7 +44,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $profiler = $this->mockProfiler();
+        $this->profiler = $this->createMock(Profiler::class);
         $twigEnvironment = $this->mockTwigEnvironment();
         $templates = [
             'data_collector.foo' => ['foo', 'FooBundle:Collector:foo'],
@@ -54,7 +52,7 @@ protected function setUp(): void
             'data_collector.baz' => ['baz', 'FooBundle:Collector:baz'],
         ];
 
-        $this->templateManager = new TemplateManager($profiler, $twigEnvironment, $templates);
+        $this->templateManager = new TemplateManager($this->profiler, $twigEnvironment, $templates);
     }
 
     public function testGetNameOfInvalidTemplate()
@@ -98,11 +96,6 @@ public function profileHasCollectorCallback($panel)
         }
     }
 
-    protected function mockProfile()
-    {
-        return $this->createMock(Profile::class);
-    }
-
     protected function mockTwigEnvironment()
     {
         $this->twigEnvironment = $this->createMock(Environment::class);
@@ -121,13 +114,6 @@ protected function mockTwigEnvironment()
 
         return $this->twigEnvironment;
     }
-
-    protected function mockProfiler()
-    {
-        $this->profiler = $this->createMock(Profiler::class);
-
-        return $this->profiler;
-    }
 }
 
 class ProfileDummy extends Profile
diff --git a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
index ce3df1a0ec7bd..280395803c1c2 100644
--- a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
@@ -30,7 +30,7 @@ public function testOnConsoleError()
     {
         $error = new \TypeError('An error occurred');
 
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->once())
             ->method('error')
@@ -38,14 +38,14 @@ public function testOnConsoleError()
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleError(new ConsoleErrorEvent(new ArgvInput(['console.php', 'test:run', '--foo=baz', 'buzz']), $this->getOutput(), $error, new Command('test:run')));
+        $listener->onConsoleError(new ConsoleErrorEvent(new ArgvInput(['console.php', 'test:run', '--foo=baz', 'buzz']), $this->createMock(OutputInterface::class), $error, new Command('test:run')));
     }
 
     public function testOnConsoleErrorWithNoCommandAndNoInputString()
     {
         $error = new \RuntimeException('An error occurred');
 
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->once())
             ->method('error')
@@ -53,12 +53,12 @@ public function testOnConsoleErrorWithNoCommandAndNoInputString()
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleError(new ConsoleErrorEvent(new NonStringInput(), $this->getOutput(), $error));
+        $listener->onConsoleError(new ConsoleErrorEvent(new NonStringInput(), $this->createMock(OutputInterface::class), $error));
     }
 
     public function testOnConsoleTerminateForNonZeroExitCodeWritesToLog()
     {
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->once())
             ->method('debug')
@@ -71,7 +71,7 @@ public function testOnConsoleTerminateForNonZeroExitCodeWritesToLog()
 
     public function testOnConsoleTerminateForZeroExitCodeDoesNotWriteToLog()
     {
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->never())
             ->method('debug')
@@ -83,7 +83,7 @@ public function testOnConsoleTerminateForZeroExitCodeDoesNotWriteToLog()
 
     public function testGetSubscribedEvents()
     {
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'console.error' => ['onConsoleError', -128],
                 'console.terminate' => ['onConsoleTerminate', -128],
@@ -94,7 +94,7 @@ public function testGetSubscribedEvents()
 
     public function testAllKindsOfInputCanBeLogged()
     {
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->exactly(3))
             ->method('debug')
@@ -109,7 +109,7 @@ public function testAllKindsOfInputCanBeLogged()
 
     public function testCommandNameIsDisplayedForNonStringableInput()
     {
-        $logger = $this->getLogger();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->once())
             ->method('debug')
@@ -120,19 +120,9 @@ public function testCommandNameIsDisplayedForNonStringableInput()
         $listener->onConsoleTerminate($this->getConsoleTerminateEvent($this->createMock(InputInterface::class), 255));
     }
 
-    private function getLogger()
-    {
-        return $this->getMockForAbstractClass(LoggerInterface::class);
-    }
-
     private function getConsoleTerminateEvent(InputInterface $input, $exitCode)
     {
-        return new ConsoleTerminateEvent(new Command('test:run'), $input, $this->getOutput(), $exitCode);
-    }
-
-    private function getOutput()
-    {
-        return $this->createMock(OutputInterface::class);
+        return new ConsoleTerminateEvent(new Command('test:run'), $input, $this->createMock(OutputInterface::class), $exitCode);
     }
 }
 
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
index 0ea4bb26bfd12..c857ca622380f 100644
--- a/src/Symfony/Component/Form/Tests/FormFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -77,7 +77,7 @@ public function testCreateNamedBuilderWithTypeName()
     {
         $options = ['a' => '1', 'b' => '2'];
         $resolvedOptions = ['a' => '2', 'b' => '3'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -105,7 +105,7 @@ public function testCreateNamedBuilderFillsDataOption()
         $givenOptions = ['a' => '1', 'b' => '2'];
         $expectedOptions = array_merge($givenOptions, ['data' => 'DATA']);
         $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'DATA'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -132,7 +132,7 @@ public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
     {
         $options = ['a' => '1', 'b' => '2', 'data' => 'CUSTOM'];
         $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'CUSTOM'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -211,7 +211,7 @@ public function testCreateNamed()
     {
         $options = ['a' => '1', 'b' => '2'];
         $resolvedOptions = ['a' => '2', 'b' => '3'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -485,9 +485,4 @@ private function getMockFactory(array $methods = [])
             ->setConstructorArgs([$this->registry])
             ->getMock();
     }
-
-    private function getMockResolvedType()
-    {
-        return $this->createMock(ResolvedFormTypeInterface::class);
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
index 80c1b576be3e9..80d9796070bc0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -31,7 +31,7 @@ public static function tearDownAfterClass(): void
 
     public function testInjectClearersInConstructor()
     {
-        $clearer = $this->getMockClearer();
+        $clearer = $this->createMock(CacheClearerInterface::class);
         $clearer
             ->expects($this->once())
             ->method('clear');
@@ -39,9 +39,4 @@ public function testInjectClearersInConstructor()
         $chainClearer = new ChainCacheClearer([$clearer]);
         $chainClearer->clear(self::$cacheDir);
     }
-
-    protected function getMockClearer()
-    {
-        return $this->createMock(CacheClearerInterface::class);
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
index def3831851345..fab9a8a38f607 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -19,8 +19,6 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Test AddRequestFormatsListener class.
- *
  * @author Gildas Quemener <gildas.quemener@gmail.com>
  */
 class AddRequestFormatsListenerTest extends TestCase
@@ -47,7 +45,7 @@ public function testIsAnEventSubscriber()
 
     public function testRegisteredEvent()
     {
-        $this->assertEquals(
+        $this->assertSame(
             [KernelEvents::REQUEST => ['onKernelRequest', 100]],
             AddRequestFormatsListener::getSubscribedEvents()
         );
@@ -55,7 +53,7 @@ public function testRegisteredEvent()
 
     public function testSetAdditionalFormats()
     {
-        $request = $this->getRequestMock();
+        $request = $this->createMock(Request::class);
         $event = $this->getRequestEventMock($request);
 
         $request->expects($this->once())
@@ -65,11 +63,6 @@ public function testSetAdditionalFormats()
         $this->listener->onKernelRequest($event);
     }
 
-    protected function getRequestMock()
-    {
-        return $this->createMock(Request::class);
-    }
-
     protected function getRequestEventMock(Request $request)
     {
         $event = $this->createMock(RequestEvent::class);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
index 20c9f9d8c9e44..ab92a7916877e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleAwareListenerTest.php
@@ -40,7 +40,7 @@ public function testLocaleIsSetInOnKernelRequest()
             ->method('setLocale')
             ->with($this->equalTo('fr'));
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -57,7 +57,7 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
                 $this->throwException(new \InvalidArgumentException())
             );
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -71,7 +71,7 @@ public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
         $this->requestStack->push($this->createRequest('fr'));
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -84,7 +84,7 @@ public function testLocaleIsSetToDefaultOnKernelFinishRequestWhenParentRequestDo
 
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -104,15 +104,10 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
         $this->requestStack->push($this->createRequest('fr'));
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
-    private function createHttpKernel()
-    {
-        return $this->createMock(HttpKernelInterface::class);
-    }
-
     private function createRequest($locale)
     {
         $request = new Request();
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
index 26097696dd577..1eb86b7fb99e5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
@@ -43,7 +43,7 @@ public function testLocaleIsSetInOnKernelRequest()
             ->method('setLocale')
             ->with($this->equalTo('fr'));
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -60,7 +60,7 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
                 $this->throwException(new \InvalidArgumentException())
             );
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -72,7 +72,7 @@ public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
             ->with($this->equalTo('fr'));
 
         $this->setMasterRequest($this->createRequest('fr'));
-        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -82,7 +82,7 @@ public function testLocaleIsNotSetInOnKernelFinishRequestWhenParentRequestDoesNo
             ->expects($this->never())
             ->method('setLocale');
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -100,15 +100,10 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
             );
 
         $this->setMasterRequest($this->createRequest('fr'));
-        $event = new FinishRequestEvent($this->createHttpKernel(), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('de'), HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
-    private function createHttpKernel()
-    {
-        return $this->createMock(HttpKernelInterface::class);
-    }
-
     private function createRequest($locale)
     {
         $request = new Request();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
index eb82a596bcfa2..3d6258e2da26b 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -140,8 +140,8 @@ protected function getRememberMeToken()
     protected function getResolver()
     {
         return new AuthenticationTrustResolver(
-            'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken',
-            'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken'
+            AnonymousToken::class,
+            RememberMeToken::class
         );
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
index cb172d2b5138b..b7e2a411b392d 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -24,7 +24,7 @@ class ChainUserProviderTest extends TestCase
 {
     public function testLoadUserByUsername()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('loadUserByUsername')
@@ -32,12 +32,12 @@ public function testLoadUserByUsername()
             ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('loadUserByUsername')
             ->with($this->equalTo('foo'))
-            ->willReturn($account = $this->getAccount())
+            ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2]);
@@ -47,7 +47,7 @@ public function testLoadUserByUsername()
     public function testLoadUserByUsernameThrowsUsernameNotFoundException()
     {
         $this->expectException(UsernameNotFoundException::class);
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('loadUserByUsername')
@@ -55,7 +55,7 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
             ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('loadUserByUsername')
@@ -69,14 +69,14 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
 
     public function testRefreshUser()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
             ->willReturn(false)
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -89,7 +89,7 @@ public function testRefreshUser()
             ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
-        $provider3 = $this->getProvider();
+        $provider3 = $this->createMock(UserProviderInterface::class);
         $provider3
             ->expects($this->once())
             ->method('supportsClass')
@@ -99,16 +99,16 @@ public function testRefreshUser()
         $provider3
             ->expects($this->once())
             ->method('refreshUser')
-            ->willReturn($account = $this->getAccount())
+            ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2, $provider3]);
-        $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+        $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
     }
 
     public function testRefreshUserAgain()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
@@ -121,7 +121,7 @@ public function testRefreshUserAgain()
             ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -131,17 +131,17 @@ public function testRefreshUserAgain()
         $provider2
             ->expects($this->once())
             ->method('refreshUser')
-            ->willReturn($account = $this->getAccount())
+            ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2]);
-        $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+        $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
     }
 
     public function testRefreshUserThrowsUnsupportedUserException()
     {
         $this->expectException(UnsupportedUserException::class);
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
@@ -154,7 +154,7 @@ public function testRefreshUserThrowsUnsupportedUserException()
             ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -168,12 +168,12 @@ public function testRefreshUserThrowsUnsupportedUserException()
         ;
 
         $provider = new ChainUserProvider([$provider1, $provider2]);
-        $provider->refreshUser($this->getAccount());
+        $provider->refreshUser($this->createMock(UserInterface::class));
     }
 
     public function testSupportsClass()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
@@ -181,7 +181,7 @@ public function testSupportsClass()
             ->willReturn(false)
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -195,7 +195,7 @@ public function testSupportsClass()
 
     public function testSupportsClassWhenNotSupported()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
@@ -203,7 +203,7 @@ public function testSupportsClassWhenNotSupported()
             ->willReturn(false)
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -217,7 +217,7 @@ public function testSupportsClassWhenNotSupported()
 
     public function testAcceptsTraversable()
     {
-        $provider1 = $this->getProvider();
+        $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
             ->method('supportsClass')
@@ -230,7 +230,7 @@ public function testAcceptsTraversable()
             ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
-        $provider2 = $this->getProvider();
+        $provider2 = $this->createMock(UserProviderInterface::class);
         $provider2
             ->expects($this->once())
             ->method('supportsClass')
@@ -240,11 +240,11 @@ public function testAcceptsTraversable()
         $provider2
             ->expects($this->once())
             ->method('refreshUser')
-            ->willReturn($account = $this->getAccount())
+            ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
         $provider = new ChainUserProvider(new \ArrayObject([$provider1, $provider2]));
-        $this->assertSame($account, $provider->refreshUser($this->getAccount()));
+        $this->assertSame($account, $provider->refreshUser($this->createMock(UserInterface::class)));
     }
 
     public function testPasswordUpgrades()
@@ -268,14 +268,4 @@ public function testPasswordUpgrades()
         $provider = new ChainUserProvider([$provider1, $provider2]);
         $provider->upgradePassword($user, 'foobar');
     }
-
-    protected function getAccount()
-    {
-        return $this->createMock(UserInterface::class);
-    }
-
-    protected function getProvider()
-    {
-        return $this->createMock(UserProviderInterface::class);
-    }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
index 7c2d93ada1b24..5fc9ba0eae713 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
     {
         $user = $this->createUser();
         $this->tokenStorage = $this->createTokenStorage($user);
-        $this->encoder = $this->createPasswordEncoder();
+        $this->encoder = $this->createMock(PasswordEncoderInterface::class);
         $this->encoderFactory = $this->createEncoderFactory($this->encoder);
 
         parent::setUp();
@@ -147,11 +147,6 @@ protected function createUser()
         return $mock;
     }
 
-    protected function createPasswordEncoder($isPasswordValid = true)
-    {
-        return $this->createMock(PasswordEncoderInterface::class);
-    }
-
     protected function createEncoderFactory($encoder = null)
     {
         $mock = $this->createMock(EncoderFactoryInterface::class);
diff --git a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
index 94ff9228bca29..69953ae6fd14e 100644
--- a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -25,7 +25,7 @@ public function testSessionIsNotChanged()
         $request->expects($this->never())->method('getSession');
 
         $strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::NONE);
-        $strategy->onAuthentication($request, $this->getToken());
+        $strategy->onAuthentication($request, $this->createMock(TokenInterface::class));
     }
 
     public function testUnsupportedStrategy()
@@ -36,7 +36,7 @@ public function testUnsupportedStrategy()
         $request->expects($this->never())->method('getSession');
 
         $strategy = new SessionAuthenticationStrategy('foo');
-        $strategy->onAuthentication($request, $this->getToken());
+        $strategy->onAuthentication($request, $this->createMock(TokenInterface::class));
     }
 
     public function testSessionIsMigrated()
@@ -45,7 +45,7 @@ public function testSessionIsMigrated()
         $session->expects($this->once())->method('migrate')->with($this->equalTo(true));
 
         $strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE);
-        $strategy->onAuthentication($this->getRequest($session), $this->getToken());
+        $strategy->onAuthentication($this->getRequest($session), $this->createMock(TokenInterface::class));
     }
 
     public function testSessionIsInvalidated()
@@ -54,7 +54,7 @@ public function testSessionIsInvalidated()
         $session->expects($this->once())->method('invalidate');
 
         $strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::INVALIDATE);
-        $strategy->onAuthentication($this->getRequest($session), $this->getToken());
+        $strategy->onAuthentication($this->getRequest($session), $this->createMock(TokenInterface::class));
     }
 
     private function getRequest($session = null)
@@ -67,9 +67,4 @@ private function getRequest($session = null)
 
         return $request;
     }
-
-    private function getToken()
-    {
-        return $this->createMock(TokenInterface::class);
-    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
index bc6aab8a34bf4..6bba637a9b73a 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
@@ -20,13 +20,13 @@ class FilesLoaderTest extends TestCase
 {
     public function testCallsGetFileLoaderInstanceForeachPath()
     {
-        $loader = $this->getFilesLoader($this->getFileLoader());
+        $loader = $this->getFilesLoader($this->createMock(LoaderInterface::class));
         $this->assertEquals(4, $loader->getTimesCalled());
     }
 
     public function testCallsActualFileLoaderForMetadata()
     {
-        $fileLoader = $this->getFileLoader();
+        $fileLoader = $this->createMock(LoaderInterface::class);
         $fileLoader->expects($this->exactly(4))
             ->method('loadClassMetadata');
         $loader = $this->getFilesLoader($fileLoader);
@@ -42,9 +42,4 @@ public function getFilesLoader(LoaderInterface $loader)
             __DIR__.'/constraint-mapping.txt',
         ], $loader]);
     }
-
-    public function getFileLoader()
-    {
-        return $this->createMock(LoaderInterface::class);
-    }
 }

From 94eac1b83f375ce17d48b09c444a665e3ab64585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Sun, 31 Jan 2021 11:59:31 +0100
Subject: [PATCH 09/87] Restore priority for eventSubscribers

---
 .../Bridge/Doctrine/ContainerAwareEventManager.php    | 11 +++++++++++
 .../Doctrine/Tests/ContainerAwareEventManagerTest.php |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index 8415ee14b63cb..9b3c1595a41f0 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -164,11 +164,22 @@ private function initializeListeners(string $eventName)
     private function initializeSubscribers()
     {
         $this->initializedSubscribers = true;
+
+        $eventListeners = $this->listeners;
+        // reset eventListener to respect priority: EventSubscribers have a higher priority
+        $this->listeners = [];
         foreach ($this->subscribers as $id => $subscriber) {
             if (\is_string($subscriber)) {
                 parent::addEventSubscriber($this->subscribers[$id] = $this->container->get($subscriber));
             }
         }
+        foreach ($eventListeners as $event => $listeners) {
+            if (!isset($this->listeners[$event])) {
+                $this->listeners[$event] = [];
+            }
+            $this->listeners[$event] += $listeners;
+        }
+        $this->subscribers = [];
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
index 01baa46dc93dc..e9d260ec26608 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
@@ -146,11 +146,14 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent()
 
     public function testGetListenersForEvent()
     {
+        $this->evm = new ContainerAwareEventManager($this->container, ['lazy2']);
+
         $this->container->set('lazy', $listener1 = new MyListener());
+        $this->container->set('lazy2', $subscriber1 = new MySubscriber(['foo']));
         $this->evm->addEventListener('foo', 'lazy');
         $this->evm->addEventListener('foo', $listener2 = new MyListener());
 
-        $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners('foo')));
+        $this->assertSame([$subscriber1, $listener1, $listener2], array_values($this->evm->getListeners('foo')));
     }
 
     public function testGetListeners()

From c52c1e0b9b9818f483177af6bd4282cb3a0e9cdf Mon Sep 17 00:00:00 2001
From: Carlos Tasada <carlos.tasada@mollie.com>
Date: Sun, 31 Jan 2021 14:27:34 +0100
Subject: [PATCH 10/87] [HttpFoundation] Setting `REQUEST_TIME_FLOAT` when
 constructing a Request object

---
 src/Symfony/Component/HttpFoundation/Request.php               | 1 +
 .../HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 3c69f20ff08a6..37ab50188e27d 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -333,6 +333,7 @@ public static function create($uri, $method = 'GET', $parameters = [], $cookies
             'SCRIPT_FILENAME' => '',
             'SERVER_PROTOCOL' => 'HTTP/1.1',
             'REQUEST_TIME' => time(),
+            'REQUEST_TIME_FLOAT' => microtime(true),
         ], $server);
 
         $server['PATH_INFO'] = '';
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index c25297dbe4da0..f1ffd9a4dc747 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -23,6 +23,9 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
+/**
+ * @group time-sensitive
+ */
 class InlineFragmentRendererTest extends TestCase
 {
     public function testRender()

From 3ef7bfd9720be68d6d68253af94c1ac8717120a2 Mon Sep 17 00:00:00 2001
From: LoginovIlya <LoginovIlya@users.noreply.github.com>
Date: Sun, 31 Jan 2021 18:20:26 +0300
Subject: [PATCH 11/87] [yaml] Delelte unused comparison operation

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

diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index 2de07d023142f..dcb104ccff065 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -68,7 +68,7 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
                     $output .= "\n";
                 }
 
-                if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) {
+                if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) {
                     // If the first line starts with a space character, the spec requires a blockIndicationIndicator
                     // http://www.yaml.org/spec/1.2/spec.html#id2793979
                     $blockIndentationIndicator = (' ' === substr($value, 0, 1)) ? (string) $this->indentation : '';
@@ -97,7 +97,7 @@ public function dump($input, int $inline = 0, int $indent = 0, int $flags = 0):
                 if ($value instanceof TaggedValue) {
                     $output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
 
-                    if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
+                    if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
                         // If the first line starts with a space character, the spec requires a blockIndicationIndicator
                         // http://www.yaml.org/spec/1.2/spec.html#id2793979
                         $blockIndentationIndicator = (' ' === substr($value->getValue(), 0, 1)) ? (string) $this->indentation : '';

From 33e6af5850ce167ddef96c467cd86b9a6f986f2c Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Sun, 31 Jan 2021 21:39:35 -0500
Subject: [PATCH 12/87] Fixed updating catalogue metadata from intl domain

---
 .../Command/TranslationUpdateCommand.php      |  5 ++++
 .../Translation/Catalogue/MergeOperation.php  | 14 ++++++-----
 .../Translation/Catalogue/TargetOperation.php | 14 ++++++-----
 .../Tests/Catalogue/MergeOperationTest.php    | 23 +++++++++++++++++++
 .../Tests/Catalogue/TargetOperationTest.php   | 22 ++++++++++++++++++
 5 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index 138afc5e73db6..e922398b28cc0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -369,6 +369,11 @@ private function filterCatalogue(MessageCatalogue $catalogue, string $domain): M
         foreach ($catalogue->getResources() as $resource) {
             $filteredCatalogue->addResource($resource);
         }
+        if ($metadata = $catalogue->getMetadata('', $intlDomain)) {
+            foreach ($metadata as $k => $v) {
+                $filteredCatalogue->setMetadata($k, $v, $intlDomain);
+            }
+        }
         if ($metadata = $catalogue->getMetadata('', $domain)) {
             foreach ($metadata as $k => $v) {
                 $filteredCatalogue->setMetadata($k, $v, $domain);
diff --git a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
index d2f4abd13ff4f..d55542c0c8d6e 100644
--- a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
@@ -38,9 +38,10 @@ protected function processDomain($domain)
 
         foreach ($this->source->all($domain) as $id => $message) {
             $this->messages[$domain]['all'][$id] = $message;
-            $this->result->add([$id => $message], $this->source->defines($id, $intlDomain) ? $intlDomain : $domain);
-            if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) {
-                $this->result->setMetadata($id, $keyMetadata, $domain);
+            $d = $this->source->defines($id, $intlDomain) ? $intlDomain : $domain;
+            $this->result->add([$id => $message], $d);
+            if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) {
+                $this->result->setMetadata($id, $keyMetadata, $d);
             }
         }
 
@@ -48,9 +49,10 @@ protected function processDomain($domain)
             if (!$this->source->has($id, $domain)) {
                 $this->messages[$domain]['all'][$id] = $message;
                 $this->messages[$domain]['new'][$id] = $message;
-                $this->result->add([$id => $message], $this->target->defines($id, $intlDomain) ? $intlDomain : $domain);
-                if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
+                $d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
+                $this->result->add([$id => $message], $d);
+                if (null !== $keyMetadata = $this->target->getMetadata($id, $d)) {
+                    $this->result->setMetadata($id, $keyMetadata, $d);
                 }
             }
         }
diff --git a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
index 22aa9a3911177..8221d184d2f89 100644
--- a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
@@ -49,9 +49,10 @@ protected function processDomain($domain)
         foreach ($this->source->all($domain) as $id => $message) {
             if ($this->target->has($id, $domain)) {
                 $this->messages[$domain]['all'][$id] = $message;
-                $this->result->add([$id => $message], $this->target->defines($id, $intlDomain) ? $intlDomain : $domain);
-                if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
+                $d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
+                $this->result->add([$id => $message], $d);
+                if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) {
+                    $this->result->setMetadata($id, $keyMetadata, $d);
                 }
             } else {
                 $this->messages[$domain]['obsolete'][$id] = $message;
@@ -62,9 +63,10 @@ protected function processDomain($domain)
             if (!$this->source->has($id, $domain)) {
                 $this->messages[$domain]['all'][$id] = $message;
                 $this->messages[$domain]['new'][$id] = $message;
-                $this->result->add([$id => $message], $this->target->defines($id, $intlDomain) ? $intlDomain : $domain);
-                if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
+                $d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
+                $this->result->add([$id => $message], $d);
+                if (null !== $keyMetadata = $this->target->getMetadata($id, $d)) {
+                    $this->result->setMetadata($id, $keyMetadata, $d);
                 }
             }
         }
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
index 22af86e9063a8..240c492800acc 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
@@ -90,6 +90,29 @@ public function testGetResultWithMetadata()
         );
     }
 
+    public function testGetResultWithMetadataFromIntlDomain()
+    {
+        $leftCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a', 'b' => 'old_b']]);
+        $leftCatalogue->setMetadata('a', 'foo', 'messages+intl-icu');
+        $leftCatalogue->setMetadata('b', 'bar', 'messages+intl-icu');
+        $rightCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['b' => 'new_b', 'c' => 'new_c']]);
+        $rightCatalogue->setMetadata('b', 'baz', 'messages+intl-icu');
+        $rightCatalogue->setMetadata('c', 'qux', 'messages+intl-icu');
+
+        $mergedCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a', 'b' => 'old_b', 'c' => 'new_c']]);
+        $mergedCatalogue->setMetadata('a', 'foo', 'messages+intl-icu');
+        $mergedCatalogue->setMetadata('b', 'bar', 'messages+intl-icu');
+        $mergedCatalogue->setMetadata('c', 'qux', 'messages+intl-icu');
+
+        $this->assertEquals(
+            $mergedCatalogue,
+            $this->createOperation(
+                $leftCatalogue,
+                $rightCatalogue
+            )->getResult()
+        );
+    }
+
     protected function createOperation(MessageCatalogueInterface $source, MessageCatalogueInterface $target)
     {
         return new MergeOperation($source, $target);
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
index d4608f6ef6311..354c213e9e3b7 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
@@ -102,6 +102,28 @@ public function testGetResultWithMetadata()
         );
     }
 
+    public function testGetResultWithMetadataFromIntlDomain()
+    {
+        $leftCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a', 'b' => 'old_b']]);
+        $leftCatalogue->setMetadata('a', 'foo', 'messages+intl-icu');
+        $leftCatalogue->setMetadata('b', 'bar', 'messages+intl-icu');
+        $rightCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['b' => 'new_b', 'c' => 'new_c']]);
+        $rightCatalogue->setMetadata('b', 'baz', 'messages+intl-icu');
+        $rightCatalogue->setMetadata('c', 'qux', 'messages+intl-icu');
+
+        $diffCatalogue = new MessageCatalogue('en', ['messages+intl-icu' => ['b' => 'old_b', 'c' => 'new_c']]);
+        $diffCatalogue->setMetadata('b', 'bar', 'messages+intl-icu');
+        $diffCatalogue->setMetadata('c', 'qux', 'messages+intl-icu');
+
+        $this->assertEquals(
+            $diffCatalogue,
+            $this->createOperation(
+                $leftCatalogue,
+                $rightCatalogue
+            )->getResult()
+        );
+    }
+
     protected function createOperation(MessageCatalogueInterface $source, MessageCatalogueInterface $target)
     {
         return new TargetOperation($source, $target);

From b2d7454042c5fbd66d2f2a88193ca7a4fe901219 Mon Sep 17 00:00:00 2001
From: Piotr Kugla <piku235@gmail.com>
Date: Sat, 23 Jan 2021 17:20:14 +0100
Subject: [PATCH 13/87] [Mime] Fix case-sensitive handling in
 Headers::isUniqueHeader()

---
 src/Symfony/Component/Mime/Header/Headers.php           | 2 +-
 src/Symfony/Component/Mime/Tests/Header/HeadersTest.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php
index c6e4c8eaafb77..94614d9881b0b 100644
--- a/src/Symfony/Component/Mime/Header/Headers.php
+++ b/src/Symfony/Component/Mime/Header/Headers.php
@@ -201,7 +201,7 @@ public function remove(string $name): void
 
     public static function isUniqueHeader(string $name): bool
     {
-        return \in_array($name, self::UNIQUE_HEADERS, true);
+        return \in_array(strtolower($name), self::UNIQUE_HEADERS, true);
     }
 
     public function toString(): string
diff --git a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
index e2eb75a6977f3..89d8be01b0181 100644
--- a/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
+++ b/src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
@@ -212,6 +212,11 @@ public function testRemoveIsNotCaseSensitive()
         $this->assertFalse($headers->has('Message-ID'));
     }
 
+    public function testIsUniqueHeaderIsNotCaseSensitive()
+    {
+        $this->assertTrue(Headers::isUniqueHeader('From'));
+    }
+
     public function testToStringJoinsHeadersTogether()
     {
         $headers = new Headers();

From a9e9359581fe95be6b6fda9a8129e7c5258fbb4c Mon Sep 17 00:00:00 2001
From: FabienSalles <blacked19@gmail.com>
Date: Mon, 1 Feb 2021 18:18:40 +0100
Subject: [PATCH 14/87] fix validator when we have a false current element

fix coding styles

add type in return
---
 .../Constraints/UniqueEntityValidatorTest.php | 81 +++++++++++++++++++
 .../Constraints/UniqueEntityValidator.php     |  3 +-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index d8b7abc8064bc..05faff5872dd8 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -793,4 +793,85 @@ public function testValidateUniquenessCause()
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
+
+    /**
+     * @dataProvider resultWithEmptyIterator
+     */
+    public function testValidateUniquenessWithEmptyIterator($entity, $result)
+    {
+        $constraint = new UniqueEntity([
+            'message' => 'myMessage',
+            'fields' => ['name'],
+            'em' => self::EM_NAME,
+            'repositoryMethod' => 'findByCustom',
+        ]);
+
+        $repository = $this->createRepositoryMock();
+        $repository->expects($this->once())
+            ->method('findByCustom')
+            ->willReturn($result)
+        ;
+        $this->em = $this->createEntityManagerMock($repository);
+        $this->registry = $this->createRegistryMock($this->em);
+        $this->validator = $this->createValidator();
+        $this->validator->initialize($this->context);
+
+        $this->validator->validate($entity, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public function resultWithEmptyIterator(): array
+    {
+        $entity = new SingleIntIdEntity(1, 'foo');
+
+        return [
+            [$entity, new class() implements \Iterator {
+                public function current()
+                {
+                    return null;
+                }
+
+                public function valid(): bool
+                {
+                    return false;
+                }
+
+                public function next()
+                {
+                }
+
+                public function key()
+                {
+                }
+
+                public function rewind()
+                {
+                }
+            }],
+            [$entity, new class() implements \Iterator {
+                public function current()
+                {
+                    return false;
+                }
+
+                public function valid(): bool
+                {
+                    return false;
+                }
+
+                public function next()
+                {
+                }
+
+                public function key()
+                {
+                }
+
+                public function rewind()
+                {
+                }
+            }],
+        ];
+    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 4324dfde55436..399a18d90c7fe 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -147,8 +147,7 @@ public function validate($entity, Constraint $constraint)
             if ($result instanceof \Countable && 1 < \count($result)) {
                 $result = [$result->current(), $result->current()];
             } else {
-                $result = $result->current();
-                $result = null === $result ? [] : [$result];
+                $result = $result->valid() && null !== $result->current() ? [$result->current()] : [];
             }
         } elseif (\is_array($result)) {
             reset($result);

From ac94746dc7fa3a3781d355fb116cfb57fadcb157 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 2 Feb 2021 14:23:37 +0100
Subject: [PATCH 15/87] [ErrorHandler] fix handling messages with null bytes
 from anonymous classes

---
 .../Component/ErrorHandler/ErrorHandler.php   | 23 +++++++++++++++----
 .../ErrorHandler/Tests/ErrorHandlerTest.php   | 12 ++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
index 29f674443d20d..d357658ac1eb9 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -422,11 +422,7 @@ public function handleError(int $type, string $message, string $file, int $line)
             return false;
         }
 
-        if (false !== strpos($message, "@anonymous\0")) {
-            $logMessage = $this->parseAnonymousClass($message);
-        } else {
-            $logMessage = $this->levels[$type].': '.$message;
-        }
+        $logMessage = $this->levels[$type].': '.$message;
 
         if (null !== self::$toStringException) {
             $errorAsException = self::$toStringException;
@@ -455,6 +451,23 @@ public function handleError(int $type, string $message, string $file, int $line)
                 return true;
             }
         } else {
+            if (false !== strpos($message, '@anonymous')) {
+                $backtrace = debug_backtrace(false, 5);
+
+                for ($i = 1; isset($backtrace[$i]); ++$i) {
+                    if (isset($backtrace[$i]['function'], $backtrace[$i]['args'][0])
+                        && ('trigger_error' === $backtrace[$i]['function'] || 'user_error' === $backtrace[$i]['function'])
+                    ) {
+                        if ($backtrace[$i]['args'][0] !== $message) {
+                            $message = $this->parseAnonymousClass($backtrace[$i]['args'][0]);
+                            $logMessage = $this->levels[$type].': '.$message;
+                        }
+
+                        break;
+                    }
+                }
+            }
+
             $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
 
             if ($throw || $this->tracedErrors & $type) {
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
index 8603bf825dec0..e921ea198e26b 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -368,11 +368,12 @@ public function testHandleUserError()
 
     public function testHandleErrorWithAnonymousClass()
     {
+        $anonymousObject = new class() extends \stdClass {
+        };
+
         $handler = ErrorHandler::register();
-        $handler->throwAt(3, true);
         try {
-            $handler->handleError(3, 'foo '.\get_class(new class() extends \stdClass {
-            }).' bar', 'foo.php', 12);
+            trigger_error('foo '.\get_class($anonymousObject).' bar', \E_USER_WARNING);
             $this->fail('Exception expected.');
         } catch (\ErrorException $e) {
         } finally {
@@ -380,10 +381,7 @@ public function testHandleErrorWithAnonymousClass()
             restore_exception_handler();
         }
 
-        $this->assertSame('foo stdClass@anonymous bar', $e->getMessage());
-        $this->assertSame(3, $e->getSeverity());
-        $this->assertSame('foo.php', $e->getFile());
-        $this->assertSame(12, $e->getLine());
+        $this->assertSame('User Warning: foo stdClass@anonymous bar', $e->getMessage());
     }
 
     public function testHandleDeprecation()

From 58e32b3c2a3311e770924f118ccf0ac921c7fd78 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 2 Feb 2021 14:23:37 +0100
Subject: [PATCH 16/87] [ErrorHandler] fix parsing return types in
 DebugClassLoader

---
 phpunit                                                       | 3 ---
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php       | 4 ++--
 .../Core/Tests/Authentication/Token/AbstractTokenTest.php     | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/phpunit b/phpunit
index 9141d249d2695..619ba4674a594 100755
--- a/phpunit
+++ b/phpunit
@@ -16,9 +16,6 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
-    putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
-}
 if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
     putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
 }
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index c9587b482c3e1..e5e6bb7a5b7e8 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -535,7 +535,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             if (null !== (self::INTERNAL_TYPES[$use] ?? null)) {
                 foreach (self::INTERNAL_TYPES[$use] as $method => $returnType) {
                     if ('void' !== $returnType) {
-                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $class, '']];
+                        self::$returnTypes[$class] += [$method => [$returnType, $returnType, $use, '']];
                     }
                 }
             }
@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                     $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                 }
 
-                if (strncmp($ns, $declaringClass, $len)) {
+                if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {
                     if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
                         $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                     } elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
index 17984b86d9cc3..b1e7993de70ae 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -320,12 +320,12 @@ public function getSalt()
         return null;
     }
 
-    public function serialize()
+    public function serialize(): string
     {
         return serialize($this->name);
     }
 
-    public function unserialize($serialized)
+    public function unserialize($serialized): void
     {
         $this->name = unserialize($serialized);
     }

From 025079b051a81b1cb65a2ad20246e46575d31253 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Fri, 29 Jan 2021 10:38:16 +0100
Subject: [PATCH 17/87] Streamline dataproviders

---
 .../Twig/Tests/Extension/HttpFoundationExtensionTest.php      | 4 ++--
 src/Symfony/Component/HttpFoundation/Tests/RequestTest.php    | 2 +-
 src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php  | 4 ++--
 .../Tests/Normalizer/Features/CallbacksTestTrait.php          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
index df9add8afb42b..cb6658e4bbd32 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
@@ -23,7 +23,7 @@
 class HttpFoundationExtensionTest extends TestCase
 {
     /**
-     * @dataProvider getGenerateAbsoluteUrlData()
+     * @dataProvider getGenerateAbsoluteUrlData
      */
     public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
     {
@@ -116,7 +116,7 @@ public function testGenerateAbsoluteUrlWithScriptFileName()
     }
 
     /**
-     * @dataProvider getGenerateRelativePathData()
+     * @dataProvider getGenerateRelativePathData
      */
     public function testGenerateRelativePath($expected, $path, $pathinfo)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 12ce2203e83b3..b90dfd645d796 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -728,7 +728,7 @@ public function testGetUriForPath()
     }
 
     /**
-     * @dataProvider getRelativeUriForPathData()
+     * @dataProvider getRelativeUriForPathData
      */
     public function testGetRelativeUriForPath($expected, $pathinfo, $path)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php b/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
index 758b9c16a8724..7d96f730d7eae 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
@@ -20,7 +20,7 @@
 class UrlHelperTest extends TestCase
 {
     /**
-     * @dataProvider getGenerateAbsoluteUrlData()
+     * @dataProvider getGenerateAbsoluteUrlData
      */
     public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
     {
@@ -113,7 +113,7 @@ public function testGenerateAbsoluteUrlWithScriptFileName()
     }
 
     /**
-     * @dataProvider getGenerateRelativePathData()
+     * @dataProvider getGenerateRelativePathData
      */
     public function testGenerateRelativePath($expected, $path, $pathinfo)
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
index ccb54d9c6fd25..459b01c92408f 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
@@ -29,7 +29,7 @@ public function testCallbacks($callbacks, $valueBar, $result)
     }
 
     /**
-     * @dataProvider provideInvalidCallbacks()
+     * @dataProvider provideInvalidCallbacks
      */
     public function testUncallableCallbacks($callbacks)
     {

From 6a4312deaca79de166a70f93280088360a435b2b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 2 Feb 2021 14:23:37 +0100
Subject: [PATCH 18/87] [PhpUnitBridge] fix reporting deprecations when they
 come from DebugClassLoader

---
 src/Symfony/Bridge/PhpUnit/.gitignore         |   1 -
 .../PhpUnit/DeprecationErrorHandler.php       |  60 +++++----
 .../DeprecationErrorHandler/Deprecation.php   | 123 ++++++++++--------
 .../DeprecationTest.php                       |   9 +-
 .../debug_class_loader_autoload.phpt          |  10 --
 .../symfony/error-handler/.gitkeep            |   0
 .../weak_vendors_on_vendor.phpt               |   8 +-
 .../Bridge/PhpUnit/bin/simple-phpunit.php     |   2 +-
 8 files changed, 114 insertions(+), 99 deletions(-)
 delete mode 100644 src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/symfony/error-handler/.gitkeep

diff --git a/src/Symfony/Bridge/PhpUnit/.gitignore b/src/Symfony/Bridge/PhpUnit/.gitignore
index 9d8c4aadaf9f5..c49a5d8df5c65 100644
--- a/src/Symfony/Bridge/PhpUnit/.gitignore
+++ b/src/Symfony/Bridge/PhpUnit/.gitignore
@@ -1,4 +1,3 @@
 vendor/
 composer.lock
 phpunit.xml
-Tests/DeprecationErrorHandler/fake_vendor/symfony/error-handler/DebugClassLoader.php
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index f2f80453609f9..19c6691dbec3e 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -132,44 +132,48 @@ public function handleError($type, $msg, $file, $line, $context = [])
             return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
         }
 
-        $deprecation = new Deprecation($msg, debug_backtrace(), $file);
+        $trace = debug_backtrace();
+
+        if (isset($trace[1]['function'], $trace[1]['args'][0]) && ('trigger_error' === $trace[1]['function'] || 'user_error' === $trace[1]['function'])) {
+            $msg = $trace[1]['args'][0];
+        }
+
+        $deprecation = new Deprecation($msg, $trace, $file);
         if ($deprecation->isMuted()) {
             return null;
         }
-        $group = 'other';
 
-        if ($deprecation->originatesFromAnObject()) {
-            $class = $deprecation->originatingClass();
-            $method = $deprecation->originatingMethod();
-            $msg = $deprecation->getMessage();
+        $msg = $deprecation->getMessage();
 
-            if (error_reporting() & $type) {
-                $group = 'unsilenced';
-            } elseif ($deprecation->isLegacy()) {
-                $group = 'legacy';
-            } else {
-                $group = [
-                    Deprecation::TYPE_SELF => 'remaining self',
-                    Deprecation::TYPE_DIRECT => 'remaining direct',
-                    Deprecation::TYPE_INDIRECT => 'remaining indirect',
-                    Deprecation::TYPE_UNDETERMINED => 'other',
-                ][$deprecation->getType()];
-            }
+        if (error_reporting() & $type) {
+            $group = 'unsilenced';
+        } elseif ($deprecation->isLegacy()) {
+            $group = 'legacy';
+        } else {
+            $group = [
+                Deprecation::TYPE_SELF => 'remaining self',
+                Deprecation::TYPE_DIRECT => 'remaining direct',
+                Deprecation::TYPE_INDIRECT => 'remaining indirect',
+                Deprecation::TYPE_UNDETERMINED => 'other',
+            ][$deprecation->getType()];
+        }
 
-            if ($this->getConfiguration()->shouldDisplayStackTrace($msg)) {
-                echo "\n".ucfirst($group).' '.$deprecation->toString();
+        if ($this->getConfiguration()->shouldDisplayStackTrace($msg)) {
+            echo "\n".ucfirst($group).' '.$deprecation->toString();
 
-                exit(1);
-            }
-            if ('legacy' !== $group) {
-                $ref = &$this->deprecations[$group][$msg]['count'];
-                ++$ref;
+            exit(1);
+        }
+
+        if ('legacy' !== $group) {
+            $ref = &$this->deprecations[$group][$msg]['count'];
+            ++$ref;
+
+            if ($deprecation->originatesFromAnObject()) {
+                $class = $deprecation->originatingClass();
+                $method = $deprecation->originatingMethod();
                 $ref = &$this->deprecations[$group][$msg][$class.'::'.$method];
                 ++$ref;
             }
-        } else {
-            $ref = &$this->deprecations[$group][$msg]['count'];
-            ++$ref;
         }
 
         ++$this->deprecations[$group.'Count'];
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
index 1ea274045cdb6..ac1a95ef41242 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -55,48 +55,64 @@ class Deprecation
     public function __construct($message, array $trace, $file)
     {
         $this->trace = $trace;
-
-        if ('trigger_error' === (isset($trace[1]['function']) ? $trace[1]['function'] : null)
-            && (DebugClassLoader::class === ($class = (isset($trace[2]['class']) ? $trace[2]['class'] : null)) || LegacyDebugClassLoader::class === $class)
-            && 'checkClass' === (isset($trace[2]['function']) ? $trace[2]['function'] : null)
-            && null !== ($extraFile = (isset($trace[2]['args'][1]) ? $trace[2]['args'][1] : null))
-            && '' !== $extraFile
-            && false !== $extraFile = realpath($extraFile)
-        ) {
-            $this->getOriginalFilesStack();
-            array_splice($this->originalFilesStack, 2, 1, $extraFile);
-        }
-
         $this->message = $message;
+
         $i = \count($trace);
         while (1 < $i && $this->lineShouldBeSkipped($trace[--$i])) {
             // No-op
         }
+
         $line = $trace[$i];
         $this->triggeringFile = $file;
-        if (isset($line['object']) || isset($line['class'])) {
-            if (isset($line['class']) && 0 === strpos($line['class'], SymfonyTestsListenerFor::class)) {
-                set_error_handler(function () {});
-                $parsedMsg = unserialize($this->message);
-                restore_error_handler();
-                $this->message = $parsedMsg['deprecation'];
-                $this->originClass = $parsedMsg['class'];
-                $this->originMethod = $parsedMsg['method'];
-                if (isset($parsedMsg['files_stack'])) {
-                    $this->originalFilesStack = $parsedMsg['files_stack'];
-                }
-                // If the deprecation has been triggered via
-                // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
-                // then we need to use the serialized information to determine
-                // if the error has been triggered from vendor code.
-                if (isset($parsedMsg['triggering_file'])) {
-                    $this->triggeringFile = $parsedMsg['triggering_file'];
+
+        for ($j = 1; $j < $i; ++$j) {
+            if (!isset($trace[$j]['function'], $trace[1 + $j]['class'], $trace[1 + $j]['args'][0])) {
+                continue;
+            }
+
+            if ('trigger_error' === $trace[$j]['function'] && !isset($trace[$j]['class'])) {
+                if (\in_array($trace[1 + $j]['class'], [DebugClassLoader::class, LegacyDebugClassLoader::class], true)) {
+                    $class = $trace[1 + $j]['args'][0];
+                    $this->triggeringFile = isset($trace[1 + $j]['args'][1]) ? realpath($trace[1 + $j]['args'][1]) : (new \ReflectionClass($class))->getFileName();
+                    $this->getOriginalFilesStack();
+                    array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
                 }
 
+                break;
+            }
+        }
+
+        if (isset($line['object']) || isset($line['class'])) {
+            if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
+                $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
+                $this->originMethod = $line['function'];
+
+                return;
+            }
+
+            if ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class'])) {
+                $this->originClass = \get_class($line['args'][0]);
+                $this->originMethod = $line['args'][0]->getName();
+
                 return;
             }
-            $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
-            $this->originMethod = $line['function'];
+
+            set_error_handler(function () {});
+            $parsedMsg = unserialize($this->message);
+            restore_error_handler();
+            $this->message = $parsedMsg['deprecation'];
+            $this->originClass = $parsedMsg['class'];
+            $this->originMethod = $parsedMsg['method'];
+            if (isset($parsedMsg['files_stack'])) {
+                $this->originalFilesStack = $parsedMsg['files_stack'];
+            }
+            // If the deprecation has been triggered via
+            // \Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait::endTest()
+            // then we need to use the serialized information to determine
+            // if the error has been triggered from vendor code.
+            if (isset($parsedMsg['triggering_file'])) {
+                $this->triggeringFile = $parsedMsg['triggering_file'];
+            }
         }
     }
 
@@ -130,7 +146,9 @@ public function originatingClass()
             throw new \LogicException('Check with originatesFromAnObject() before calling this method.');
         }
 
-        return $this->originClass;
+        $class = $this->originClass;
+
+        return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
     }
 
     /**
@@ -158,8 +176,7 @@ public function getMessage()
      */
     public function isLegacy()
     {
-        $class = $this->originatingClass();
-        if ((new \ReflectionClass($class))->isInternal()) {
+        if (!$this->originClass || (new \ReflectionClass($this->originClass))->isInternal()) {
             return false;
         }
 
@@ -168,8 +185,8 @@ public function isLegacy()
         return 0 === strpos($method, 'testLegacy')
             || 0 === strpos($method, 'provideLegacy')
             || 0 === strpos($method, 'getLegacy')
-            || strpos($class, '\Legacy')
-            || \in_array('legacy', Test::getGroups($class, $method), true);
+            || strpos($this->originClass, '\Legacy')
+            || \in_array('legacy', Test::getGroups($this->originClass, $method), true);
     }
 
     /**
@@ -195,11 +212,10 @@ public function isMuted()
      */
     public function getType()
     {
-        $triggeringFilePathType = $this->getPathType($this->triggeringFile);
-        if (self::PATH_TYPE_SELF === $triggeringFilePathType) {
+        if (self::PATH_TYPE_SELF === $pathType = $this->getPathType($this->triggeringFile)) {
             return self::TYPE_SELF;
         }
-        if (self::PATH_TYPE_UNDETERMINED === $triggeringFilePathType) {
+        if (self::PATH_TYPE_UNDETERMINED === $pathType) {
             return self::TYPE_UNDETERMINED;
         }
         $erroringFile = $erroringPackage = null;
@@ -208,10 +224,10 @@ public function getType()
             if ('-' === $file || 'Standard input code' === $file || !realpath($file)) {
                 continue;
             }
-            if (self::PATH_TYPE_SELF === $this->getPathType($file)) {
+            if (self::PATH_TYPE_SELF === $pathType = $this->getPathType($file)) {
                 return self::TYPE_DIRECT;
             }
-            if (self::PATH_TYPE_UNDETERMINED === $this->getPathType($file)) {
+            if (self::PATH_TYPE_UNDETERMINED === $pathType) {
                 return self::TYPE_UNDETERMINED;
             }
             if (null !== $erroringFile && null !== $erroringPackage) {
@@ -233,7 +249,7 @@ private function getOriginalFilesStack()
         if (null === $this->originalFilesStack) {
             $this->originalFilesStack = [];
             foreach ($this->trace as $frame) {
-                if (!isset($frame['file']) || \in_array($frame['function'], ['require', 'require_once', 'include', 'include_once'], true)) {
+                if (!isset($frame['file'], $frame['function']) || (!isset($frame['class']) && \in_array($frame['function'], ['require', 'require_once', 'include', 'include_once'], true))) {
                     continue;
                 }
 
@@ -259,13 +275,10 @@ private function getPackage($path)
                 $relativePath = substr($path, \strlen($vendorRoot) + 1);
                 $vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);
                 if (false === $vendor) {
-                    throw new \RuntimeException(sprintf('Could not find directory separator "%s" in path "%s".', \DIRECTORY_SEPARATOR, $relativePath));
+                    return 'symfony';
                 }
 
-                return rtrim($vendor.'/'.strstr(substr(
-                    $relativePath,
-                    \strlen($vendor) + 1
-                ), \DIRECTORY_SEPARATOR, true), '/');
+                return rtrim($vendor.'/'.strstr(substr($relativePath, \strlen($vendor) + 1), \DIRECTORY_SEPARATOR, true), '/');
             }
         }
 
@@ -279,6 +292,13 @@ private static function getVendors()
     {
         if (null === self::$vendors) {
             self::$vendors = $paths = [];
+            self::$vendors[] = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Legacy';
+            if (class_exists(DebugClassLoader::class, false)) {
+                self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
+            }
+            if (class_exists(LegacyDebugClassLoader::class, false)) {
+                self::$vendors[] = \dirname((new \ReflectionClass(LegacyDebugClassLoader::class))->getFileName());
+            }
             foreach (get_declared_classes() as $class) {
                 if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
@@ -354,10 +374,9 @@ public function toString()
         $reflection->setAccessible(true);
         $reflection->setValue($exception, $this->trace);
 
-        return 'deprecation triggered by '.$this->originatingClass().'::'.$this->originatingMethod().':'.
-        "\n".$this->message.
-        "\nStack trace:".
-        "\n".str_replace(' '.getcwd().\DIRECTORY_SEPARATOR, ' ', $exception->getTraceAsString()).
-        "\n";
+        return ($this->originatesFromAnObject() ? 'deprecation triggered by '.$this->originatingClass().'::'.$this->originatingMethod().":\n" : '')
+            .$this->message."\n"
+            ."Stack trace:\n"
+            .str_replace(' '.getcwd().\DIRECTORY_SEPARATOR, ' ', $exception->getTraceAsString())."\n";
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
index f36c689099ec8..2892e88f7d485 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -183,6 +183,11 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
     public function providerGetTypeUsesRightTrace()
     {
         $vendorDir = self::getVendorDir();
+        $fakeTrace = [
+            ['function' => 'trigger_error'],
+            ['class' => SymfonyTestsListenerTrait::class, 'function' => 'endTest'],
+            ['class' => SymfonyTestsListenerForV5::class, 'function' => 'endTest'],
+        ];
 
         return [
             'no_file_in_stack' => [Deprecation::TYPE_DIRECT, '', [['function' => 'myfunc1'], ['function' => 'myfunc2']]],
@@ -205,7 +210,7 @@ public function providerGetTypeUsesRightTrace()
                         $vendorDir.'/myfakevendor/myfakepackage1/MyFakeFile2.php',
                     ],
                 ]),
-                [['function' => 'myfunc1'], ['class' => SymfonyTestsListenerForV5::class, 'method' => 'mymethod']],
+                $fakeTrace,
             ],
             'serialized_stack_files_from_various_packages' => [
                 Deprecation::TYPE_INDIRECT,
@@ -218,7 +223,7 @@ public function providerGetTypeUsesRightTrace()
                         $vendorDir.'/myfakevendor/myfakepackage2/MyFakeFile.php',
                     ],
                 ]),
-                [['function' => 'myfunc1'], ['class' => SymfonyTestsListenerForV5::class, 'method' => 'mymethod']],
+                $fakeTrace,
             ],
         ];
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
index 781027e84fe66..04e64d33e46b6 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/debug_class_loader_autoload.phpt
@@ -30,16 +30,6 @@ EOPHP
 );
 require __DIR__.'/fake_vendor/autoload.php';
 
-// We need the real DebugClassLoader FQCN but in a vendor path.
-if (!file_exists($errorHandlerRootDir = __DIR__.'/../../../../Component/ErrorHandler')) {
-    if (!file_exists($errorHandlerRootDir = __DIR__.'/../../vendor/symfony/error-handler')) {
-        die('Could not find the ErrorHandler component root directory.');
-    }
-}
-
-file_put_contents($fakeDebugClassLoadPath = __DIR__.'/fake_vendor/symfony/error-handler/DebugClassLoader.php', file_get_contents($errorHandlerRootDir.'/DebugClassLoader.php'));
-require $fakeDebugClassLoadPath;
-
 \Symfony\Component\ErrorHandler\DebugClassLoader::enable();
 new \App\Services\BarService();
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/symfony/error-handler/.gitkeep b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/symfony/error-handler/.gitkeep
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
index 174e2ba89b54e..c9b323f6d5ad1 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
@@ -29,13 +29,11 @@ Unsilenced deprecation notices (3)
   1x: unsilenced bar deprecation
     1x in FooTestCase::testNonLegacyBar
 
-Remaining direct deprecation notices (1)
+Remaining direct deprecation notices (2)
+
+  1x: root deprecation
 
   1x: silenced bar deprecation
     1x in FooTestCase::testNonLegacyBar
 
 Legacy deprecation notices (2)
-
-Other deprecation notices (1)
-
-  1x: root deprecation
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
index 648c9523dcf39..cb1f36f9ce73c 100644
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -10,7 +10,7 @@
  */
 
 // Please update when phpunit needs to be reinstalled with fresh deps:
-// Cache-Id: 2020-01-31 10:00 UTC
+// Cache-Id: 2021-02-04 11:00 UTC
 
 error_reporting(-1);
 

From 58bb614abdb34a4f7fa2bae559b2a7f5b484828e Mon Sep 17 00:00:00 2001
From: wickedOne <wicliff.wolda@gmail.com>
Date: Thu, 4 Feb 2021 09:25:29 +0100
Subject: [PATCH 19/87] [SecurityBundle] role_names variable instead of roles

replaced the roles variable with role_names in order to fix cache warming

fixes #40087
---
 .../SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php      | 2 +-
 .../Tests/CacheWarmer/ExpressionCacheWarmerTest.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php b/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php
index 938b28dcb637b..130cdfbb11e7f 100644
--- a/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php
+++ b/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php
@@ -37,7 +37,7 @@ public function isOptional()
     public function warmUp($cacheDir)
     {
         foreach ($this->expressions as $expression) {
-            $this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']);
+            $this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'roles', 'role_names', 'request', 'trust_resolver']);
         }
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/CacheWarmer/ExpressionCacheWarmerTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/CacheWarmer/ExpressionCacheWarmerTest.php
index d1299bffed611..9143db38edffd 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/CacheWarmer/ExpressionCacheWarmerTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/CacheWarmer/ExpressionCacheWarmerTest.php
@@ -26,8 +26,8 @@ public function testWarmUp()
         $expressionLang->expects($this->exactly(2))
             ->method('parse')
             ->withConsecutive(
-                [$expressions[0], ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']],
-                [$expressions[1], ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']]
+                [$expressions[0], ['token', 'user', 'object', 'subject', 'roles', 'role_names', 'request', 'trust_resolver']],
+                [$expressions[1], ['token', 'user', 'object', 'subject', 'roles', 'role_names', 'request', 'trust_resolver']]
             );
 
         (new ExpressionCacheWarmer($expressions, $expressionLang))->warmUp('');

From 60dac0cb4c625905ad06dc64e504d354f80fccb5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 4 Feb 2021 18:21:43 +0100
Subject: [PATCH 20/87] [DeprecationErrorHandler] Fix tests

---
 .../PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
index 2892e88f7d485..9cb0a0e32ce3a 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -174,6 +174,8 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
     {
         $trace = [
             ['class' => 'MyClass1', 'function' => 'myMethod'],
+            ['function' => 'trigger_error'],
+            ['class' => SymfonyTestsListenerTrait::class, 'function' => 'endTest'],
             ['class' => $traceClass, 'function' => 'myMethod'],
         ];
         $deprecation = new Deprecation($message, $trace, $file);

From 00d3a0ffcb3154ca904e2800627bc367ad097128 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 4 Feb 2021 18:25:29 +0100
Subject: [PATCH 21/87] Allow psr/cache v2

---
 composer.json                                  | 2 +-
 src/Symfony/Component/Cache/composer.json      | 4 ++--
 src/Symfony/Component/HttpKernel/composer.json | 2 +-
 src/Symfony/Component/Messenger/composer.json  | 2 +-
 src/Symfony/Contracts/Cache/composer.json      | 2 +-
 src/Symfony/Contracts/composer.json            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index e12e14c163dea..64ebe0318582d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "^1.3|^2",
         "twig/twig": "^1.43|^2.13|^3.0.4",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
         "psr/log": "~1.0",
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index b812a8eb8c03c..63f4c2ee168cf 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -16,13 +16,13 @@
         }
     ],
     "provide": {
-        "psr/cache-implementation": "1.0",
+        "psr/cache-implementation": "1.0|2.0",
         "psr/simple-cache-implementation": "1.0",
         "symfony/cache-implementation": "1.0"
     },
     "require": {
         "php": ">=7.1.3",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/log": "~1.0",
         "symfony/cache-contracts": "^1.1.7|^2",
         "symfony/service-contracts": "^1.1|^2",
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 0094dc575f745..61325cb0a097d 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -41,7 +41,7 @@
         "symfony/templating": "^3.4|^4.0|^5.0",
         "symfony/translation": "^4.2|^5.0",
         "symfony/translation-contracts": "^1.1|^2",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "twig/twig": "^1.43|^2.13|^3.0.4"
     },
     "provide": {
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index ce111728ed58a..2668fdd8b0fe9 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "doctrine/dbal": "^2.6|^3.0",
         "doctrine/persistence": "^1.3|^2",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "symfony/console": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",
         "symfony/event-dispatcher": "^4.3|^5.0",
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index dc2b77146c525..351cdae0c8d00 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "psr/cache": "^1.0"
+        "psr/cache": "^1.0|^2.0"
     },
     "suggest": {
         "symfony/cache-implementation": ""
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index 62b123dc6bed4..bbd5871507eb4 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "psr/cache": "^1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/container": "^1.0"
     },
     "require-dev": {

From eb14a1e1f0651a7509ca6f534d21d8fab6023a23 Mon Sep 17 00:00:00 2001
From: ddegentesh <ddegentesh@daed.com>
Date: Tue, 26 Jan 2021 10:36:25 -0500
Subject: [PATCH 22/87] [Mailer][Mime] Update inline part names with newly
 generated ContentId

---
 src/Symfony/Component/Mime/Email.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
index fa01e39d243e2..940cf489c0049 100644
--- a/src/Symfony/Component/Mime/Email.php
+++ b/src/Symfony/Component/Mime/Email.php
@@ -491,6 +491,7 @@ private function prepareParts(): ?array
                 $attachment['inline'] = true;
                 $inlineParts[$name] = $part = $this->createDataPart($attachment);
                 $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html);
+                $part->setName($part->getContentId());
                 continue 2;
             }
             $attachmentParts[] = $this->createDataPart($attachment);

From 41c77965523a0ced8c07e5897080260f4d53a4e0 Mon Sep 17 00:00:00 2001
From: Antoine Makdessi <antoine.makdessi@agriconomie.com>
Date: Fri, 5 Feb 2021 09:35:14 +0100
Subject: [PATCH 23/87] Update PULL_REQUEST_TEMPLATE.md

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

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2b27d887c2f74..d085ea2e2fd6d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,4 +17,5 @@ Additionally (see https://symfony.com/releases):
  - Bug fixes must be submitted against the lowest maintained branch where they apply
    (lowest branches are regularly merged to upper ones so they get the fixes too.)
  - Features and deprecations must be submitted against branch 5.x.
+ - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
 -->

From b7100b6909ec9b645fee7c69c5e34e69f90d1669 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 5 Feb 2021 14:33:05 +0100
Subject: [PATCH 24/87] [HttpKernel] [Kernel] Silence deprecations logs writes

---
 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 f2b1966ea5aa7..15a37cf58b4d6 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -598,8 +598,8 @@ protected function initializeContainer()
             if ($collectDeprecations) {
                 restore_error_handler();
 
-                file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
-                file_put_contents($cacheDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
+                @file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
+                @file_put_contents($cacheDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
             }
         }
 

From c28ba9a959dfa363530baf5222c8ff041921d2a3 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Fri, 5 Feb 2021 15:36:10 +0100
Subject: [PATCH 25/87] Remove EOLed 5.1 branch 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 d085ea2e2fd6d..d4182db630352 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 5.x for features / 4.4, 5.1 or 5.2 for bug fixes <!-- see below -->
+| Branch?       | 5.x for features / 4.4 or 5.2 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 6867475447b3959617c0f8a5bd9a9bd3801d445d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 4 Feb 2021 19:45:20 +0100
Subject: [PATCH 26/87] [DI] fix tracking of changes to vendor/ dirs

---
 .../Component/DependencyInjection/ContainerBuilder.php |  6 +++---
 .../DependencyInjection/Tests/ContainerBuilderTest.php | 10 ++++------
 .../Tests/Loader/GlobFileLoaderTest.php                |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 57e796384649a..18f883039c26b 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1655,14 +1655,14 @@ private function getExpressionLanguage(): ExpressionLanguage
     private function inVendors(string $path): bool
     {
         if (null === $this->vendors) {
-            $resource = new ComposerResource();
-            $this->vendors = $resource->getVendors();
-            $this->addResource($resource);
+            $this->vendors = (new ComposerResource())->getVendors();
         }
         $path = realpath($path) ?: $path;
 
         foreach ($this->vendors as $vendor) {
             if (0 === strpos($path, $vendor) && false !== strpbrk(substr($path, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
+                $this->addResource(new FileResource($vendor.'/composer/installed.json'));
+
                 return true;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 8a3f229818703..78a8edd1f0057 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -17,7 +17,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
-use Symfony\Component\Config\Resource\ComposerResource;
 use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Resource\ResourceInterface;
@@ -929,7 +928,7 @@ public function testAddObjectResource()
 
         $resources = $container->getResources();
 
-        $this->assertCount(2, $resources, '2 resources were registered');
+        $this->assertCount(1, $resources);
 
         /* @var $resource \Symfony\Component\Config\Resource\FileResource */
         $resource = end($resources);
@@ -958,9 +957,9 @@ public function testGetReflectionClass()
 
         $resources = $container->getResources();
 
-        $this->assertCount(3, $resources, '3 resources were registered');
+        $this->assertCount(2, $resources);
 
-        $this->assertSame('reflection.BarClass', (string) $resources[1]);
+        $this->assertSame('reflection.BarClass', (string) $resources[0]);
         $this->assertSame('BarMissingClass', (string) end($resources));
     }
 
@@ -1021,7 +1020,6 @@ public function testResources()
     public function testFileExists()
     {
         $container = new ContainerBuilder();
-        $A = new ComposerResource();
         $a = new FileResource(__DIR__.'/Fixtures/xml/services1.xml');
         $b = new FileResource(__DIR__.'/Fixtures/xml/services2.xml');
         $c = new DirectoryResource($dir = \dirname($b));
@@ -1035,7 +1033,7 @@ public function testFileExists()
             }
         }
 
-        $this->assertEquals([$A, $a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
+        $this->assertEquals([$a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
     }
 
     public function testExtension()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
index 4027087e8b724..29346742bd893 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
@@ -32,7 +32,7 @@ public function testLoadAddsTheGlobResourceToTheContainer()
         $loader = new GlobFileLoaderWithoutImport($container = new ContainerBuilder(), new FileLocator());
         $loader->load(__DIR__.'/../Fixtures/config/*');
 
-        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[1]);
+        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[0]);
     }
 }
 

From bf23c44a0795ff7ca745577be58aaed7642b1185 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 5 Feb 2021 16:46:45 +0100
Subject: [PATCH 27/87] Allow psr/cache v3 but on symfony/cache

---
 src/Symfony/Component/HttpKernel/composer.json | 2 +-
 src/Symfony/Component/Messenger/composer.json  | 2 +-
 src/Symfony/Contracts/Cache/composer.json      | 2 +-
 src/Symfony/Contracts/composer.json            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 61325cb0a097d..a2fa2a0ecac5d 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -41,7 +41,7 @@
         "symfony/templating": "^3.4|^4.0|^5.0",
         "symfony/translation": "^4.2|^5.0",
         "symfony/translation-contracts": "^1.1|^2",
-        "psr/cache": "^1.0|^2.0",
+        "psr/cache": "^1.0|^2.0|^3.0",
         "twig/twig": "^1.43|^2.13|^3.0.4"
     },
     "provide": {
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 2668fdd8b0fe9..df2876be457f0 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "doctrine/dbal": "^2.6|^3.0",
         "doctrine/persistence": "^1.3|^2",
-        "psr/cache": "^1.0|^2.0",
+        "psr/cache": "^1.0|^2.0|^3.0",
         "symfony/console": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",
         "symfony/event-dispatcher": "^4.3|^5.0",
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index 351cdae0c8d00..b77a03dacca8d 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "psr/cache": "^1.0|^2.0"
+        "psr/cache": "^1.0|^2.0|^3.0"
     },
     "suggest": {
         "symfony/cache-implementation": ""
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index bbd5871507eb4..4cd9ebda23548 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "psr/cache": "^1.0|^2.0",
+        "psr/cache": "^1.0|^2.0|^3.0",
         "psr/container": "^1.0"
     },
     "require-dev": {

From 7117e1a798f396f288635f93a66d30bf8a387784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Sat, 30 Jan 2021 17:17:32 +0100
Subject: [PATCH 28/87] Use a lazyintertor to close files descriptors when no
 longer used

---
 src/Symfony/Component/Finder/Finder.php       |  5 +-
 .../Finder/Iterator/LazyIterator.php          | 30 +++++++++++
 .../Tests/Iterator/LazyIteratorTest.php       | 53 +++++++++++++++++++
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Finder/Iterator/LazyIterator.php
 create mode 100644 src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php

diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 82c2ec78dc5f3..87fc187b2f401 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Finder\Iterator\ExcludeDirectoryFilterIterator;
 use Symfony\Component\Finder\Iterator\FilecontentFilterIterator;
 use Symfony\Component\Finder\Iterator\FilenameFilterIterator;
+use Symfony\Component\Finder\Iterator\LazyIterator;
 use Symfony\Component\Finder\Iterator\SizeRangeFilterIterator;
 use Symfony\Component\Finder\Iterator\SortableIterator;
 
@@ -635,7 +636,9 @@ public function getIterator()
 
         $iterator = new \AppendIterator();
         foreach ($this->dirs as $dir) {
-            $iterator->append($this->searchInDirectory($dir));
+            $iterator->append(new \IteratorIterator(new LazyIterator(function () use ($dir) {
+                return $this->searchInDirectory($dir);
+            })));
         }
 
         foreach ($this->iterators as $it) {
diff --git a/src/Symfony/Component/Finder/Iterator/LazyIterator.php b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
new file mode 100644
index 0000000000000..4388f4f3fd0e8
--- /dev/null
+++ b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
@@ -0,0 +1,30 @@
+<?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\Finder\Iterator;
+
+/**
+ * @author Jérémy Derussé <jeremy@derusse.com>
+ */
+class LazyIterator implements \IteratorAggregate
+{
+    private $iteratorFactory;
+
+    public function __construct(callable $iteratorFactory)
+    {
+        $this->iteratorFactory = $iteratorFactory;
+    }
+
+    public function getIterator()
+    {
+        yield from ($this->iteratorFactory)();
+    }
+}
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php
new file mode 100644
index 0000000000000..1a96c32d0b787
--- /dev/null
+++ b/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php
@@ -0,0 +1,53 @@
+<?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\Finder\Tests\Iterator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Finder\Iterator\LazyIterator;
+
+class LazyIteratorTest extends TestCase
+{
+    public function testLazy()
+    {
+        new LazyIterator(function () {
+            $this->markTestFailed('lazyIterator should not be called');
+        });
+
+        $this->expectNotToPerformAssertions();
+    }
+
+    public function testDelegate()
+    {
+        $iterator = new LazyIterator(function () {
+            return new Iterator(['foo', 'bar']);
+        });
+
+        $this->assertCount(2, $iterator);
+    }
+
+    public function testInnerDestructedAtTheEnd()
+    {
+        $count = 0;
+        $iterator = new LazyIterator(function () use (&$count) {
+            ++$count;
+
+            return new Iterator(['foo', 'bar']);
+        });
+
+        foreach ($iterator as $x) {
+        }
+        $this->assertSame(1, $count);
+        foreach ($iterator as $x) {
+        }
+        $this->assertSame(2, $count);
+    }
+}

From 57d9a818bbebb86b984add7cc7076b7b556f584e Mon Sep 17 00:00:00 2001
From: Simon Berger <simon_-berger@web.de>
Date: Thu, 4 Feb 2021 00:23:52 +0100
Subject: [PATCH 29/87] Provide implemented packages of replaced dependencies

---
 composer.json                             | 16 ++++++++++++++++
 src/Symfony/Component/Cache/composer.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 64ebe0318582d..17743a6f1dcd6 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,22 @@
             "homepage": "https://symfony.com/contributors"
         }
     ],
+    "provide": {
+        "php-http/async-client-implementation": "*",
+        "php-http/client-implementation": "*",
+        "psr/cache-implementation": "1.0|2.0",
+        "psr/container-implementation": "1.0",
+        "psr/event-dispatcher-implementation": "1.0",
+        "psr/http-client-implementation": "1.0",
+        "psr/link-implementation": "1.0",
+        "psr/log-implementation": "1.0",
+        "psr/simple-cache-implementation": "1.0",
+        "symfony/cache-implementation": "1.0|2.0",
+        "symfony/event-dispatcher-implementation": "1.1",
+        "symfony/http-client-implementation": "1.1",
+        "symfony/service-implementation": "1.0",
+        "symfony/translation-implementation": "1.0"
+    },
     "require": {
         "php": ">=7.1.3",
         "ext-xml": "*",
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index 63f4c2ee168cf..87a26071a6634 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -18,7 +18,7 @@
     "provide": {
         "psr/cache-implementation": "1.0|2.0",
         "psr/simple-cache-implementation": "1.0",
-        "symfony/cache-implementation": "1.0"
+        "symfony/cache-implementation": "1.0|2.0"
     },
     "require": {
         "php": ">=7.1.3",

From 36e5051171a1e4d274df0da366cc7344594fc819 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 6 Feb 2021 09:54:26 +0100
Subject: [PATCH 30/87] Fix "provide" declarations

---
 composer.json                                           | 6 +++---
 src/Symfony/Component/DependencyInjection/composer.json | 2 +-
 src/Symfony/Component/HttpClient/composer.json          | 2 +-
 src/Symfony/Component/Translation/composer.json         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 17743a6f1dcd6..63108b1e132e9 100644
--- a/composer.json
+++ b/composer.json
@@ -27,9 +27,9 @@
         "psr/simple-cache-implementation": "1.0",
         "symfony/cache-implementation": "1.0|2.0",
         "symfony/event-dispatcher-implementation": "1.1",
-        "symfony/http-client-implementation": "1.1",
-        "symfony/service-implementation": "1.0",
-        "symfony/translation-implementation": "1.0"
+        "symfony/http-client-implementation": "1.1|2.0",
+        "symfony/service-implementation": "1.0|2.0",
+        "symfony/translation-implementation": "1.0|2.0"
     },
     "require": {
         "php": ">=7.1.3",
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 4000cb49939f4..deb1b2711d04b 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -40,7 +40,7 @@
     },
     "provide": {
         "psr/container-implementation": "1.0",
-        "symfony/service-implementation": "1.0"
+        "symfony/service-implementation": "1.0|2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" },
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
index b66b184c0e4e5..a6209060a5548 100644
--- a/src/Symfony/Component/HttpClient/composer.json
+++ b/src/Symfony/Component/HttpClient/composer.json
@@ -18,7 +18,7 @@
         "php-http/async-client-implementation": "*",
         "php-http/client-implementation": "*",
         "psr/http-client-implementation": "1.0",
-        "symfony/http-client-implementation": "1.1"
+        "symfony/http-client-implementation": "1.1|2.0"
     },
     "require": {
         "php": ">=7.1.3",
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index e58a7beecf0a3..fbc084666e8c6 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -38,7 +38,7 @@
         "symfony/yaml": "<3.4"
     },
     "provide": {
-        "symfony/translation-implementation": "1.0"
+        "symfony/translation-implementation": "1.0|2.0"
     },
     "suggest": {
         "symfony/config": "",

From 8389310983f821ca2fa58dd80cb18a7aa8211706 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sat, 6 Feb 2021 13:35:05 +0100
Subject: [PATCH 31/87] scan directories for translations sequentially

---
 .../FrameworkExtension.php                    | 34 ++++++++++---------
 .../FrameworkExtensionTest.php                | 13 +++++++
 .../translations/security.en.yaml             |  0
 .../Bundle/FrameworkBundle/composer.json      |  1 +
 4 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/security.en.yaml

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 06069cae5b634..31a3f58b0bc34 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1236,24 +1236,26 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         // Register translation resources
         if ($dirs) {
             $files = [];
-            $finder = Finder::create()
-                ->followLinks()
-                ->files()
-                ->filter(function (\SplFileInfo $file) {
-                    return 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
-                })
-                ->in($dirs)
-                ->sortByName()
-            ;
 
-            foreach ($finder as $file) {
-                $fileNameParts = explode('.', basename($file));
-                $locale = $fileNameParts[\count($fileNameParts) - 2];
-                if (!isset($files[$locale])) {
-                    $files[$locale] = [];
-                }
+            foreach ($dirs as $dir) {
+                $finder = Finder::create()
+                    ->followLinks()
+                    ->files()
+                    ->filter(function (\SplFileInfo $file) {
+                        return 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
+                    })
+                    ->in($dir)
+                    ->sortByName()
+                ;
+                foreach ($finder as $file) {
+                    $fileNameParts = explode('.', basename($file));
+                    $locale = $fileNameParts[\count($fileNameParts) - 2];
+                    if (!isset($files[$locale])) {
+                        $files[$locale] = [];
+                    }
 
-                $files[$locale][] = (string) $file;
+                    $files[$locale][] = (string) $file;
+                }
             }
 
             $projectDir = $container->getParameter('kernel.project_dir');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index de4875653340e..7bc3edbfb859f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -877,6 +877,19 @@ public function testTranslator()
             $files,
             '->registerTranslatorConfiguration() finds translation resources with dots in domain'
         );
+        $this->assertContains(strtr(__DIR__.'/translations/security.en.yaml', '/', \DIRECTORY_SEPARATOR), $files);
+
+        $positionOverridingTranslationFile = array_search(strtr(realpath(__DIR__.'/translations/security.en.yaml'), '/', \DIRECTORY_SEPARATOR), $files);
+
+        if (false !== $positionCoreTranslationFile = array_search(strtr(realpath(__DIR__.'/../../../../Component/Security/Core/Resources/translations/security.en.xlf'), '/', \DIRECTORY_SEPARATOR), $files)) {
+            $this->assertContains(strtr(realpath(__DIR__.'/../../../../Component/Security/Core/Resources/translations/security.en.xlf'), '/', \DIRECTORY_SEPARATOR), $files);
+        } else {
+            $this->assertContains(strtr(realpath(__DIR__.'/../../vendor/symfony/security-core/Resources/translations/security.en.xlf'), '/', \DIRECTORY_SEPARATOR), $files);
+
+            $positionCoreTranslationFile = array_search(strtr(realpath(__DIR__.'/../../vendor/symfony/security-core/Resources/translations/security.en.xlf'), '/', \DIRECTORY_SEPARATOR), $files);
+        }
+
+        $this->assertGreaterThan($positionCoreTranslationFile, $positionOverridingTranslationFile);
 
         $calls = $container->getDefinition('translator.default')->getMethodCalls();
         $this->assertEquals(['fr'], $calls[1][1][0]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/security.en.yaml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/security.en.yaml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 72baafd8fdfb8..f592065b28cd7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -49,6 +49,7 @@
         "symfony/messenger": "^4.4|^5.0",
         "symfony/mime": "^4.4|^5.0",
         "symfony/process": "^3.4|^4.0|^5.0",
+        "symfony/security-core": "^3.4|^4.4|^5.2",
         "symfony/security-csrf": "^3.4|^4.0|^5.0",
         "symfony/security-http": "^3.4|^4.0|^5.0",
         "symfony/serializer": "^4.4|^5.0",

From 5dbc7db04a50c65b9f980d18d3c4032ad9a56714 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Tue, 9 Feb 2021 08:45:33 +0100
Subject: [PATCH 32/87] Add some information about the username in CONTRIBUTORS

---
 CONTRIBUTORS.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5b8efba4073b3..b64aa797a5b14 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,8 +1,11 @@
 CONTRIBUTORS
 ============
 
-Symfony is the result of the work of many people who made the code better
-(see https://symfony.com/contributors for more information):
+Symfony is the result of the work of many people who made the code better.
+
+The Symfony Connect username in parenthesis allows to get more information
+about contributors (like https://connect.symfony.com/profile/fabpot). See
+https://symfony.com/contributors for more information.
 
  - Fabien Potencier (fabpot)
  - Nicolas Grekas (nicolas-grekas)

From e196c1ecb361a5e65d5c8a9bf25a3b13184aaee8 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 9 Feb 2021 09:55:59 +0100
Subject: [PATCH 33/87] [FrameworkBundle] fix registering "annotations.cache"
 on the "container.hot_path"

---
 .../Bundle/FrameworkBundle/Resources/config/annotations.xml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 0ce6bf6594e31..69947a35f8df4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -48,6 +48,7 @@
                     <argument type="service" id="cache.annotations" />
                 </service>
             </argument>
+            <tag name="container.hot_path" />
         </service>
 
         <service id="annotation_reader" alias="annotations.reader" />

From af6db0cfafe133383fa360c47a58c2ed207fac43 Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Wed, 27 Jan 2021 22:59:52 +0100
Subject: [PATCH 34/87] [FrameworkBundle] Fix freshness checks with boolean
 parameters on routes

---
 .../Bundle/FrameworkBundle/Routing/Router.php | 14 +++---
 .../Routing/Fixtures/with_condition.yaml      |  3 ++
 .../Tests/Routing/RouterTest.php              | 50 +++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Fixtures/with_condition.yaml

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
index cf2eadbd51cbd..89e8f77aee640 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -178,14 +178,16 @@ private function resolve($value)
 
             $resolved = ($this->paramFetcher)($match[1]);
 
-            if (\is_bool($resolved)) {
-                $resolved = (string) (int) $resolved;
-            }
-
-            if (\is_string($resolved) || is_numeric($resolved)) {
+            if (is_scalar($resolved)) {
                 $this->collectedParameters[$match[1]] = $resolved;
 
-                return (string) $this->resolve($resolved);
+                if (\is_string($resolved)) {
+                    $resolved = $this->resolve($resolved);
+                }
+
+                if (is_scalar($resolved)) {
+                    return false === $resolved ? '0' : (string) $resolved;
+                }
             }
 
             throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, \gettype($resolved)));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Fixtures/with_condition.yaml b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Fixtures/with_condition.yaml
new file mode 100644
index 0000000000000..c97edc1a42542
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/Fixtures/with_condition.yaml
@@ -0,0 +1,3 @@
+foo:
+    path: /foo
+    condition: '%parameter.condition%'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
index ca66001ed9fa1..9a96fb0f7436a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
@@ -14,11 +14,16 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\ResourceCheckerConfigCache;
+use Symfony\Component\Config\ResourceCheckerConfigCacheFactory;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
+use Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -503,6 +508,51 @@ public function getNonStringValues()
         return [[null], [false], [true], [new \stdClass()], [['foo', 'bar']], [[[]]]];
     }
 
+    /**
+     * @dataProvider getContainerParameterForRoute
+     */
+    public function testCacheValiditiyWithContainerParameters($parameter)
+    {
+        $cacheDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('router_', true);
+
+        try {
+            $container = new Container();
+            $container->set('routing.loader', new YamlFileLoader(new FileLocator(__DIR__.'/Fixtures')));
+
+            $container->setParameter('parameter.condition', $parameter);
+
+            $router = new Router($container, 'with_condition.yaml', [
+                'debug' => true,
+                'cache_dir' => $cacheDir,
+            ]);
+
+            $resourceCheckers = [
+                new ContainerParametersResourceChecker($container),
+            ];
+
+            $router->setConfigCacheFactory(new ResourceCheckerConfigCacheFactory($resourceCheckers));
+
+            $router->getMatcher(); // trigger cache build
+
+            $cache = new ResourceCheckerConfigCache($cacheDir.\DIRECTORY_SEPARATOR.'UrlMatcher.php', $resourceCheckers);
+
+            $this->assertTrue($cache->isFresh());
+        } finally {
+            if (is_dir($cacheDir)) {
+                array_map('unlink', glob($cacheDir.\DIRECTORY_SEPARATOR.'*'));
+                rmdir($cacheDir);
+            }
+        }
+    }
+
+    public function getContainerParameterForRoute()
+    {
+        yield 'String' => ['"foo"'];
+        yield 'Integer' => [0];
+        yield 'Boolean true' => [true];
+        yield 'Boolean false' => [false];
+    }
+
     private function getServiceContainer(RouteCollection $routes): Container
     {
         $loader = $this->createMock(LoaderInterface::class);

From db66fb58389d07b99d3e5f576592b2fd8f702d37 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 10 Feb 2021 18:16:49 +0100
Subject: [PATCH 35/87] [HttpKernel] fix transient test

---
 src/Symfony/Component/HttpKernel/Tests/KernelTest.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 9e48e4274e40d..63fb4973f6566 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -35,8 +36,10 @@ class KernelTest extends TestCase
 {
     protected function tearDown(): void
     {
-        $fs = new Filesystem();
-        $fs->remove(__DIR__.'/Fixtures/var');
+        try {
+            (new Filesystem())->remove(__DIR__.'/Fixtures/var');
+        } catch (IOException $e) {
+        }
     }
 
     public function testConstructor()
@@ -586,7 +589,7 @@ public function testProjectDirExtension()
 
     public function testKernelReset()
     {
-        (new Filesystem())->remove(__DIR__.'/Fixtures/var/cache');
+        $this->tearDown();
 
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();

From 7c86c1d5931b7cb44795cce3e6eb99e67a62535d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 10 Feb 2021 19:00:01 +0100
Subject: [PATCH 36/87] fix test

---
 .../Bundle/FrameworkBundle/Tests/Routing/RouterTest.php   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
index 9a96fb0f7436a..3e6c5bf6c602e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
@@ -511,7 +511,7 @@ public function getNonStringValues()
     /**
      * @dataProvider getContainerParameterForRoute
      */
-    public function testCacheValiditiyWithContainerParameters($parameter)
+    public function testCacheValidityWithContainerParameters($parameter)
     {
         $cacheDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('router_', true);
 
@@ -534,7 +534,11 @@ public function testCacheValiditiyWithContainerParameters($parameter)
 
             $router->getMatcher(); // trigger cache build
 
-            $cache = new ResourceCheckerConfigCache($cacheDir.\DIRECTORY_SEPARATOR.'UrlMatcher.php', $resourceCheckers);
+            $cache = new ResourceCheckerConfigCache($cacheDir.\DIRECTORY_SEPARATOR.'url_matching_routes.php', $resourceCheckers);
+
+            if (!$cache->isFresh()) {
+                $cache = new ResourceCheckerConfigCache($cacheDir.\DIRECTORY_SEPARATOR.'UrlMatcher.php', $resourceCheckers);
+            }
 
             $this->assertTrue($cache->isFresh());
         } finally {

From 01ac9b1990f9979412e94457fb204af7c3d3c55f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 10 Feb 2021 22:38:35 +0100
Subject: [PATCH 37/87] Re-enable triggering deprecations about return types

---
 phpunit | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpunit b/phpunit
index 619ba4674a594..1cb49096f4204 100755
--- a/phpunit
+++ b/phpunit
@@ -16,6 +16,9 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') && \PHP_VERSION_ID >= 70200) {
+    putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
+}
 if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
     putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
 }

From de2f22086ee663618fb727db02821c5f663f1cba Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 11 Feb 2021 09:19:35 +0100
Subject: [PATCH 38/87] Skip checking return types on PHP <= 7.2

---
 phpunit                                                 | 2 +-
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit b/phpunit
index 1cb49096f4204..3a18c4c782e1e 100755
--- a/phpunit
+++ b/phpunit
@@ -16,7 +16,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         putenv('SYMFONY_PHPUNIT_VERSION=9.5');
     }
 }
-if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') && \PHP_VERSION_ID >= 70200) {
+if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') && \PHP_VERSION_ID >= 70300) {
     putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
 }
 if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index e5e6bb7a5b7e8..9938ff71865e7 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -612,7 +612,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                     $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                 }
 
-                if (false === strpos($doc, '@deprecated') && strncmp($ns, $declaringClass, $len)) {
+                if (false === strpos($doc, '* @deprecated') && strncmp($ns, $declaringClass, $len)) {
                     if ($canAddReturnType && 'docblock' === $this->patchTypes['force'] && false === strpos($method->getFileName(), \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR)) {
                         $this->patchMethod($method, $returnType, $declaringFile, $normalizedType);
                     } elseif ('' !== $declaringClass && $this->patchTypes['deprecations']) {

From b0267e6dcf603397218d3bc49a9ff031cb5aec06 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 11 Feb 2021 10:33:17 +0100
Subject: [PATCH 39/87] Fix transient test

---
 .../Command/CacheClearCommand/CacheClearCommandTest.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index 4b557011a9d26..27f2973d82c3d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
@@ -37,7 +38,10 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->fs->remove($this->kernel->getProjectDir());
+        try {
+            $this->fs->remove($this->kernel->getProjectDir());
+        } catch (IOException $e) {
+        }
     }
 
     public function testCacheIsFreshAfterCacheClearedWithWarmup()

From b22562f97592afe2c7d7cd363be5985c8680283c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 11 Feb 2021 13:34:09 +0100
Subject: [PATCH 40/87] [Contracts] fix branch-aliases

---
 src/Symfony/Contracts/Cache/composer.json           | 8 +++-----
 src/Symfony/Contracts/EventDispatcher/composer.json | 8 +++-----
 src/Symfony/Contracts/HttpClient/composer.json      | 8 +++-----
 src/Symfony/Contracts/Service/composer.json         | 8 +++-----
 src/Symfony/Contracts/Translation/composer.json     | 8 +++-----
 5 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index b77a03dacca8d..7d0735e309ea9 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index 0d14e98fea41a..9d4bd7bea7ab9 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index b56709738b83e..2464d081750dd 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -26,14 +26,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index 8134ba6b88fba..e3bf920ca23e5 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 8fd0d88df7ed8..8fe4b20949830 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -26,14 +26,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }

From 5b536131f720e5df8fca42a93a17d1169efd55f8 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 11 Feb 2021 20:34:41 +0100
Subject: [PATCH 41/87] Modernize func_get_args() calls to variadic parameters

---
 .../Component/ExpressionLanguage/ExpressionFunction.php   | 8 ++++----
 src/Symfony/Component/Filesystem/Filesystem.php           | 6 ++++--
 .../Component/Intl/Tests/Locale/AbstractLocaleTest.php    | 7 ++++++-
 src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php    | 4 +---
 .../Intl/Tests/Locale/Verification/LocaleTest.php         | 4 +---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
index 2bc91e8d038e0..18d81ecda0f91 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -85,12 +85,12 @@ public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
             throw new \InvalidArgumentException(sprintf('An expression function name must be defined when PHP function "%s" is namespaced.', $phpFunctionName));
         }
 
-        $compiler = function () use ($phpFunctionName) {
-            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', \func_get_args()));
+        $compiler = function (...$args) use ($phpFunctionName) {
+            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', $args));
         };
 
-        $evaluator = function () use ($phpFunctionName) {
-            return $phpFunctionName(...\array_slice(\func_get_args(), 1));
+        $evaluator = function ($p, ...$args) use ($phpFunctionName) {
+            return $phpFunctionName(...$args);
         };
 
         return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 4053d9e6a5e86..b5eb6b5c3bee3 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -746,14 +746,16 @@ private function getSchemeAndHierarchy(string $filename): array
     }
 
     /**
+     * @param mixed ...$args
+     *
      * @return mixed
      */
-    private static function box(callable $func)
+    private static function box(callable $func, ...$args)
     {
         self::$lastError = null;
         set_error_handler(__CLASS__.'::handleError');
         try {
-            $result = $func(...\array_slice(\func_get_args(), 1));
+            $result = $func(...$args);
             restore_error_handler();
 
             return $result;
diff --git a/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php
index cf991c9bcc6d4..a3daecb59e018 100644
--- a/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/Locale/AbstractLocaleTest.php
@@ -27,5 +27,10 @@ public function testSetDefault()
         $this->assertSame('en_GB', $this->call('getDefault'));
     }
 
-    abstract protected function call($methodName);
+    /**
+     * @param mixed ...$args
+     *
+     * @return mixed
+     */
+    abstract protected function call(string $methodName, ...$args);
 }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
index 80b3352e21d3b..05ba7106ebc43 100644
--- a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
@@ -139,10 +139,8 @@ public function testSetDefaultAcceptsEn()
         $this->assertSame('en', $this->call('getDefault'));
     }
 
-    protected function call($methodName)
+    protected function call(string $methodName, ...$args)
     {
-        $args = \array_slice(\func_get_args(), 1);
-
         return Locale::{$methodName}(...$args);
     }
 }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
index 45c90f6c0f6bc..c0b1b26b623d4 100644
--- a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
@@ -29,10 +29,8 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    protected function call($methodName)
+    protected function call(string $methodName, ...$args)
     {
-        $args = \array_slice(\func_get_args(), 1);
-
         return \Locale::{$methodName}(...$args);
     }
 }

From cfce9cbd59cbdde48da901cc362be0c1517eacd1 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 12 Feb 2021 11:28:09 +0100
Subject: [PATCH 42/87] add missing return type declaration

---
 src/Symfony/Component/Finder/Iterator/LazyIterator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Finder/Iterator/LazyIterator.php b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
index 4388f4f3fd0e8..9028facf7fc3f 100644
--- a/src/Symfony/Component/Finder/Iterator/LazyIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
@@ -23,7 +23,7 @@ public function __construct(callable $iteratorFactory)
         $this->iteratorFactory = $iteratorFactory;
     }
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         yield from ($this->iteratorFactory)();
     }

From be6432ee4c2a22ddbe2cfc884235caf09039278f Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 12 Feb 2021 11:23:00 +0100
Subject: [PATCH 43/87] fix extracting mixed type-hinted property types

---
 .../Component/PropertyInfo/Extractor/ReflectionExtractor.php  | 4 ++--
 .../PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php  | 1 +
 .../Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php      | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index 7b8687ee0b868..c0f59cea9acf3 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -162,8 +162,8 @@ public function getTypes($class, $property, array $context = []): ?array
             try {
                 $reflectionProperty = new \ReflectionProperty($class, $property);
                 $type = $reflectionProperty->getType();
-                if (null !== $type) {
-                    return $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass());
+                if (null !== $type && $types = $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass())) {
+                    return $types;
                 }
             } catch (\ReflectionException $e) {
                 // noop
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 488cbe2e985a6..0a4f21da05bb3 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -239,6 +239,7 @@ public function php80TypesProvider()
             ['string', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Stringable'), new Type(Type::BUILTIN_TYPE_STRING)]],
             ['payload', null],
             ['data', null],
+            ['mixedProperty', null],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
index 3e1ffba6628f0..e8eac72be8df0 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
@@ -4,6 +4,8 @@
 
 class Php80Dummy
 {
+    public mixed $mixedProperty;
+
     public function getFoo(): array|null
     {
     }

From 4a2c996b951faa1bfe01067b2adf2792e94eb20d Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 12 Feb 2021 11:48:09 +0100
Subject: [PATCH 44/87] mark the LazyIterator class as internal

---
 src/Symfony/Component/Finder/Iterator/LazyIterator.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Finder/Iterator/LazyIterator.php b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
index 9028facf7fc3f..32cc37ff14adc 100644
--- a/src/Symfony/Component/Finder/Iterator/LazyIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/LazyIterator.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
+ *
+ * @internal
  */
 class LazyIterator implements \IteratorAggregate
 {

From 944ba23b58dbd34695193e95c522a17be70725be Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:09:11 +0100
Subject: [PATCH 45/87] Definition::removeMethodCall should remove all matching
 calls

It would only remove the first match, leaving the other method call(s) there to exist. This leads to unexpected situations.
---
 .../Component/DependencyInjection/Definition.php |  1 -
 .../DependencyInjection/Tests/DefinitionTest.php | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 349b2ed5ab5f6..f07c0c5bcf885 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -392,7 +392,6 @@ public function removeMethodCall($method)
         foreach ($this->calls as $i => $call) {
             if ($call[0] === $method) {
                 unset($this->calls[$i]);
-                break;
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 0a46e5795c794..d03233f5d259d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -425,4 +425,20 @@ public function testAddError()
         $def->addError('Second error');
         $this->assertSame(['First error', 'Second error'], $def->getErrors());
     }
+
+    public function testMultipleMethodCalls()
+    {
+        $def = new Definition('stdClass');
+
+        $def->addMethodCall('configure', ['arg1']);
+        $this->assertTrue($def->hasMethodCall('configure'));
+        $this->assertCount(1, $def->getMethodCalls());
+
+        $def->addMethodCall('configure', ['arg2']);
+        $this->assertTrue($def->hasMethodCall('configure'));
+        $this->assertCount(2, $def->getMethodCalls());
+
+        $def->removeMethodCall('configure');
+        $this->assertFalse($def->hasMethodCall('configure'));
+    }
 }

From 34b320ba97acc919d16170d1ff95c47a7c195352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 14 Feb 2021 12:49:34 +0100
Subject: [PATCH 46/87] Fix: Article

---
 .../FrameworkBundle/DependencyInjection/Configuration.php   | 4 ++--
 src/Symfony/Component/BrowserKit/Client.php                 | 4 ++--
 .../Config/Definition/Dumper/XmlReferenceDumper.php         | 2 +-
 .../DependencyInjection/Compiler/ResolveClassPass.php       | 2 +-
 .../Loader/Configurator/Traits/BindTrait.php                | 2 +-
 .../Component/DependencyInjection/Loader/XmlFileLoader.php  | 2 +-
 .../Tests/Compiler/ResolveClassPassTest.php                 | 2 +-
 src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php  | 2 +-
 .../DateTimeToHtml5LocalDateTimeTransformer.php             | 2 +-
 .../Component/Form/Extension/Core/Type/DateTimeType.php     | 2 +-
 src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 2 +-
 src/Symfony/Component/Form/Extension/Core/Type/TimeType.php | 2 +-
 src/Symfony/Component/HttpFoundation/HeaderUtils.php        | 2 +-
 src/Symfony/Component/HttpFoundation/Request.php            | 2 +-
 src/Symfony/Component/HttpFoundation/Tests/RequestTest.php  | 2 +-
 src/Symfony/Component/HttpKernel/Kernel.php                 | 2 +-
 src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php        | 2 +-
 src/Symfony/Component/Lock/Store/PdoStore.php               | 2 +-
 src/Symfony/Component/Mime/Header/ParameterizedHeader.php   | 2 +-
 .../Http/RememberMe/RememberMeServicesInterface.php         | 2 +-
 src/Symfony/Component/Security/Http/SecurityEvents.php      | 2 +-
 .../Component/Serializer/Mapping/Loader/XmlFileLoader.php   | 2 +-
 .../Component/Translation/Command/XliffLintCommand.php      | 4 ++--
 src/Symfony/Component/Translation/Loader/MoFileLoader.php   | 6 +++---
 src/Symfony/Component/WebLink/HttpHeaderSerializer.php      | 2 +-
 25 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 58148b18cad43..2ba05d6d4fae7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1431,7 +1431,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                     ->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
                                 ->end()
                                 ->booleanNode('verify_peer')
-                                    ->info('Indicates if the peer should be verified in a SSL/TLS context.')
+                                    ->info('Indicates if the peer should be verified in an SSL/TLS context.')
                                 ->end()
                                 ->booleanNode('verify_host')
                                     ->info('Indicates if the host should exist as a certificate common name.')
@@ -1570,7 +1570,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                         ->info('A network interface name, IP address, a host name or a UNIX socket to bind to.')
                                     ->end()
                                     ->booleanNode('verify_peer')
-                                        ->info('Indicates if the peer should be verified in a SSL/TLS context.')
+                                        ->info('Indicates if the peer should be verified in an SSL/TLS context.')
                                     ->end()
                                     ->booleanNode('verify_host')
                                         ->info('Indicates if the host should exist as a certificate common name.')
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index b20ccdc88c29b..e5bf8b757d5b3 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -331,7 +331,7 @@ public function submit(Form $form, array $values = []/*, array $serverParameters
      * @param string $button           The text content, id, value or name of the form <button> or <input type="submit">
      * @param array  $fieldValues      Use this syntax: ['my_form[name]' => '...', 'my_form[email]' => '...']
      * @param string $method           The HTTP method used to submit the form
-     * @param array  $serverParameters These values override the ones stored in $_SERVER (HTTP headers must include a HTTP_ prefix as PHP does)
+     * @param array  $serverParameters These values override the ones stored in $_SERVER (HTTP headers must include an HTTP_ prefix as PHP does)
      */
     public function submitForm(string $button, array $fieldValues = [], string $method = 'POST', array $serverParameters = []): Crawler
     {
@@ -352,7 +352,7 @@ public function submitForm(string $button, array $fieldValues = [], string $meth
      * @param string $uri           The URI to fetch
      * @param array  $parameters    The Request parameters
      * @param array  $files         The files
-     * @param array  $server        The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)
+     * @param array  $server        The server parameters (HTTP headers are referenced with an HTTP_ prefix as PHP does)
      * @param string $content       The raw body data
      * @param bool   $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
      *
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 77d1664c74bde..8bd47407fa391 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Config\Definition\PrototypedArrayNode;
 
 /**
- * Dumps a XML reference configuration for the given configuration/node instance.
+ * Dumps an XML reference configuration for the given configuration/node instance.
  *
  * @author Wouter J <waldio.webdesign@gmail.com>
  */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
index 5932472ec68a3..e67a2a8ed78ec 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
             }
             if (preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)) {
                 if ($definition instanceof ChildDefinition && !class_exists($id)) {
-                    throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
+                    throw new InvalidArgumentException(sprintf('Service definition "%s" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.', $id));
                 }
                 $definition->setClass($id);
             }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
index 132849439e478..3d16ad6f01c24 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/BindTrait.php
@@ -26,7 +26,7 @@ trait BindTrait
      * injected in the matching parameters (of the constructor, of methods
      * called and of controller actions).
      *
-     * @param string $nameOrFqcn A parameter name with its "$" prefix, or a FQCN
+     * @param string $nameOrFqcn A parameter name with its "$" prefix, or an FQCN
      * @param mixed  $valueOrRef The value or reference to bind
      *
      * @return $this
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 13d02ebb7c211..4b10acd9c53d8 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -386,7 +386,7 @@ private function parseDefinition(\DOMElement $service, string $file, array $defa
     }
 
     /**
-     * Parses a XML file to a \DOMDocument.
+     * Parses an XML file to a \DOMDocument.
      *
      * @throws InvalidArgumentException When loading of XML file returns error
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
index 69b9a1c2d3848..89e5fa2ea2abd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveClassPassTest.php
@@ -86,7 +86,7 @@ public function testClassFoundChildDefinition()
     public function testAmbiguousChildDefinition()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
+        $this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like an FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
         $container = new ContainerBuilder();
         $container->register('App\Foo', null);
         $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index 731eb99343bf4..083391a0bbab5 100644
--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -14,7 +14,7 @@
 /**
  * ChoiceFormField represents a choice form field.
  *
- * It is constructed from a HTML select tag, or a HTML checkbox, or radio inputs.
+ * It is constructed from an HTML select tag, or an HTML checkbox, or radio inputs.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
index ec323179eb46a..3b2123bd96d85 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
@@ -26,7 +26,7 @@ class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
      * Transforms a \DateTime into a local date and time string.
      *
      * According to the HTML standard, the input string of a datetime-local
-     * input is a RFC3339 date followed by 'T', followed by a RFC3339 time.
+     * input is an RFC3339 date followed by 'T', followed by an RFC3339 time.
      * https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-local-date-and-time-string
      *
      * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 8c96195485fbb..dec5bbf6aca54 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -213,7 +213,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['widget'] = $options['widget'];
 
-        // Change the input to a HTML5 datetime input if
+        // Change the input to an HTML5 datetime input if
         //  * the widget is set to "single_text"
         //  * the format matches the one expected by HTML5
         //  * the html5 is set to true
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index f6cca908140b1..0b9a4ffab3694 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -189,7 +189,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['widget'] = $options['widget'];
 
-        // Change the input to a HTML5 date input if
+        // Change the input to an HTML5 date input if
         //  * the widget is set to "single_text"
         //  * the format matches the one expected by HTML5
         //  * the html5 is set to true
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 58af6f1d45d5b..44acf3efb4aba 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -220,7 +220,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'with_seconds' => $options['with_seconds'],
         ]);
 
-        // Change the input to a HTML5 time input if
+        // Change the input to an HTML5 time input if
         //  * the widget is set to "single_text"
         //  * the html5 is set to true
         if ($options['html5'] && 'single_text' === $options['widget']) {
diff --git a/src/Symfony/Component/HttpFoundation/HeaderUtils.php b/src/Symfony/Component/HttpFoundation/HeaderUtils.php
index fddf2512c4b59..2bf2d6844688d 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderUtils.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderUtils.php
@@ -146,7 +146,7 @@ public static function unquote(string $s): string
     }
 
     /**
-     * Generates a HTTP Content-Disposition field-value.
+     * Generates an HTTP Content-Disposition field-value.
      *
      * @param string $disposition      One of "inline" or "attachment"
      * @param string $filename         A unicode string
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 079000e655ef5..aec9177e7ee05 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1716,7 +1716,7 @@ public function getAcceptableContentTypes()
     }
 
     /**
-     * Returns true if the request is a XMLHttpRequest.
+     * Returns true if the request is an XMLHttpRequest.
      *
      * It works if your JavaScript library sets an X-Requested-With HTTP header.
      * It is known to work with common JavaScript frameworks:
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index b90dfd645d796..c777283b66512 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -806,7 +806,7 @@ public function getQueryStringNormalizationData()
             ['bar=&foo=bar', 'bar=&foo=bar', '->works with empty parameters'],
             ['foo=bar&bar=', 'bar=&foo=bar', 'sorts keys alphabetically'],
 
-            // GET parameters, that are submitted from a HTML form, encode spaces as "+" by default (as defined in enctype application/x-www-form-urlencoded).
+            // GET parameters, that are submitted from an HTML form, encode spaces as "+" by default (as defined in enctype application/x-www-form-urlencoded).
             // PHP also converts "+" to spaces when filling the global _GET or when using the function parse_str.
             ['baz=Foo%20Baz&bar=Foo+Bar', 'bar=Foo%20Bar&baz=Foo%20Baz', 'normalizes spaces in both encodings "%20" and "+"'],
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 15a37cf58b4d6..b335a4f2077de 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -205,7 +205,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
     }
 
     /**
-     * Gets a HTTP kernel from the container.
+     * Gets an HTTP kernel from the container.
      *
      * @return HttpKernelInterface
      */
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
index 91b758e9ac888..87f68cf324bed 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -150,7 +150,7 @@ public function execute()
     }
 
     /**
-     * Returns a LDAP search resource. If this query resulted in multiple searches, only the first
+     * Returns an LDAP search resource. If this query resulted in multiple searches, only the first
      * page will be returned.
      *
      * @return resource
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
index e65fa5e042d19..98c6454e3669d 100644
--- a/src/Symfony/Component/Lock/Store/PdoStore.php
+++ b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -366,7 +366,7 @@ private function getDriver(): string
     }
 
     /**
-     * Provides a SQL function to get the current timestamp regarding the current connection's driver.
+     * Provides an SQL function to get the current timestamp regarding the current connection's driver.
      */
     private function getCurrentTimestampStatement(): string
     {
diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
index 1d167b43b1659..2c078d14c328c 100644
--- a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
+++ b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
@@ -102,7 +102,7 @@ protected function toTokens(string $string = null): array
     }
 
     /**
-     * Render a RFC 2047 compliant header parameter from the $name and $value.
+     * Render an RFC 2047 compliant header parameter from the $name and $value.
      */
     private function createParameter(string $name, string $value): string
     {
diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php
index 6a2e0970f93f7..8c66b688a95c4 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php
@@ -66,7 +66,7 @@ public function loginFail(Request $request, \Exception $exception = null);
      * although this is not recommended.
      *
      * Instead, implementations should typically look for a request parameter
-     * (such as a HTTP POST parameter) that indicates the browser has explicitly
+     * (such as an HTTP POST parameter) that indicates the browser has explicitly
      * requested for the authentication to be remembered.
      */
     public function loginSuccess(Request $request, Response $response, TokenInterface $token);
diff --git a/src/Symfony/Component/Security/Http/SecurityEvents.php b/src/Symfony/Component/Security/Http/SecurityEvents.php
index fbef93d6197aa..efeeb0a86a194 100644
--- a/src/Symfony/Component/Security/Http/SecurityEvents.php
+++ b/src/Symfony/Component/Security/Http/SecurityEvents.php
@@ -18,7 +18,7 @@ final class SecurityEvents
      * into your website. It is important to distinguish this action from
      * non-interactive authentication methods, such as:
      *   - authentication based on your session.
-     *   - authentication using a HTTP basic or HTTP digest header.
+     *   - authentication using an HTTP basic or HTTP digest header.
      *
      * @Event("Symfony\Component\Security\Http\Event\InteractiveLoginEvent")
      */
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
index cd329e91c6619..7d33ca0c92a2b 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -106,7 +106,7 @@ public function getMappedClasses()
     }
 
     /**
-     * Parses a XML File.
+     * Parses an XML File.
      *
      * @throws MappingException
      */
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index e96effbcdb3bb..426635edb523c 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -53,11 +53,11 @@ public function __construct(string $name = null, callable $directoryIteratorProv
     protected function configure()
     {
         $this
-            ->setDescription('Lints a XLIFF file and outputs encountered errors')
+            ->setDescription('Lints an XLIFF file and outputs encountered errors')
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
             ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'txt')
             ->setHelp(<<<EOF
-The <info>%command.name%</info> command lints a XLIFF file and outputs to STDOUT
+The <info>%command.name%</info> command lints an XLIFF file and outputs to STDOUT
 the first encountered syntax error.
 
 You can validates XLIFF contents passed from STDIN:
diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
index 1f2e62ced69ef..accd023ab50c6 100644
--- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php
@@ -19,19 +19,19 @@
 class MoFileLoader extends FileLoader
 {
     /**
-     * Magic used for validating the format of a MO file as well as
+     * Magic used for validating the format of an MO file as well as
      * detecting if the machine used to create that file was little endian.
      */
     public const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
 
     /**
-     * Magic used for validating the format of a MO file as well as
+     * Magic used for validating the format of an MO file as well as
      * detecting if the machine used to create that file was big endian.
      */
     public const MO_BIG_ENDIAN_MAGIC = 0xde120495;
 
     /**
-     * The size of the header of a MO file in bytes.
+     * The size of the header of an MO file in bytes.
      */
     public const MO_HEADER_SIZE = 28;
 
diff --git a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
index d80d96ec3b5ce..85a9d0e433e51 100644
--- a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
+++ b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
@@ -14,7 +14,7 @@
 use Psr\Link\LinkInterface;
 
 /**
- * Serializes a list of Link instances to a HTTP Link header.
+ * Serializes a list of Link instances to an HTTP Link header.
  *
  * @see https://tools.ietf.org/html/rfc5988
  *

From 52f02e529ae867bf6e24d9225fe20cb0ba6c2b33 Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Sun, 14 Feb 2021 19:19:55 +0100
Subject: [PATCH 47/87] [Console] Fix PHP 8.1 null error for preg_match flag

Since PHP 8.1, null is no longer accepted as $flags, default integer `0` value should be used instead.
---
 src/Symfony/Component/Console/Input/StringInput.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
index 5032b340a188d..d43187d28171a 100644
--- a/src/Symfony/Component/Console/Input/StringInput.php
+++ b/src/Symfony/Component/Console/Input/StringInput.php
@@ -52,12 +52,12 @@ private function tokenize($input)
         $length = \strlen($input);
         $cursor = 0;
         while ($cursor < $length) {
-            if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
-            } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, null, $cursor)) {
+            if (preg_match('/\s+/A', $input, $match, 0, $cursor)) {
+            } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, 0, $cursor)) {
                 $tokens[] = $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, \strlen($match[3]) - 2)));
-            } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, null, $cursor)) {
+            } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
                 $tokens[] = stripcslashes(substr($match[0], 1, \strlen($match[0]) - 2));
-            } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, null, $cursor)) {
+            } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, 0, $cursor)) {
                 $tokens[] = stripcslashes($match[1]);
             } else {
                 // should never happen

From 419e2206f43a7068d16f23027f90954b3b413f64 Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Sun, 14 Feb 2021 19:51:53 +0100
Subject: [PATCH 48/87] Fix PHP 8.1 null values

Both `stripos` and `preg_match` will no longer accept `null` on PHP >= 8.1
---
 src/Symfony/Component/HttpFoundation/Response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index fb09d62c006d6..4ab97aaf90538 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -1237,7 +1237,7 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void
      */
     protected function ensureIEOverSSLCompatibility(Request $request): void
     {
-        if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) && true === $request->isSecure()) {
+        if (false !== stripos($this->headers->get('Content-Disposition') ?? '', 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT') ?? '', $match) && true === $request->isSecure()) {
             if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {
                 $this->headers->remove('Cache-Control');
             }

From 1572491a8ab32bfe3927302aaa36bd3e4ea9e059 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sat, 13 Feb 2021 14:25:19 +0100
Subject: [PATCH 49/87] use the right context for properties defined in traits

---
 .../Extractor/PhpDocExtractor.php             | 12 ++++++-
 .../Tests/Extractor/PhpDocExtractorTest.php   | 20 ++++++++++++
 .../Tests/Fixtures/TraitUsage/DummyTrait.php  | 32 +++++++++++++++++++
 .../Fixtures/TraitUsage/DummyUsedInTrait.php  | 16 ++++++++++
 .../Fixtures/TraitUsage/DummyUsingTrait.php   | 17 ++++++++++
 5 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index 176a00a2f8105..a701a011c68a4 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -201,7 +201,17 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB
         }
 
         try {
-            return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflectionProperty->getDeclaringClass()));
+            $reflector = $reflectionProperty->getDeclaringClass();
+
+            foreach ($reflector->getTraits() as $trait) {
+                if ($trait->hasProperty($property)) {
+                    $reflector = $trait;
+
+                    break;
+                }
+            }
+
+            return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflector));
         } catch (\InvalidArgumentException $e) {
             return null;
         } catch (\RuntimeException $e) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index d352fa12b61f0..bd3d5287c263d 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -16,6 +16,9 @@
 use phpDocumentor\Reflection\Types\Collection;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
@@ -273,6 +276,23 @@ public function testDocBlockFallback($property, $types)
         $this->assertEquals($types, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\DockBlockFallback', $property));
     }
 
+    /**
+     * @dataProvider propertiesDefinedByTraitsProvider
+     */
+    public function testPropertiesDefinedByTraits(string $property, Type $type)
+    {
+        $this->assertEquals([$type], $this->extractor->getTypes(DummyUsingTrait::class, $property));
+    }
+
+    public function propertiesDefinedByTraitsProvider(): array
+    {
+        return [
+            ['propertyInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
+            ['propertyInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
+            ['propertyInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+        ];
+    }
+
     protected function isPhpDocumentorV5()
     {
         if (class_exists(InvalidTag::class)) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
new file mode 100644
index 0000000000000..6284ebf10567f
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.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\PropertyInfo\Tests\Fixtures\TraitUsage;
+
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+
+trait DummyTrait
+{
+    /**
+     * @var string
+     */
+    private $propertyInTraitPrimitiveType;
+
+    /**
+     * @var DummyUsedInTrait
+     */
+    private $propertyInTraitObjectSameNamespace;
+
+    /**
+     * @var Dummy
+     */
+    private $propertyInTraitObjectDifferentNamespace;
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php
new file mode 100644
index 0000000000000..b887f6654e06c
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsedInTrait.php
@@ -0,0 +1,16 @@
+<?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\PropertyInfo\Tests\Fixtures\TraitUsage;
+
+class DummyUsedInTrait
+{
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php
new file mode 100644
index 0000000000000..bfd75a36f41c1
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.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\PropertyInfo\Tests\Fixtures\TraitUsage;
+
+class DummyUsingTrait
+{
+    use DummyTrait;
+}

From d106aa3f2dae9bc68f37fd872e39a15bf9c8e2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Fri, 12 Feb 2021 20:06:23 +0100
Subject: [PATCH 50/87] [Translation] Allow using dashes in locale when linting
 Xliff files

---
 .../Translation/Command/XliffLintCommand.php          |  4 ++--
 .../Tests/Command/XliffLintCommandTest.php            | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index e96effbcdb3bb..78b1784c97a7a 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -129,12 +129,12 @@ private function validate(string $content, string $file = null): array
         $document->loadXML($content);
 
         if (null !== $targetLanguage = $this->getTargetLanguageFromFile($document)) {
-            $normalizedLocale = preg_quote(str_replace('-', '_', $targetLanguage), '/');
+            $normalizedLocalePattern = sprintf('(%s|%s)', preg_quote($targetLanguage, '/'), preg_quote(str_replace('-', '_', $targetLanguage), '/'));
             // strict file names require translation files to be named '____.locale.xlf'
             // otherwise, both '____.locale.xlf' and 'locale.____.xlf' are allowed
             // also, the regexp matching must be case-insensitive, as defined for 'target-language' values
             // http://docs.oasis-open.org/xliff/v1.2/os/xliff-core.html#target-language
-            $expectedFilenamePattern = $this->requireStrictFileNames ? sprintf('/^.*\.(?i:%s)\.(?:xlf|xliff)/', $normalizedLocale) : sprintf('/^(?:.*\.(?i:%s)|(?i:%s)\..*)\.(?:xlf|xliff)/', $normalizedLocale, $normalizedLocale);
+            $expectedFilenamePattern = $this->requireStrictFileNames ? sprintf('/^.*\.(?i:%s)\.(?:xlf|xliff)/', $normalizedLocalePattern) : sprintf('/^(?:.*\.(?i:%s)|(?i:%s)\..*)\.(?:xlf|xliff)/', $normalizedLocalePattern, $normalizedLocalePattern);
 
             if (0 === preg_match($expectedFilenamePattern, basename($file))) {
                 $errors[] = [
diff --git a/src/Symfony/Component/Translation/Tests/Command/XliffLintCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/XliffLintCommandTest.php
index 4a3351f6ecac0..c1c545a67fb87 100644
--- a/src/Symfony/Component/Translation/Tests/Command/XliffLintCommandTest.php
+++ b/src/Symfony/Component/Translation/Tests/Command/XliffLintCommandTest.php
@@ -105,6 +105,17 @@ public function testLintTargetLanguageIsCaseInsensitive()
         $this->assertStringContainsString('[OK] All 1 XLIFF files contain valid syntax.', trim($tester->getDisplay()));
     }
 
+    public function testLintSucceedsWhenLocaleInFileAndInTargetLanguageNameUsesDashesInsteadOfUnderscores()
+    {
+        $tester = $this->createCommandTester();
+        $filename = $this->createFile('note', 'en-GB', 'messages.en-GB.xlf');
+
+        $tester->execute(['filename' => $filename], ['decorated' => false]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('[OK] All 1 XLIFF files contain valid syntax.', trim($tester->getDisplay()));
+    }
+
     public function testLintFileNotReadable()
     {
         $this->expectException(\RuntimeException::class);

From 93fe4a213e289fd8ae0ca21730d17522400d0d3f Mon Sep 17 00:00:00 2001
From: Tigran Azatyan <tigran.azatyan@gmail.com>
Date: Sun, 20 Dec 2020 18:49:10 +0400
Subject: [PATCH 51/87] Symfony Armenian Translations

---
 .../Resources/translations/validators.hy.xlf  |  6 +-
 .../Resources/translations/security.hy.xlf    | 75 +++++++++++++++++++
 .../Resources/translations/validators.hy.xlf  | 58 +++++++++-----
 3 files changed, 117 insertions(+), 22 deletions(-)
 create mode 100644 src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
index 7550cb1b5818e..bdba3fe81448f 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
@@ -4,15 +4,15 @@
         <body>
             <trans-unit id="28">
                 <source>This form should not contain extra fields.</source>
-                <target>Այս ձևը չպետք է պարունակի լրացուցիչ տողեր.</target>
+                <target>Այս ձևը չպետք է պարունակի լրացուցիչ տողեր։</target>
             </trans-unit>
             <trans-unit id="29">
                 <source>The uploaded file was too large. Please try to upload a smaller file.</source>
-                <target>Վերբեռնված ֆայլը չափազանց մեծ է: Խնդրվում է վերբեռնել ավելի փոքր չափսի ֆայլ.</target>
+                <target>Վերբեռնված ֆայլը չափազանց մեծ է. Խնդրվում է վերբեռնել ավելի փոքր չափսի ֆայլ։</target>
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
-                <target>CSRF արժեքը անթույլատրելի է: Փորձեք նորից ուղարկել ձևը.</target>
+                <target>CSRF արժեքը անթույլատրելի է. Փորձեք նորից ուղարկել ձևը։</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf
new file mode 100644
index 0000000000000..da63a0047c664
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hy.xlf
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>An authentication exception occurred.</source>
+                <target>Նույնականացման սխալ։</target>
+            </trans-unit>
+            <trans-unit id="2">
+                <source>Authentication credentials could not be found.</source>
+                <target>Նույնականացման տվյալները չեն գտնվել։</target>
+            </trans-unit>
+            <trans-unit id="3">
+                <source>Authentication request could not be processed due to a system problem.</source>
+                <target>Համակարգային սխալ՝ նույնականացման հացրման պրոցեսինգի ժամանակ։</target>
+            </trans-unit>
+            <trans-unit id="4">
+                <source>Invalid credentials.</source>
+                <target>Սխալ մուտքային տվյալներ</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>Cookie has already been used by someone else.</source>
+                <target>Cookie-ն արդեն օգտագործվում է ուրիշի կողմից։</target>
+            </trans-unit>
+            <trans-unit id="6">
+                <source>Not privileged to request the resource.</source>
+                <target>Ռեսուրսի հարցման համար չկա թույլատվություն։</target>
+            </trans-unit>
+            <trans-unit id="7">
+                <source>Invalid CSRF token.</source>
+                <target>Անվավեր CSRF թոքեն։</target>
+            </trans-unit>
+            <trans-unit id="9">
+                <source>No authentication provider found to support the authentication token.</source>
+                <target>Նույնականացման ոչ մի մատակարար չի գտնվել, որ աջակցի նույնականացման թոքենը։</target>
+            </trans-unit>
+            <trans-unit id="10">
+                <source>No session available, it either timed out or cookies are not enabled.</source>
+                <target>No session available, it either timed out or cookies are not enabled.</target>
+            </trans-unit>
+            <trans-unit id="11">
+                <source>No token could be found.</source>
+                <target>Թոքենը չի գտնվել։</target>
+            </trans-unit>
+            <trans-unit id="12">
+                <source>Username could not be found.</source>
+                <target>Օգտանունը չի գտնվել։</target>
+            </trans-unit>
+            <trans-unit id="13">
+                <source>Account has expired.</source>
+                <target>Հաշիվը ժամկետանց է։</target>
+            </trans-unit>
+            <trans-unit id="14">
+                <source>Credentials have expired.</source>
+                <target>Մուտքային տվյալները ժամկետանց են։</target>
+            </trans-unit>
+            <trans-unit id="15">
+                <source>Account is disabled.</source>
+                <target>Հաշիվը դեկատիվացված է։</target>
+            </trans-unit>
+            <trans-unit id="16">
+                <source>Account is locked.</source>
+                <target>Հաշիվն արգելափակված է։</target>
+            </trans-unit>
+            <trans-unit id="17">
+                <source>Too many failed login attempts, please try again later.</source>
+                <target>Չափից շատ մուտքի փորձեր, խնդրում ենք փորձել մի փոքր ուշ</target>
+            </trans-unit>
+            <trans-unit id="18">
+                <source>Invalid or expired login link.</source>
+                <target>Անվավեր կամ ժամկետանց մուտքի հղում։</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf
index b005518f35875..8147e5a477f8a 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf
@@ -4,11 +4,11 @@
         <body>
             <trans-unit id="1">
                 <source>This value should be false.</source>
-                <target>Արժեքը պետք է լինի սխալ։</target>
+                <target>Արժեքը պետք է լինի կեղծ։</target>
             </trans-unit>
             <trans-unit id="2">
                 <source>This value should be true.</source>
-                <target>Արժեքը պետք է լինի ճիշտ։</target>
+                <target>Արժեքը պետք է լինի իրական։</target>
             </trans-unit>
             <trans-unit id="3">
                 <source>This value should be of type {{ type }}.</source>
@@ -204,15 +204,15 @@
             </trans-unit>
             <trans-unit id="54">
                 <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Այս հավաքածուն պետք է պաուրակի {{ limit }} կամ ավելի տարրեր։|Այս հավելվածը պետք է պարունակի limit }} տարր կամ ավելին։|Այս հավաքածուն պետք է պարունակի {{ limit }} տարրերին կամ ավելի։</target>
+                <target>Այս համախումբը պետք է պաուրակի {{ limit }} կամ ավելի տարրեր։|Այս հավելվածը պետք է պարունակի limit }} տարր կամ ավելին։|Այս համախումբը պետք է պարունակի {{ limit }} տարրերին կամ ավելի։</target>
             </trans-unit>
             <trans-unit id="55">
                 <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Այս հավաքածուն պետք է պաուրակի {{ limit }} տարրեր կամ քիչ։|Այս հավաքածուն պետք է պաուրակի {{ limit }} տարր կամ քիչ։|Այս հավաքածուն պետք է պաուրակի {{ limit }} տարրեր կամ քիչ։</target>
+                <target>Այս համախումբը պետք է պաուրակի {{ limit }} տարրեր կամ քիչ։|Այս համախումբը պետք է պաուրակի {{ limit }} տարր կամ քիչ։|Այս համախումբը պետք է պաուրակի {{ limit }} տարրեր կամ քիչ։</target>
             </trans-unit>
             <trans-unit id="56">
                 <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Այս հավաքածուն պետք է պաուրակի ուղիղ {{ limit }} տարր։|Այս հավաքածուն պետք է պաուրակի ուղիղ {{ limit }} տարրեր։|Այս հավաքածուն պետք է պաուրակի {{ limit }} տարրեր։</target>
+                <target>Այս համախումբը պետք է պաուրակի ուղիղ {{ limit }} տարր։|Այս համախումբը պետք է պաուրակի ուղիղ {{ limit }} տարրեր։|Այս համախումբը պետք է պաուրակի {{ limit }} տարրեր։</target>
             </trans-unit>
             <trans-unit id="57">
                 <source>Invalid card number.</source>
@@ -304,11 +304,11 @@
             </trans-unit>
             <trans-unit id="79">
                 <source>The host could not be resolved.</source>
-                <target>Հոսթի անունը հնարավոր չի պարզել:</target>
+                <target>Հոսթի անունը հնարավոր չի պարզել։</target>
             </trans-unit>
             <trans-unit id="80">
                 <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Արժեքը չի համընկնում {{ charset }} կոդավորման հետ:</target>
+                <target>Արժեքը չի համընկնում {{ charset }} կոդավորման հետ։</target>
             </trans-unit>
             <trans-unit id="81">
                 <source>This is not a valid Business Identifier Code (BIC).</source>
@@ -320,51 +320,71 @@
             </trans-unit>
             <trans-unit id="83">
                 <source>This is not a valid UUID.</source>
-                <target>Սա վավեր UUID չէ:</target>
+                <target>Սա վավեր UUID չէ։</target>
             </trans-unit>
             <trans-unit id="84">
                 <source>This value should be a multiple of {{ compared_value }}.</source>
-                <target>Այս արժեքը պետք է լինի բազմակի {{ compared_value }}.</target>
+                <target>Այս արժեքը պետք է լինի բազմակի {{ compared_value }}։</target>
             </trans-unit>
             <trans-unit id="85">
                 <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
-                <target>Բիզնեսի նույնականացման կոդը (BIC) կապված չէ IBAN- ի հետ {{ iban }}.</target>
+                <target>Բիզնեսի նույնականացման կոդը (BIC) կապված չէ IBAN- ի հետ {{ iban }}։</target>
             </trans-unit>
             <trans-unit id="86">
                 <source>This value should be valid JSON.</source>
-                <target>Այս արժեքը պետք է լինի վավեր JSON:</target>
+                <target>Այս արժեքը պետք է լինի վավեր JSON։</target>
             </trans-unit>
             <trans-unit id="87">
                 <source>This collection should contain only unique elements.</source>
-                <target>Այս հավաքածուն պետք է պարունակի միայն եզակի տարրեր:</target>
+                <target>Այս համախումբը պետք է պարունակի միայն եզակի տարրեր։</target>
             </trans-unit>
             <trans-unit id="88">
                 <source>This value should be positive.</source>
-                <target>Այս արժեքը պետք է լինի դրական:</target>
+                <target>Այս արժեքը պետք է լինի դրական։</target>
             </trans-unit>
             <trans-unit id="89">
                 <source>This value should be either positive or zero.</source>
-                <target>Այս արժեքը պետք է լինի դրական կամ զրոյական:</target>
+                <target>Այս արժեքը պետք է լինի դրական կամ զրոյական։</target>
             </trans-unit>
             <trans-unit id="90">
                 <source>This value should be negative.</source>
-                <target>Այս արժեքը պետք է լինի բացասական:</target>
+                <target>Այս արժեքը պետք է լինի բացասական։</target>
             </trans-unit>
             <trans-unit id="91">
                 <source>This value should be either negative or zero.</source>
-                <target>Այս արժեքը պետք է լինի բացասական կամ զրոյական:</target>
+                <target>Այս արժեքը պետք է լինի բացասական կամ զրոյական։</target>
             </trans-unit>
             <trans-unit id="92">
                 <source>This value is not a valid timezone.</source>
-                <target>Այս արժեքը վավեր ժամանակի գոտի չէ:</target>
+                <target>Այս արժեքը վավեր ժամային գոտի չէ։</target>
             </trans-unit>
             <trans-unit id="93">
                 <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
-                <target>Այս գաղտնաբառն արտահոսվել է տվյալների խախտման մեջ, այն չպետք է օգտագործվի: Խնդրում ենք օգտագործել մեկ այլ գաղտնաբառ:</target>
+                <target>Գաղտնաբառը գտնվել է տվյալների արտահոսքում. այն չպետք է օգտագործվի: Խնդրում ենք օգտագործել մեկ այլ գաղտնաբառ։</target>
             </trans-unit>
             <trans-unit id="94">
                 <source>This value should be between {{ min }} and {{ max }}.</source>
-                <target>Այս արժեքը պետք է լինի միջև {{ min }} և {{ max }}.</target>
+                <target>Այս արժեքը պետք է լինի  {{ min }}-ի և {{ max }}-ի միջև։</target>
+            </trans-unit>
+            <trans-unit id="95">
+                <source>This value is not a valid hostname.</source>
+                <target>Այս հոստի անունը վավեր չէ։</target>
+            </trans-unit>
+            <trans-unit id="96">
+                <source>The number of elements in this collection should be a multiple of {{ compared_value }}․</source>
+                <target>Այս համախմբի տարրերի քանակը պետք է հավասար լինի {{ compared_value }}-ի բազմապատիկներին։</target>
+            </trans-unit>
+            <trans-unit id="97">
+                <source>This value should satisfy at least one of the following constraints:</source>
+                <target>Այս արժեքը պետք է բավարարի հետևյալ սահմանափակումներից առնվազն մեկը։</target>
+            </trans-unit>
+            <trans-unit id="98">
+                <source>Each element of this collection should satisfy its own set of constraints.</source>
+                <target>Այս համախմբի յուրաքանչյուր տարր պետք է բավարարի իր սեփական սահմանափակումները։</target>
+            </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid International Securities Identification Number (ISIN).</source>
+                <target>Այս արժեքը արժեթղթերի նույնականացման միջազգային համարը վավեր չէ(ISIN)։</target>
             </trans-unit>
         </body>
     </file>

From 8530ada94dff817e732755106c3e9b5af9aafe73 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 16 Feb 2021 10:34:30 +0100
Subject: [PATCH 52/87] Ignore indirect deprecation triggered by doctrine/orm

---
 .appveyor.yml | 1 +
 .travis.yml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 41d9c8d45d701..5077eea33d60a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,6 +12,7 @@ init:
     - SET SYMFONY_DEPRECATIONS_HELPER=strict
     - SET ANSICON=121x90 (121x90)
     - SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
+    - SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
     - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
diff --git a/.travis.yml b/.travis.yml
index fb3910f44b1a6..98d1c8d4a82fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,7 @@ before_install:
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
       export COMPOSER_UP='composer update --no-progress --ansi'
       export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
+      export SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
 
       nanoseconds () {
           local cmd="date"

From 7946be2b951612366b31a7b2c222cf2aa10a8e9b Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Tue, 16 Feb 2021 12:01:18 +0100
Subject: [PATCH 53/87] [WebLink] Escape double quotes in attributes values

---
 src/Symfony/Component/WebLink/HttpHeaderSerializer.php    | 4 ++--
 .../Component/WebLink/Tests/HttpHeaderSerializerTest.php  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
index 85a9d0e433e51..2ecdff0905f67 100644
--- a/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
+++ b/src/Symfony/Component/WebLink/HttpHeaderSerializer.php
@@ -39,14 +39,14 @@ public function serialize(iterable $links): ?string
             foreach ($link->getAttributes() as $key => $value) {
                 if (\is_array($value)) {
                     foreach ($value as $v) {
-                        $attributesParts[] = sprintf('%s="%s"', $key, $v);
+                        $attributesParts[] = sprintf('%s="%s"', $key, preg_replace('/(?<!\\\\)"/', '\"', $v));
                     }
 
                     continue;
                 }
 
                 if (!\is_bool($value)) {
-                    $attributesParts[] = sprintf('%s="%s"', $key, $value);
+                    $attributesParts[] = sprintf('%s="%s"', $key, preg_replace('/(?<!\\\\)"/', '\"', $value));
 
                     continue;
                 }
diff --git a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
index fa50645a7251c..5371e4b43acf2 100644
--- a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
+++ b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
@@ -44,4 +44,12 @@ public function testSerializeEmpty()
     {
         $this->assertNull($this->serializer->serialize([]));
     }
+
+    public function testSerializeDoubleQuotesInAttributeValue()
+    {
+        $this->assertSame('</foo>; rel="alternate"; title="\"escape me\" \"already escaped\" \"\"\""', $this->serializer->serialize([
+            (new Link('alternate', '/foo'))
+                ->withAttribute('title', '"escape me" \"already escaped\" ""\"'),
+        ]));
+    }
 }

From 0e421004eb97c82e87c9dc34cfdab43a1146f825 Mon Sep 17 00:00:00 2001
From: Yendric <yendricvanroey@gmail.com>
Date: Sun, 14 Feb 2021 23:09:09 +0100
Subject: [PATCH 54/87] [Console] fix QuestionHelper::getHiddenResponse() not
 working with space in project directory name

---
 src/Symfony/Component/Console/Helper/QuestionHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index e7ea0055598d4..d211fcfd1e6ec 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -412,7 +412,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream, bool $
                 $exe = $tmpExe;
             }
 
-            $sExec = shell_exec($exe);
+            $sExec = shell_exec('"'.$exe.'"');
             $value = $trimmable ? rtrim($sExec) : $sExec;
             $output->writeln('');
 

From e9f2ece991f721813c2be7a5883425b68392bbda Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Tue, 16 Feb 2021 11:56:12 +0100
Subject: [PATCH 55/87] fix resolving parent/self/static type annotations

---
 .../Extractor/PhpDocExtractor.php             | 22 +++++++++++-
 .../Tests/Extractor/PhpDocExtractorTest.php   | 34 +++++++++++++++++++
 .../Extractor/ReflectionExtractorTest.php     | 28 ++++++++++-----
 .../PropertyInfo/Tests/Fixtures/Dummy.php     |  5 +++
 .../Tests/Fixtures/ParentDummy.php            | 10 ++++++
 .../PropertyInfo/Tests/Fixtures/Php7Dummy.php |  2 +-
 .../Tests/Fixtures/Php7ParentDummy.php        | 19 +++++++++++
 .../PropertyInfo/Util/PhpDocTypeHelper.php    |  4 +++
 8 files changed, 114 insertions(+), 10 deletions(-)
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7ParentDummy.php

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index a701a011c68a4..25446deb1e7ec 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -142,11 +142,31 @@ public function getTypes($class, $property, array $context = []): ?array
                 break;
         }
 
+        $parentClass = null;
         $types = [];
         /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
         foreach ($docBlock->getTagsByName($tag) as $tag) {
             if ($tag && !$tag instanceof InvalidTag && null !== $tag->getType()) {
-                $types = array_merge($types, $this->phpDocTypeHelper->getTypes($tag->getType()));
+                foreach ($this->phpDocTypeHelper->getTypes($tag->getType()) as $type) {
+                    switch ($type->getClassName()) {
+                        case 'self':
+                        case 'static':
+                            $resolvedClass = $class;
+                            break;
+
+                        case 'parent':
+                            if (false !== $resolvedClass = $parentClass ?? $parentClass = get_parent_class($class)) {
+                                break;
+                            }
+                            // no break
+
+                        default:
+                            $types[] = $type;
+                            continue 2;
+                    }
+
+                    $types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $type->isNullable(), $resolvedClass, $type->isCollection(), $type->getCollectionKeyType(), $type->getCollectionValueType());
+                }
             }
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index bd3d5287c263d..4e3ff39257537 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -17,6 +17,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait;
 use Symfony\Component\PropertyInfo\Type;
@@ -120,6 +121,7 @@ public function typesProvider()
             ['staticGetter', null, null, null],
             ['staticSetter', null, null, null],
             ['emptyVar', null, $this->isPhpDocumentorV5() ? 'This should not be removed.' : null, null],
+            ['self', [new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], null, null],
         ];
     }
 
@@ -293,6 +295,38 @@ public function propertiesDefinedByTraitsProvider(): array
         ];
     }
 
+    /**
+     * @dataProvider propertiesStaticTypeProvider
+     */
+    public function testPropertiesStaticType(string $class, string $property, Type $type)
+    {
+        $this->assertEquals([$type], $this->extractor->getTypes($class, $property));
+    }
+
+    public function propertiesStaticTypeProvider(): array
+    {
+        return [
+            [ParentDummy::class, 'propertyTypeStatic', new Type(Type::BUILTIN_TYPE_OBJECT, false, ParentDummy::class)],
+            [Dummy::class, 'propertyTypeStatic', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+        ];
+    }
+
+    /**
+     * @dataProvider propertiesParentTypeProvider
+     */
+    public function testPropertiesParentType(string $class, string $property, ?array $types)
+    {
+        $this->assertEquals($types, $this->extractor->getTypes($class, $property));
+    }
+
+    public function propertiesParentTypeProvider(): array
+    {
+        return [
+            [ParentDummy::class, 'parentAnnotationNoParent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'parent')]],
+            [Dummy::class, 'parentAnnotation', [new Type(Type::BUILTIN_TYPE_OBJECT, false, ParentDummy::class)]],
+        ];
+    }
+
     protected function isPhpDocumentorV5()
     {
         if (class_exists(InvalidTag::class)) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 0a4f21da05bb3..18f8d4d018f02 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -20,6 +20,8 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyExtended2;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php74Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\Php7ParentDummy;
 use Symfony\Component\PropertyInfo\Type;
 
 /**
@@ -57,12 +59,15 @@ public function testGetProperties()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'parentAnnotation',
                 'foo',
                 'foo2',
                 'foo3',
                 'foo4',
                 'foo5',
                 'files',
+                'propertyTypeStatic',
+                'parentAnnotationNoParent',
                 'a',
                 'DOB',
                 'Id',
@@ -105,12 +110,15 @@ public function testGetPropertiesWithCustomPrefixes()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'parentAnnotation',
                 'foo',
                 'foo2',
                 'foo3',
                 'foo4',
                 'foo5',
                 'files',
+                'propertyTypeStatic',
+                'parentAnnotationNoParent',
                 'date',
                 'c',
                 'd',
@@ -143,12 +151,15 @@ public function testGetPropertiesWithNoPrefixes()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'parentAnnotation',
                 'foo',
                 'foo2',
                 'foo3',
                 'foo4',
                 'foo5',
                 'files',
+                'propertyTypeStatic',
+                'parentAnnotationNoParent',
             ],
             $noPrefixExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
@@ -184,20 +195,21 @@ public function typesProvider()
     /**
      * @dataProvider php7TypesProvider
      */
-    public function testExtractPhp7Type($property, array $type = null)
+    public function testExtractPhp7Type(string $class, string $property, array $type = null)
     {
-        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy', $property, []));
+        $this->assertEquals($type, $this->extractor->getTypes($class, $property, []));
     }
 
     public function php7TypesProvider()
     {
         return [
-            ['foo', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]],
-            ['bar', [new Type(Type::BUILTIN_TYPE_INT)]],
-            ['baz', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
-            ['buz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy')]],
-            ['biz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'stdClass')]],
-            ['donotexist', null],
+            [Php7Dummy::class, 'foo', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)]],
+            [Php7Dummy::class, 'bar', [new Type(Type::BUILTIN_TYPE_INT)]],
+            [Php7Dummy::class, 'baz', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
+            [Php7Dummy::class, 'buz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\Php7Dummy')]],
+            [Php7Dummy::class, 'biz', [new Type(Type::BUILTIN_TYPE_OBJECT, false, Php7ParentDummy::class)]],
+            [Php7Dummy::class, 'donotexist', null],
+            [Php7ParentDummy::class, 'parent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, \stdClass::class)]],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
index bcec074438948..420cdddae9768 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -130,6 +130,11 @@ class Dummy extends ParentDummy
      */
     public $nestedIterators;
 
+    /**
+     * @var parent
+     */
+    public $parentAnnotation;
+
     public static function getStatic()
     {
     }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
index 8d5c4fe107162..d698983254d75 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
@@ -48,6 +48,16 @@ class ParentDummy
      */
     public $files;
 
+    /**
+     * @var static
+     */
+    public $propertyTypeStatic;
+
+    /**
+     * @var parent
+     */
+    public $parentAnnotationNoParent;
+
     /**
      * @return bool|null
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
index 5dcb4c565e768..a6c2d5f147400 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7Dummy.php
@@ -14,7 +14,7 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class Php7Dummy extends \stdClass
+class Php7Dummy extends Php7ParentDummy
 {
     public function getFoo(): array
     {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7ParentDummy.php
new file mode 100644
index 0000000000000..69574a749bfbf
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php7ParentDummy.php
@@ -0,0 +1,19 @@
+<?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\PropertyInfo\Tests\Fixtures;
+
+class Php7ParentDummy extends \stdClass
+{
+    public function getParent(): parent
+    {
+    }
+}
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
index 06b7489201217..41edd3e197948 100644
--- a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
+++ b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -160,6 +160,10 @@ private function getPhpTypeAndClass(string $docType): array
             return [$docType, null];
         }
 
+        if (\in_array($docType, ['parent', 'self', 'static'], true)) {
+            return ['object', $docType];
+        }
+
         return ['object', substr($docType, 1)];
     }
 }

From 3a231c2030c1147bb8e534a5d766f695011c125c Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Wed, 17 Feb 2021 14:10:06 +0100
Subject: [PATCH 56/87] install compatible versions of mongodb/mongodb only

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 98d1c8d4a82fe..ee0c4c815974d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -255,7 +255,7 @@ install:
           fi
           phpenv global $PHP
           rm vendor/composer/package-versions-deprecated -Rf
-          ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb ^1.9.0)
+          ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb)
           tfold 'composer update' $COMPOSER_UP
           tfold 'phpunit install' ./phpunit install
           if [[ $deps = high ]]; then

From a89ced8eacd3b29e27c00609f34bf57040de09c9 Mon Sep 17 00:00:00 2001
From: bahram <a.bahrami9675@gmail.com>
Date: Sat, 13 Feb 2021 22:42:31 +0330
Subject: [PATCH 57/87] [Intl] fix Locale::getFallback() throwing exception on
 long $locale

---
 src/Symfony/Component/Intl/Locale.php           |  3 ++-
 src/Symfony/Component/Intl/Tests/LocaleTest.php | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
index 0373844e76c51..3d07e42b13baa 100644
--- a/src/Symfony/Component/Intl/Locale.php
+++ b/src/Symfony/Component/Intl/Locale.php
@@ -68,7 +68,8 @@ public static function getDefaultFallback(): ?string
     public static function getFallback(string $locale): ?string
     {
         if (\function_exists('locale_parse')) {
-            $localeSubTags = locale_parse($locale);
+            $localeSubTags = locale_parse($locale) ?? ['language' => $locale];
+
             if (1 === \count($localeSubTags)) {
                 if ('root' !== self::$defaultFallback && self::$defaultFallback === $localeSubTags['language']) {
                     return 'root';
diff --git a/src/Symfony/Component/Intl/Tests/LocaleTest.php b/src/Symfony/Component/Intl/Tests/LocaleTest.php
index fd998612a7eae..fce214242a47a 100644
--- a/src/Symfony/Component/Intl/Tests/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/LocaleTest.php
@@ -70,4 +70,16 @@ public function testDefaultRootFallback()
 
         Locale::setDefaultFallback($prev);
     }
+
+    /**
+     * @requires function locale_parse
+     */
+    public function testLongLocaleFallback()
+    {
+        $locale = 'LC_TYPE=fr_FR.UTF-8;LC_NUMERIC=C;LC_TIME=fr_FR.UTF-8;LC_COLLATE=fr_FR.UTF-8;'.
+            'LC_MONETARY=fr_FR.UTF-8;LC_MESSAGES=fr_FR.UTF-8;LC_PAPER=fr_FR.UTF-8;LC_NAME=fr_FR.UTF-8;'.
+            'LC_ADDRESS=fr_FR.UTF-8;LC_TELEPHONE=fr_FR.UTF-8;LC_MEASUREMENT=fr_FR.UTF-8;LC_IDENTIFICATION=fr_FR.UTF-8';
+
+        $this->assertNull(Locale::getFallback($locale));
+    }
 }

From 251ce8f92489cfb49f9a15c1c793b1befad01dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20Schlu=CC=88ter?= <malte.schlueter@qossmic.com>
Date: Thu, 18 Feb 2021 11:52:56 +0100
Subject: [PATCH 58/87] Add different header notations to tests

---
 .../Component/BrowserKit/Tests/HttpBrowserTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
index 4cd44aff70eef..8125d1a77c919 100644
--- a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -63,6 +63,18 @@ public function validContentTypes()
             ['POST', 'http://example.com/', [], [], ['CONTENT_TYPE' => 'application/json'], '["content"]'],
             ['POST', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
         ];
+        yield 'custom header with HTTP_ prefix' => [
+            ['PUT', 'http://example.com/', [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '["content"]'],
+            ['PUT', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
+        ];
+        yield 'modify notation of custom header with HTTP_ prefix' => [
+            ['PUT', 'http://example.com/', [], [], ['HTTP_Content-Type' => 'application/json'], '["content"]'],
+            ['PUT', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
+        ];
+        yield 'modify notation of custom header' => [
+            ['PUT', 'http://example.com/', [], [], ['Content-Type' => 'application/json'], '["content"]'],
+            ['PUT', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
+        ];
     }
 
     public function testMultiPartRequestWithSingleFile()

From 15f021f825b6f6affbe6720a7ea61a99486d3c8a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 18 Feb 2021 23:23:29 +0100
Subject: [PATCH 59/87] Stop using deprecated ArrayCache from Doctrine

---
 .../Bridge/Doctrine/Test/DoctrineTestHelper.php    |  3 ---
 .../DependencyInjection/FrameworkExtension.php     |  4 ++--
 .../Resources/config/annotations.xml               | 14 ++++++++++++--
 .../DependencyInjection/FrameworkExtensionTest.php |  2 +-
 .../Component/Validator/ValidatorBuilder.php       | 11 +++++++++--
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
index 2ad16dcd4de24..d3d25c17b275d 100644
--- a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
+++ b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\Test;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -62,8 +61,6 @@ public static function createTestConfiguration()
         $config->setProxyDir(sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
         $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader()));
-        $config->setQueryCacheImpl(new ArrayCache());
-        $config->setMetadataCacheImpl(new ArrayCache());
 
         return $config;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 31a3f58b0bc34..9d46e259fd263 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1447,8 +1447,8 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 }
 
                 $container
-                    ->getDefinition('annotations.filesystem_cache')
-                    ->replaceArgument(0, $cacheDir)
+                    ->getDefinition('annotations.filesystem_cache_adapter')
+                    ->replaceArgument(2, $cacheDir)
                 ;
 
                 $cacheService = 'annotations.filesystem_cache';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 69947a35f8df4..2e56f1deb62f3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -24,15 +24,25 @@
         <service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader">
             <argument type="service" id="annotations.reader" />
             <argument type="service">
-                <service class="Doctrine\Common\Cache\ArrayCache" />
+                <service class="Symfony\Component\Cache\DoctrineProvider">
+                    <argument type="service">
+                        <service class="Symfony\Component\Cache\Adapter\ArrayAdapter" />
+                    </argument>
+                </service>
             </argument>
             <argument /><!-- Debug-Flag -->
         </service>
 
-        <service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache">
+        <service id="annotations.filesystem_cache_adapter" class="Symfony\Component\Cache\Adapter\FilesystemAdapter">
+            <argument />
+            <argument>0</argument>
             <argument /><!-- Cache-Directory -->
         </service>
 
+        <service id="annotations.filesystem_cache" class="Symfony\Component\Cache\DoctrineProvider">
+            <argument type="service" id="annotations.filesystem_cache_adapter" />
+        </service>
+
         <service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer">
             <argument type="service" id="annotations.reader" />
             <argument>%kernel.cache_dir%/annotations.php</argument>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 7bc3edbfb859f..db26edcfedebf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -997,7 +997,7 @@ public function testAnnotations()
         $container->addCompilerPass(new TestAnnotationsPass());
         $container->compile();
 
-        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
+        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache_adapter')->getArgument(2));
         $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotation_reader')->getArgument(1));
     }
 
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
index 17e4fbd02490e..87267a45ac04b 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -15,7 +15,10 @@
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\CacheProvider;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\DoctrineProvider;
 use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Exception\LogicException;
@@ -197,11 +200,15 @@ public function enableAnnotationMapping(Reader $annotationReader = null)
         }
 
         if (null === $annotationReader) {
-            if (!class_exists(AnnotationReader::class) || !class_exists(ArrayCache::class)) {
+            if (!class_exists(AnnotationReader::class) || !class_exists(CacheProvider::class)) {
                 throw new LogicException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and doctrine/cache to be installed.');
             }
 
-            $annotationReader = new CachedReader(new AnnotationReader(), new ArrayCache());
+            if (class_exists(ArrayAdapter::class)) {
+                $annotationReader = new CachedReader(new AnnotationReader(), new DoctrineProvider(new ArrayAdapter()));
+            } else {
+                $annotationReader = new CachedReader(new AnnotationReader(), new ArrayCache());
+            }
         }
 
         $this->annotationReader = $annotationReader;

From 1329689acec3f8cfbcf1f75902ba4617c38e2831 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 19 Feb 2021 10:48:50 +0100
Subject: [PATCH 60/87] cs fix

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

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 92b48ed888946..37ad34954d3a4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -76,7 +76,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
         $reflectionClass = null;
 
         foreach ($conditionals as $interface => $instanceofDefs) {
-            if ($interface !== $class && !(null === $reflectionClass ? $reflectionClass = ($container->getReflectionClass($class, false) ?: false) : $reflectionClass)) {
+            if ($interface !== $class && !($reflectionClass ?? $reflectionClass = $container->getReflectionClass($class, false) ?: false)) {
                 continue;
             }
 

From d1c3e21effe4c8329bc904a51e6a689b4da12e9e Mon Sep 17 00:00:00 2001
From: Erik Saunier <erik.saunier@gmail.com>
Date: Wed, 17 Feb 2021 14:06:36 +0100
Subject: [PATCH 61/87] Add Symfony Armenian Translations

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

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
index bdba3fe81448f..10ac326fb1600 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf
@@ -14,6 +14,126 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>CSRF արժեքը անթույլատրելի է. Փորձեք նորից ուղարկել ձևը։</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>Այս արժեքը վավեր HTML5 գույն չէ։</target>
+            </trans-unit>
+            <trans-unit id="100">
+                <source>Please enter a valid birthdate.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր ծննդյան ամսաթիվ։</target>
+            </trans-unit>
+            <trans-unit id="101">
+                <source>The selected choice is invalid.</source>
+                <target>Ընտրված ընտրությունն անվավեր է։</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>The collection is invalid.</source>
+                <target>Համախումբն անվավեր է։</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>Please select a valid color.</source>
+                <target>Խնդրում ենք ընտրել վավեր գույն։</target>
+            </trans-unit>
+            <trans-unit id="104">
+                <source>Please select a valid country.</source>
+                <target>Խնդրում ենք ընտրել վավեր երկիր։</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>Please select a valid currency.</source>
+                <target>Խնդրում ենք ընտրել վավեր արժույթ։</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>Please choose a valid date interval.</source>
+                <target>Խնդրում ենք ընտրել ճիշտ ամսաթվերի միջակայք։</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Please enter a valid date and time.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր ամսաթիվ և ժամ։</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Please enter a valid date.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր ամսաթիվ։</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Please select a valid file.</source>
+                <target>Խնդրում ենք ընտրել վավեր ֆայլ։</target>
+            </trans-unit>
+            <trans-unit id="110">
+                <source>The hidden field is invalid.</source>
+                <target>Թաքնված դաշտը անվավեր է։</target>
+            </trans-unit>
+            <trans-unit id="111">
+                <source>Please enter an integer.</source>
+                <target>Խնդրում ենք մուտքագրել ամբողջ թիվ։</target>
+            </trans-unit>
+            <trans-unit id="112">
+                <source>Please select a valid language.</source>
+                <target>Խնդրում ենք ընտրել վավեր լեզու։</target>
+            </trans-unit>
+            <trans-unit id="113">
+                <source>Please select a valid locale.</source>
+                <target>Խնդրում ենք ընտրել վավեր տեղայնացում։</target>
+            </trans-unit>
+            <trans-unit id="114">
+                <source>Please enter a valid money amount.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր գումար։</target>
+            </trans-unit>
+            <trans-unit id="115">
+                <source>Please enter a number.</source>
+                <target>Խնդրում ենք մուտքագրել համար։</target>
+            </trans-unit>
+            <trans-unit id="116">
+                <source>The password is invalid.</source>
+                <target>Գաղտնաբառն անվավեր է։</target>
+            </trans-unit>
+            <trans-unit id="117">
+                <source>Please enter a percentage value.</source>
+                <target>Խնդրում ենք մուտքագրել տոկոսային արժեք։</target>
+            </trans-unit>
+            <trans-unit id="118">
+                <source>The values do not match.</source>
+                <target>Արժեքները չեն համընկնում։</target>
+            </trans-unit>
+            <trans-unit id="119">
+                <source>Please enter a valid time.</source>
+                <target>Մուտքագրեք վավեր ժամանակ։</target>
+            </trans-unit>
+            <trans-unit id="120">
+                <source>Please select a valid timezone.</source>
+                <target>Խնդրում ենք ընտրել վավեր ժամային գոտի։</target>
+            </trans-unit>
+            <trans-unit id="121">
+                <source>Please enter a valid URL.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր URL։</target>
+            </trans-unit>
+            <trans-unit id="122">
+                <source>Please enter a valid search term.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր որոնման տերմին։</target>
+            </trans-unit>
+            <trans-unit id="123">
+                <source>Please provide a valid phone number.</source>
+                <target>Խնդրում ենք տրամադրել վավեր հեռախոսահամար։</target>
+            </trans-unit>
+            <trans-unit id="124">
+                <source>The checkbox has an invalid value.</source>
+                <target>Նշման վանդակը անվավեր արժեք ունի։</target>
+            </trans-unit>
+            <trans-unit id="125">
+                <source>Please enter a valid email address.</source>
+                <target>Խնդրում ենք մուտքագրել վավեր էլ-հասցե։</target>
+            </trans-unit>
+            <trans-unit id="126">
+                <source>Please select a valid option.</source>
+                <target>Խնդրում ենք ընտրել ճիշտ տարբերակ։</target>
+            </trans-unit>
+            <trans-unit id="127">
+                <source>Please select a valid range.</source>
+                <target>Խնդրում ենք ընտրել վավեր տիրույթ։</target>
+            </trans-unit>
+            <trans-unit id="128">
+                <source>Please enter a valid week.</source>
+                <target>Մուտքագրեք վավեր շաբաթ։</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From e4911554e38968b2cc30ba2c87414b077869e08e Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Fri, 19 Feb 2021 17:17:21 -0500
Subject: [PATCH 62/87] [Form] Ignoring invalid forms from delete_empty
 behavior in CollectionType

---
 .../Core/EventListener/ResizeFormListener.php |  4 ++++
 .../EventListener/ResizeFormListenerTest.php  |  6 ++---
 .../Core/Type/CollectionTypeTest.php          | 23 +++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index d978117552d90..813456b95e2a6 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -132,6 +132,10 @@ public function onSubmit(FormEvent $event)
             $previousData = $form->getData();
             /** @var FormInterface $child */
             foreach ($form as $name => $child) {
+                if (!$child->isValid() || !$child->isSynchronized()) {
+                    continue;
+                }
+
                 $isNew = !isset($previousData[$name]);
                 $isEmpty = \is_callable($this->deleteEmpty) ? ($this->deleteEmpty)($child->getData()) : $child->isEmpty();
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index 5e0fc84f02d70..ac59919e7fec7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -255,7 +255,7 @@ public function testOnSubmitDeleteEmptyNotCompoundEntriesIfAllowDelete()
 
         $data = [0 => 'first', 1 => ''];
         foreach ($data as $child => $dat) {
-            $this->form->get($child)->setData($dat);
+            $this->form->get($child)->submit($dat);
         }
         $event = new FormEvent($this->form, $data);
         $listener = new ResizeFormListener('text', [], false, true, true);
@@ -282,11 +282,11 @@ public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
 
         $data = ['0' => ['name' => 'John'], '1' => ['name' => '']];
         foreach ($data as $child => $dat) {
-            $this->form->get($child)->setData($dat);
+            $this->form->get($child)->submit($dat);
         }
         $event = new FormEvent($this->form, $data);
         $callback = function ($data) {
-            return '' === $data['name'];
+            return null === $data['name'];
         };
         $listener = new ResizeFormListener('text', [], false, true, $callback);
         $listener->onSubmit($event);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
index e98a0c17443f1..b66ca07488578 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\Tests\Fixtures\Author;
 use Symfony\Component\Form\Tests\Fixtures\AuthorType;
@@ -211,6 +212,28 @@ public function testResizedDownIfSubmittedWithCompoundEmptyDataAndDeleteEmpty()
         $this->assertEquals([new Author('s_first', 's_last')], $form->getData());
     }
 
+    public function testNotDeleteEmptyIfInvalid()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'entry_type' => ChoiceType::class,
+            'entry_options' => [
+                'choices' => ['a', 'b'],
+            ],
+            'allow_add' => true,
+            'allow_delete' => true,
+            'delete_empty' => true,
+        ]);
+
+        $form->submit(['a', 'x', '']);
+
+        $this->assertSame(['a'], $form->getData());
+        $this->assertCount(2, $form);
+        $this->assertTrue($form->has('1'));
+        $this->assertFalse($form[1]->isValid());
+        $this->assertNull($form[1]->getData());
+        $this->assertSame('x', $form[1]->getViewData());
+    }
+
     public function testNotResizedIfSubmittedWithExtraData()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [

From 9bb4b3106d33c58e7954c4757a34169629c97c2c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 22 Feb 2021 12:06:44 +0100
Subject: [PATCH 63/87] [Cache] fix setting items' metadata on commit()

---
 .../Component/Cache/Adapter/AbstractTagAwareAdapter.php       | 1 +
 src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php       | 1 +
 .../Cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php     | 1 -
 src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php  | 1 -
 .../Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php      | 1 -
 .../Cache/Tests/{Traits => Adapter}/PdoPruneableTrait.php     | 2 +-
 .../Cache/Tests/Adapter/PredisTagAwareAdapterTest.php         | 1 -
 .../Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php  | 1 -
 .../Cache/Tests/Adapter/RedisTagAwareAdapterTest.php          | 1 -
 .../Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php     | 1 -
 .../Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php   | 1 -
 .../Component/Cache/Tests/Adapter/TagAwareAdapterTest.php     | 1 -
 .../Cache/Tests/{Traits => Adapter}/TagAwareTestTrait.php     | 4 +++-
 src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php     | 2 +-
 src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php | 2 +-
 15 files changed, 8 insertions(+), 13 deletions(-)
 rename src/Symfony/Component/Cache/Tests/{Traits => Adapter}/PdoPruneableTrait.php (95%)
 rename src/Symfony/Component/Cache/Tests/{Traits => Adapter}/TagAwareTestTrait.php (96%)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
index d5c6aae572bb4..106d8821b862c 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -110,6 +110,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix, $defaultLifet
                     }
 
                     $byLifetime[$ttl][$getId($key)] = $value;
+                    $item->metadata = $item->newMetadata;
                 }
 
                 return $byLifetime;
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 9d5fefa4fb40b..9a37596865e6c 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -83,6 +83,7 @@ static function ($deferred) {
                 $tagsByKey = [];
                 foreach ($deferred as $key => $item) {
                     $tagsByKey[$key] = $item->newMetadata[CacheItem::METADATA_TAGS] ?? [];
+                    $item->metadata = $item->newMetadata;
                 }
 
                 return $tagsByKey;
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php
index a9f3407eae6da..393210e16e74e 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/FilesystemTagAwareAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\FilesystemTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group time-sensitive
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
index dbd93bdd71f03..3540155685e81 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
 
 /**
  * @group time-sensitive
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
index 0e45324c0c12e..5c5f60a51bd67 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -14,7 +14,6 @@
 use Doctrine\DBAL\DriverManager;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\PdoAdapter;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
 
 /**
  * @group time-sensitive
diff --git a/src/Symfony/Component/Cache/Tests/Traits/PdoPruneableTrait.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoPruneableTrait.php
similarity index 95%
rename from src/Symfony/Component/Cache/Tests/Traits/PdoPruneableTrait.php
rename to src/Symfony/Component/Cache/Tests/Adapter/PdoPruneableTrait.php
index baca2df8b3ba9..23f977fd6ee5b 100644
--- a/src/Symfony/Component/Cache/Tests/Traits/PdoPruneableTrait.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoPruneableTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Cache\Tests\Traits;
+namespace Symfony\Component\Cache\Tests\Adapter;
 
 trait PdoPruneableTrait
 {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php
index c072be952f1a4..6cffbde7926f1 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group integration
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php
index 9b05edd9154f0..21120d606ac18 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisTagAwareClusterAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group integration
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php
index 0e73e81e87043..5c82016be2adb 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 use Symfony\Component\Cache\Traits\RedisProxy;
 
 /**
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php
index 5527789d79a53..3ec500a9010e9 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareArrayAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group integration
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php
index e527223fd7de8..50f078c04d4b0 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisTagAwareClusterAdapterTest.php
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 use Symfony\Component\Cache\Traits\RedisClusterProxy;
 
 /**
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
index ba2636cfe2fdc..d2f6b2877fcb6 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Tests\Fixtures\PrunableAdapter;
-use Symfony\Component\Cache\Tests\Traits\TagAwareTestTrait;
 
 /**
  * @group time-sensitive
diff --git a/src/Symfony/Component/Cache/Tests/Traits/TagAwareTestTrait.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareTestTrait.php
similarity index 96%
rename from src/Symfony/Component/Cache/Tests/Traits/TagAwareTestTrait.php
rename to src/Symfony/Component/Cache/Tests/Adapter/TagAwareTestTrait.php
index f0ad55720d0c0..2f9b56027cb9a 100644
--- a/src/Symfony/Component/Cache/Tests/Traits/TagAwareTestTrait.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareTestTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Cache\Tests\Traits;
+namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Symfony\Component\Cache\CacheItem;
 
@@ -150,7 +150,9 @@ public function testGetMetadata()
         $pool = $this->createCachePool();
 
         $i = $pool->getItem('k');
+        $this->assertSame([], $i->getMetadata());
         $pool->save($i->tag('foo'));
+        $this->assertSame(['foo' => 'foo'], $i->getMetadata()[CacheItem::METADATA_TAGS]);
 
         $i = $pool->getItem('k');
         $this->assertSame(['foo' => 'foo'], $i->getMetadata()[CacheItem::METADATA_TAGS]);
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php
index 204211f06be2d..cf0ba1e52c011 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PdoCacheTest.php
@@ -13,7 +13,7 @@
 
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Simple\PdoCache;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+use Symfony\Component\Cache\Tests\Adapter\PdoPruneableTrait;
 
 /**
  * @group time-sensitive
diff --git a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
index 1629959b43434..e35ab567340d5 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php
@@ -14,7 +14,7 @@
 use Doctrine\DBAL\DriverManager;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Simple\PdoCache;
-use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
+use Symfony\Component\Cache\Tests\Adapter\PdoPruneableTrait;
 
 /**
  * @group time-sensitive

From 27bba684d88951f7475af027731b3701c1574197 Mon Sep 17 00:00:00 2001
From: Nicolas LHommet <lhommetn@gmail.com>
Date: Thu, 18 Feb 2021 17:20:50 +0100
Subject: [PATCH 64/87] [Routing] fix conflict with param named class in
 attribute

---
 .../Routing/Loader/AnnotationFileLoader.php   |  7 +-
 .../Fixtures/Attributes/FooAttributes.php     | 16 +++++
 ...tributesClassParamAfterCommaController.php | 18 +++++
 ...esClassParamAfterParenthesisController.php | 18 +++++
 ...esClassParamInlineAfterCommaController.php | 12 ++++
 ...sParamInlineAfterParenthesisController.php | 12 ++++
 ...sParamInlineQuotedAfterCommaController.php | 12 ++++
 ...InlineQuotedAfterParenthesisController.php | 12 ++++
 ...esClassParamQuotedAfterCommaController.php | 17 +++++
 ...sParamQuotedAfterParenthesisController.php | 17 +++++
 .../Tests/Loader/AnnotationFileLoaderTest.php | 68 +++++++++++++++++++
 11 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/Attributes/FooAttributes.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterCommaController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterParenthesisController.php

diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
index 8f9af3a8f76d5..cd262f1ad1ebb 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php
@@ -97,12 +97,10 @@ protected function findClass($file)
 
         $nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];
         if (\defined('T_NAME_QUALIFIED')) {
-            $nsTokens[T_NAME_QUALIFIED] = true;
+            $nsTokens[\T_NAME_QUALIFIED] = true;
         }
-
         for ($i = 0; isset($tokens[$i]); ++$i) {
             $token = $tokens[$i];
-
             if (!isset($token[1])) {
                 continue;
             }
@@ -124,6 +122,9 @@ protected function findClass($file)
                 $skipClassToken = false;
                 for ($j = $i - 1; $j > 0; --$j) {
                     if (!isset($tokens[$j][1])) {
+                        if ('(' === $tokens[$j] || ',' === $tokens[$j]) {
+                            $skipClassToken = true;
+                        }
                         break;
                     }
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/Attributes/FooAttributes.php b/src/Symfony/Component/Routing/Tests/Fixtures/Attributes/FooAttributes.php
new file mode 100644
index 0000000000000..9edd0ece2e3c5
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/Attributes/FooAttributes.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\Attributes;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class FooAttributes
+{
+    public string $class;
+    public array $foo = [];
+
+    public function __construct(string $class, array $foo)
+    {
+        $this->class = $class;
+        $this->foo = $foo;
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php
new file mode 100644
index 0000000000000..3fdf55f30c373
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(
+    foo: [
+        'bar' => ['foo','bar'],
+        'foo'
+    ],
+    class: User::class
+)]
+class AttributesClassParamAfterCommaController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php
new file mode 100644
index 0000000000000..06edcabf6d278
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(
+    class: User::class,
+    foo: [
+        'bar' => ['foo','bar'],
+        'foo'
+    ]
+)]
+class AttributesClassParamAfterParenthesisController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php
new file mode 100644
index 0000000000000..4b47967f139a3
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(foo: ['bar' => ['foo','bar'],'foo'],class: User::class)]
+class AttributesClassParamInlineAfterCommaController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php
new file mode 100644
index 0000000000000..876cdc33f73bc
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(class: User::class,foo: ['bar' => ['foo','bar'],'foo'])]
+class AttributesClassParamInlineAfterParenthesisController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php
new file mode 100644
index 0000000000000..471efd305aa62
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(foo: ['bar' => ['foo','bar'],'foo'],class: 'Symfony\Component\Security\Core\User\User')]
+class AttributesClassParamInlineQuotedAfterCommaController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php
new file mode 100644
index 0000000000000..dc0ea7a82096a
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+use Symfony\Component\Security\Core\User\User;
+
+#[FooAttributes(class: 'Symfony\Component\Security\Core\User\User',foo: ['bar' => ['foo','bar'],'foo'])]
+class AttributesClassParamInlineQuotedAfterParenthesisController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterCommaController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterCommaController.php
new file mode 100644
index 0000000000000..1d82cd1c61216
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterCommaController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+
+#[FooAttributes(
+    foo: [
+        'bar' => ['foo','bar'],
+        'foo'
+    ],
+    class: 'Symfony\Component\Security\Core\User\User'
+)]
+class AttributesClassParamQuotedAfterCommaController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterParenthesisController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterParenthesisController.php
new file mode 100644
index 0000000000000..b1456c758a027
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterParenthesisController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributesFixtures;
+
+use Symfony\Component\Routing\Tests\Fixtures\Attributes\FooAttributes;
+
+#[FooAttributes(
+    class: 'Symfony\Component\Security\Core\User\User',
+    foo: [
+        'bar' => ['foo','bar'],
+        'foo'
+    ]
+)]
+class AttributesClassParamQuotedAfterParenthesisController
+{
+
+}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
index ff2dd53909aa5..ee66ef1804ed3 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -85,4 +85,72 @@ public function testSupports()
         $this->assertTrue($this->loader->supports($fixture, 'annotation'), '->supports() checks the resource type if specified');
         $this->assertFalse($this->loader->supports($fixture, 'foo'), '->supports() checks the resource type if specified');
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testLoadAttributesClassAfterComma()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamAfterCommaController.php');
+    }
+
+    public function testLoadAttributesInlineClassAfterComma()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamInlineAfterCommaController.php');
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testLoadAttributesQuotedClassAfterComma()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterCommaController.php');
+    }
+
+    public function testLoadAttributesInlineQuotedClassAfterComma()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterCommaController.php');
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testLoadAttributesClassAfterParenthesis()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamAfterParenthesisController.php');
+    }
+
+    public function testLoadAttributesInlineClassAfterParenthesis()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamInlineAfterParenthesisController.php');
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testLoadAttributesQuotedClassAfterParenthesis()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamQuotedAfterParenthesisController.php');
+    }
+
+    public function testLoadAttributesInlineQuotedClassAfterParenthesis()
+    {
+        $this->reader->expects($this->once())->method('getClassAnnotation');
+
+        $this->loader->load(__DIR__.'/../Fixtures/AttributesFixtures/AttributesClassParamInlineQuotedAfterParenthesisController.php');
+    }
 }

From f8e10094a43f01478040593bad111387d93145cf Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 21 Feb 2021 20:10:16 +0100
Subject: [PATCH 65/87] Switched to non-null defaults in exception constructors

---
 .../FrameworkBundle/Routing/DelegatingLoader.php     |  2 +-
 .../FileLoaderImportCircularReferenceException.php   |  2 +-
 .../Config/Exception/FileLoaderLoadException.php     | 12 ++++++------
 .../Component/Config/Loader/DelegatingLoader.php     |  2 +-
 src/Symfony/Component/Config/Loader/FileLoader.php   |  2 +-
 src/Symfony/Component/Config/Loader/Loader.php       |  2 +-
 .../Tests/Exception/LoaderLoadExceptionTest.php      | 10 +++++-----
 .../Console/Exception/CommandNotFoundException.php   | 10 +++++-----
 .../Exception/AccessDeniedHttpException.php          |  8 ++++----
 .../HttpKernel/Exception/BadRequestHttpException.php |  8 ++++----
 .../HttpKernel/Exception/ConflictHttpException.php   |  8 ++++----
 .../HttpKernel/Exception/GoneHttpException.php       |  8 ++++----
 .../Component/HttpKernel/Exception/HttpException.php |  2 +-
 .../Exception/LengthRequiredHttpException.php        |  8 ++++----
 .../Exception/MethodNotAllowedHttpException.php      | 10 +++++-----
 .../Exception/NotAcceptableHttpException.php         |  8 ++++----
 .../HttpKernel/Exception/NotFoundHttpException.php   |  8 ++++----
 .../Exception/PreconditionFailedHttpException.php    |  8 ++++----
 .../Exception/PreconditionRequiredHttpException.php  |  8 ++++----
 .../Exception/ServiceUnavailableHttpException.php    | 10 +++++-----
 .../Exception/TooManyRequestsHttpException.php       | 10 +++++-----
 .../Exception/UnauthorizedHttpException.php          | 10 +++++-----
 .../Exception/UnprocessableEntityHttpException.php   |  8 ++++----
 .../Exception/UnsupportedMediaTypeHttpException.php  |  8 ++++----
 .../Exception/AccessDeniedHttpExceptionTest.php      |  3 ++-
 .../Tests/Exception/BadRequestHttpExceptionTest.php  |  3 ++-
 .../Tests/Exception/ConflictHttpExceptionTest.php    |  3 ++-
 .../Tests/Exception/GoneHttpExceptionTest.php        |  3 ++-
 .../HttpKernel/Tests/Exception/HttpExceptionTest.php |  6 +++---
 .../Exception/LengthRequiredHttpExceptionTest.php    |  3 ++-
 .../Exception/MethodNotAllowedHttpExceptionTest.php  |  5 +++--
 .../Exception/NotAcceptableHttpExceptionTest.php     |  3 ++-
 .../Tests/Exception/NotFoundHttpExceptionTest.php    |  3 ++-
 .../PreconditionFailedHttpExceptionTest.php          |  3 ++-
 .../PreconditionRequiredHttpExceptionTest.php        |  3 ++-
 .../ServiceUnavailableHttpExceptionTest.php          |  5 +++--
 .../Exception/TooManyRequestsHttpExceptionTest.php   |  5 +++--
 .../Exception/UnauthorizedHttpExceptionTest.php      |  5 +++--
 .../UnprocessableEntityHttpExceptionTest.php         |  3 ++-
 .../UnsupportedMediaTypeHttpExceptionTest.php        |  3 ++-
 .../Mailer/Exception/HttpTransportException.php      |  2 +-
 .../Routing/Exception/MethodNotAllowedException.php  |  7 +++++--
 .../Component/Routing/RouteCollectionBuilder.php     |  4 ++--
 .../Component/Yaml/Exception/ParseException.php      |  1 -
 44 files changed, 131 insertions(+), 114 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
index 5a2ba7dba1949..47ca299e54f4b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
@@ -77,7 +77,7 @@ public function load($resource, $type = null)
             // - this handles the case and prevents the second fatal error
             //   by triggering an exception beforehand.
 
-            throw new LoaderLoadException($resource, null, null, null, $type);
+            throw new LoaderLoadException($resource, null, 0, null, $type);
         }
         $this->loading = true;
 
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php
index 8c5e736524c75..aa27f9869b7e2 100644
--- a/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php
+++ b/src/Symfony/Component/Config/Exception/FileLoaderImportCircularReferenceException.php
@@ -18,7 +18,7 @@
  */
 class FileLoaderImportCircularReferenceException extends LoaderLoadException
 {
-    public function __construct(array $resources, int $code = null, \Throwable $previous = null)
+    public function __construct(array $resources, ?int $code = 0, \Throwable $previous = null)
     {
         $message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
 
diff --git a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
index 16beec5930c82..e53106a11aa0f 100644
--- a/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
+++ b/src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
@@ -21,13 +21,13 @@
 class FileLoaderLoadException extends \Exception
 {
     /**
-     * @param string     $resource       The resource that could not be imported
-     * @param string     $sourceResource The original resource importing the new resource
-     * @param int        $code           The error code
-     * @param \Throwable $previous       A previous exception
-     * @param string     $type           The type of resource
+     * @param string          $resource       The resource that could not be imported
+     * @param string|null     $sourceResource The original resource importing the new resource
+     * @param int|null        $code           The error code
+     * @param \Throwable|null $previous       A previous exception
+     * @param string|null     $type           The type of resource
      */
-    public function __construct(string $resource, string $sourceResource = null, int $code = null, \Throwable $previous = null, string $type = null)
+    public function __construct(string $resource, string $sourceResource = null, ?int $code = 0, \Throwable $previous = null, string $type = null)
     {
         $message = '';
         if ($previous) {
diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php
index e40e57d7af6aa..fd5c8e957049b 100644
--- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php
+++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php
@@ -34,7 +34,7 @@ public function __construct(LoaderResolverInterface $resolver)
     public function load($resource, $type = null)
     {
         if (false === $loader = $this->resolver->resolve($resource, $type)) {
-            throw new LoaderLoadException($resource, null, null, null, $type);
+            throw new LoaderLoadException($resource, null, 0, null, $type);
         }
 
         return $loader->load($resource, $type);
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 1ca59665a41f8..b7c2491b5b023 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -177,7 +177,7 @@ private function doImport($resource, string $type = null, bool $ignoreErrors = f
                     throw $e;
                 }
 
-                throw new LoaderLoadException($resource, $sourceResource, null, $e, $type);
+                throw new LoaderLoadException($resource, $sourceResource, 0, $e, $type);
             }
         }
 
diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php
index 698ab40afbf3d..a83088e432da9 100644
--- a/src/Symfony/Component/Config/Loader/Loader.php
+++ b/src/Symfony/Component/Config/Loader/Loader.php
@@ -70,7 +70,7 @@ public function resolve($resource, $type = null)
         $loader = null === $this->resolver ? false : $this->resolver->resolve($resource, $type);
 
         if (false === $loader) {
-            throw new LoaderLoadException($resource, null, null, null, $type);
+            throw new LoaderLoadException($resource, null, 0, null, $type);
         }
 
         return $loader;
diff --git a/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php
index 60650c3daf5e4..67c40edd2c333 100644
--- a/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php
+++ b/src/Symfony/Component/Config/Tests/Exception/LoaderLoadExceptionTest.php
@@ -24,13 +24,13 @@ public function testMessageCannotLoadResource()
 
     public function testMessageCannotLoadResourceWithType()
     {
-        $exception = new LoaderLoadException('resource', null, null, null, 'foobar');
+        $exception = new LoaderLoadException('resource', null, 0, null, 'foobar');
         $this->assertEquals('Cannot load resource "resource". Make sure there is a loader supporting the "foobar" type.', $exception->getMessage());
     }
 
     public function testMessageCannotLoadResourceWithAnnotationType()
     {
-        $exception = new LoaderLoadException('resource', null, null, null, 'annotation');
+        $exception = new LoaderLoadException('resource', null, 0, null, 'annotation');
         $this->assertEquals('Cannot load resource "resource". Make sure annotations are installed and enabled.', $exception->getMessage());
     }
 
@@ -56,7 +56,7 @@ public function testMessageHasPreviousErrorWithDotAndUnableToLoad()
         $exception = new LoaderLoadException(
             'resource',
             null,
-            null,
+            0,
             new \Exception('There was a previous error with an ending dot.')
         );
         $this->assertEquals(
@@ -70,7 +70,7 @@ public function testMessageHasPreviousErrorWithoutDotAndUnableToLoad()
         $exception = new LoaderLoadException(
             'resource',
             null,
-            null,
+            0,
             new \Exception('There was a previous error with no ending dot')
         );
         $this->assertEquals(
@@ -84,7 +84,7 @@ public function testMessageHasPreviousErrorAndUnableToLoadBundle()
         $exception = new LoaderLoadException(
             '@resource',
             null,
-            null,
+            0,
             new \Exception('There was a previous error with an ending dot.')
         );
         $this->assertEquals(
diff --git a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php
index 69d5cb996a084..590a71c779642 100644
--- a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php
+++ b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php
@@ -21,10 +21,10 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce
     private $alternatives;
 
     /**
-     * @param string     $message      Exception message to throw
-     * @param array      $alternatives List of similar defined names
-     * @param int        $code         Exception code
-     * @param \Throwable $previous     Previous exception used for the exception chaining
+     * @param string          $message      Exception message to throw
+     * @param string[]        $alternatives List of similar defined names
+     * @param int             $code         Exception code
+     * @param \Throwable|null $previous     Previous exception used for the exception chaining
      */
     public function __construct(string $message, array $alternatives = [], int $code = 0, \Throwable $previous = null)
     {
@@ -34,7 +34,7 @@ public function __construct(string $message, array $alternatives = [], int $code
     }
 
     /**
-     * @return array A list of similar defined names
+     * @return string[] A list of similar defined names
      */
     public function getAlternatives()
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
index 65e5f8c7866a5..f0c81111db543 100644
--- a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
@@ -18,11 +18,11 @@
 class AccessDeniedHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(403, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
index 7de91054b4731..8eccce1e163e7 100644
--- a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
@@ -17,11 +17,11 @@
 class BadRequestHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(400, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
index ebb86ba6e9e1e..72b8aa1274fe2 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
@@ -17,11 +17,11 @@
 class ConflictHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(409, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
index aea283a961cc5..6bba8159a2dce 100644
--- a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
@@ -17,11 +17,11 @@
 class GoneHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(410, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
index d822cd5d49a77..f3c0c3362f949 100644
--- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
@@ -21,7 +21,7 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface
     private $statusCode;
     private $headers;
 
-    public function __construct(int $statusCode, string $message = null, \Throwable $previous = null, array $headers = [], ?int $code = 0)
+    public function __construct(int $statusCode, ?string $message = '', \Throwable $previous = null, array $headers = [], ?int $code = 0)
     {
         $this->statusCode = $statusCode;
         $this->headers = $headers;
diff --git a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
index 44fb770b60c89..92f9c74daf5e1 100644
--- a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
@@ -17,11 +17,11 @@
 class LengthRequiredHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(411, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
index c15e46ffc3406..665ae355b47a2 100644
--- a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
@@ -17,12 +17,12 @@
 class MethodNotAllowedHttpException extends HttpException
 {
     /**
-     * @param array      $allow    An array of allowed methods
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string[]        $allow    An array of allowed methods
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int|null        $code     The internal exception code
      */
-    public function __construct(array $allow, string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    public function __construct(array $allow, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = [])
     {
         $headers['Allow'] = strtoupper(implode(', ', $allow));
 
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
index c5f5324b1a655..a985e86b9b02d 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
@@ -17,11 +17,11 @@
 class NotAcceptableHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(406, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
index 146b908a1e45d..3be305ee9ea5b 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
@@ -17,11 +17,11 @@
 class NotFoundHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(404, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
index e878b10ad355e..bdedea143d2e7 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
@@ -17,11 +17,11 @@
 class PreconditionFailedHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(412, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
index a6cb2f09a758e..bc26804830012 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
@@ -19,11 +19,11 @@
 class PreconditionRequiredHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(428, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
index c786ccf5f7fa7..1fb793dbf0b31 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
@@ -17,12 +17,12 @@
 class ServiceUnavailableHttpException extends HttpException
 {
     /**
-     * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
-     * @param string     $message    The internal exception message
-     * @param \Throwable $previous   The previous exception
-     * @param int        $code       The internal exception code
+     * @param int|string|null $retryAfter The number of seconds or HTTP-date after which the request may be retried
+     * @param string|null     $message    The internal exception message
+     * @param \Throwable|null $previous   The previous exception
+     * @param int|null        $code       The internal exception code
      */
-    public function __construct($retryAfter = null, string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    public function __construct($retryAfter = null, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = [])
     {
         if ($retryAfter) {
             $headers['Retry-After'] = $retryAfter;
diff --git a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
index b709f1a2f1e68..e1e47d048b248 100644
--- a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
@@ -19,12 +19,12 @@
 class TooManyRequestsHttpException extends HttpException
 {
     /**
-     * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
-     * @param string     $message    The internal exception message
-     * @param \Throwable $previous   The previous exception
-     * @param int        $code       The internal exception code
+     * @param int|string|null $retryAfter The number of seconds or HTTP-date after which the request may be retried
+     * @param string|null     $message    The internal exception message
+     * @param \Throwable|null $previous   The previous exception
+     * @param int|null        $code       The internal exception code
      */
-    public function __construct($retryAfter = null, string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    public function __construct($retryAfter = null, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = [])
     {
         if ($retryAfter) {
             $headers['Retry-After'] = $retryAfter;
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
index fb86c1ea95367..ddb48f116fb52 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
@@ -17,12 +17,12 @@
 class UnauthorizedHttpException extends HttpException
 {
     /**
-     * @param string     $challenge WWW-Authenticate challenge string
-     * @param string     $message   The internal exception message
-     * @param \Throwable $previous  The previous exception
-     * @param int        $code      The internal exception code
+     * @param string          $challenge WWW-Authenticate challenge string
+     * @param string|null     $message   The internal exception message
+     * @param \Throwable|null $previous  The previous exception
+     * @param int|null        $code      The internal exception code
      */
-    public function __construct(string $challenge, string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    public function __construct(string $challenge, ?string $message = '', \Throwable $previous = null, ?int $code = 0, array $headers = [])
     {
         $headers['WWW-Authenticate'] = $challenge;
 
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
index 93d4bcef69158..237340a574d79 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
@@ -17,11 +17,11 @@
 class UnprocessableEntityHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(422, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
index 7cda3a62028d5..74ddbfccbc9f3 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -17,11 +17,11 @@
 class UnsupportedMediaTypeHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Throwable $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string|null     $message  The internal exception message
+     * @param \Throwable|null $previous The previous exception
+     * @param int             $code     The internal exception code
      */
-    public function __construct(string $message = null, \Throwable $previous = null, int $code = 0, array $headers = [])
+    public function __construct(?string $message = '', \Throwable $previous = null, int $code = 0, array $headers = [])
     {
         parent::__construct(415, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
index 3a34cc47bce72..6fa356e70d277 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/AccessDeniedHttpExceptionTest.php
@@ -3,10 +3,11 @@
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class AccessDeniedHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new AccessDeniedHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php
index 462fd9cb1dbc3..231b406a9d0f1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/BadRequestHttpExceptionTest.php
@@ -3,10 +3,11 @@
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class BadRequestHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new BadRequestHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php
index 760600a10fc32..c923df2ce93b9 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/ConflictHttpExceptionTest.php
@@ -3,10 +3,11 @@
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ConflictHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new ConflictHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php
index 30dafe4922751..dd84acac36cbb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/GoneHttpExceptionTest.php
@@ -3,10 +3,11 @@
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
 use Symfony\Component\HttpKernel\Exception\GoneHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class GoneHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new GoneHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
index a9431f4b5a722..827f0fce3c766 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/HttpExceptionTest.php
@@ -32,7 +32,7 @@ public function testHeadersDefault()
      */
     public function testHeadersConstructor($headers)
     {
-        $exception = new HttpException(200, null, null, $headers);
+        $exception = new HttpException(200, '', null, $headers);
         $this->assertSame($headers, $exception->getHeaders());
     }
 
@@ -50,11 +50,11 @@ public function testThrowableIsAllowedForPrevious()
     {
         $previous = new class('Error of PHP 7+') extends \Error {
         };
-        $exception = $this->createException(null, $previous);
+        $exception = $this->createException('', $previous);
         $this->assertSame($previous, $exception->getPrevious());
     }
 
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new HttpException(200, $message, $previous, $headers, $code);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
index 8676d67238c14..dd74c81aaf41c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/LengthRequiredHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\LengthRequiredHttpException;
 
 class LengthRequiredHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new LengthRequiredHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
index efb0b50cafd00..8f657420ea0fe 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 class MethodNotAllowedHttpExceptionTest extends HttpExceptionTest
@@ -18,7 +19,7 @@ public function testWithHeaderConstruct()
             'Cache-Control' => 'public, s-maxage=1200',
         ];
 
-        $exception = new MethodNotAllowedHttpException(['get'], null, null, null, $headers);
+        $exception = new MethodNotAllowedHttpException(['get'], '', null, 0, $headers);
 
         $headers['Allow'] = 'GET';
 
@@ -35,7 +36,7 @@ public function testHeadersSetter($headers)
         $this->assertSame($headers, $exception->getHeaders());
     }
 
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new MethodNotAllowedHttpException(['get'], $message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
index 021c69e28954b..6d163faa4790d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/NotAcceptableHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 
 class NotAcceptableHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new NotAcceptableHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php
index 0bf369b1a0ce4..cce9f697dd4ea 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/NotFoundHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class NotFoundHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new NotFoundHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
index 04d79c499d037..b75c560d9baae 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionFailedHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
 
 class PreconditionFailedHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new PreconditionFailedHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
index 82076617a8779..2b9c6777ba0ff 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/PreconditionRequiredHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
 
 class PreconditionRequiredHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new PreconditionRequiredHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
index fac197c852e3e..771e9492d03a1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 class ServiceUnavailableHttpExceptionTest extends HttpExceptionTest
@@ -18,7 +19,7 @@ public function testWithHeaderConstruct()
             'Cache-Control' => 'public, s-maxage=1337',
         ];
 
-        $exception = new ServiceUnavailableHttpException(1337, null, null, null, $headers);
+        $exception = new ServiceUnavailableHttpException(1337, '', null, 0, $headers);
 
         $headers['Retry-After'] = 1337;
 
@@ -35,7 +36,7 @@ public function testHeadersSetter($headers)
         $this->assertSame($headers, $exception->getHeaders());
     }
 
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new ServiceUnavailableHttpException(null, $message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
index 8b59e9894adb5..7c2490b22ec81 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 
 class TooManyRequestsHttpExceptionTest extends HttpExceptionTest
@@ -18,7 +19,7 @@ public function testWithHeaderConstruct()
             'Cache-Control' => 'public, s-maxage=69',
         ];
 
-        $exception = new TooManyRequestsHttpException(69, null, null, null, $headers);
+        $exception = new TooManyRequestsHttpException(69, '', null, 0, $headers);
 
         $headers['Retry-After'] = 69;
 
@@ -35,7 +36,7 @@ public function testHeadersSetter($headers)
         $this->assertSame($headers, $exception->getHeaders());
     }
 
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new TooManyRequestsHttpException(null, $message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
index 92d427b6e4a9e..bd01079798fdc 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 
 class UnauthorizedHttpExceptionTest extends HttpExceptionTest
@@ -18,7 +19,7 @@ public function testWithHeaderConstruct()
             'Cache-Control' => 'public, s-maxage=1200',
         ];
 
-        $exception = new UnauthorizedHttpException('Challenge', null, null, null, $headers);
+        $exception = new UnauthorizedHttpException('Challenge', '', null, 0, $headers);
 
         $headers['WWW-Authenticate'] = 'Challenge';
 
@@ -35,7 +36,7 @@ public function testHeadersSetter($headers)
         $this->assertSame($headers, $exception->getHeaders());
     }
 
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new UnauthorizedHttpException('Challenge', $message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
index ffa4e177ee526..b538a041dd9ed 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnprocessableEntityHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 class UnprocessableEntityHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new UnprocessableEntityHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
index fa28bbd19b410..4eeb3fa144257 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Exception/UnsupportedMediaTypeHttpExceptionTest.php
@@ -2,11 +2,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
 
 class UnsupportedMediaTypeHttpExceptionTest extends HttpExceptionTest
 {
-    protected function createException(string $message = null, \Throwable $previous = null, ?int $code = 0, array $headers = [])
+    protected function createException(string $message = '', \Throwable $previous = null, int $code = 0, array $headers = []): HttpException
     {
         return new UnsupportedMediaTypeHttpException($message, $previous, $code, $headers);
     }
diff --git a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php
index f672acc6f12b7..3428b70e07eae 100644
--- a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php
+++ b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php
@@ -20,7 +20,7 @@ class HttpTransportException extends TransportException
 {
     private $response;
 
-    public function __construct(string $message = null, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
+    public function __construct(?string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
index b897081bd5d84..8a437140352cf 100644
--- a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
+++ b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php
@@ -22,7 +22,10 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn
 {
     protected $allowedMethods = [];
 
-    public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Throwable $previous = null)
+    /**
+     * @param string[] $allowedMethods
+     */
+    public function __construct(array $allowedMethods, ?string $message = '', int $code = 0, \Throwable $previous = null)
     {
         $this->allowedMethods = array_map('strtoupper', $allowedMethods);
 
@@ -32,7 +35,7 @@ public function __construct(array $allowedMethods, string $message = null, int $
     /**
      * Gets the allowed HTTP methods.
      *
-     * @return array
+     * @return string[]
      */
     public function getAllowedMethods()
     {
diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
index 92cf7e7938843..02740262b6e50 100644
--- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php
+++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -362,11 +362,11 @@ private function load($resource, string $type = null): array
         }
 
         if (null === $resolver = $this->loader->getResolver()) {
-            throw new LoaderLoadException($resource, null, null, null, $type);
+            throw new LoaderLoadException($resource, null, 0, null, $type);
         }
 
         if (false === $loader = $resolver->resolve($resource, $type)) {
-            throw new LoaderLoadException($resource, null, null, null, $type);
+            throw new LoaderLoadException($resource, null, 0, null, $type);
         }
 
         $collections = $loader->load($resource, $type);
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
index f0324607725fa..c75066da2d4f5 100644
--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -28,7 +28,6 @@ class ParseException extends RuntimeException
      * @param int             $parsedLine The line where the error occurred
      * @param string|null     $snippet    The snippet of code near the problem
      * @param string|null     $parsedFile The file name where the error occurred
-     * @param \Exception|null $previous   The previous exception
      */
     public function __construct(string $message, int $parsedLine = -1, string $snippet = null, string $parsedFile = null, \Throwable $previous = null)
     {

From ac45be2580a53871d9daaac2665ecea8f0a75097 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Vares <pov@fingerprint.fr>
Date: Mon, 22 Feb 2021 09:25:14 +0100
Subject: [PATCH 66/87] In calls to mb_ functions, silently transform arg into
 string

In PHP8, a number of functions who were accepting null arguments will only accept
string ones.

In the polyfill, mb_* functions are declared with a trict type checking of "string".

Therefore, we deprecate the use of non string arguments, so that it won't break when either using the polyfill,
or future php8 versions.
---
 src/Symfony/Component/Console/Helper/Helper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 0ddddf6bc5023..0521aaf7d2933 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -47,6 +47,8 @@ public function getHelperSet()
      */
     public static function strlen($string)
     {
+        $string = (string) $string;
+
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return \strlen($string);
         }
@@ -65,6 +67,8 @@ public static function strlen($string)
      */
     public static function substr($string, $from, $length = null)
     {
+        $string = (string) $string;
+
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return substr($string, $from, $length);
         }

From 3288897e0faefb11d164f75edb3816057664eab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Isaert?= <mickael.isaert@gmail.com>
Date: Mon, 21 Dec 2020 17:26:32 +0100
Subject: [PATCH 67/87] [Cache] Fix Redis TLS scheme `rediss` for Redis
 connection

---
 .../Cache/Tests/Adapter/RedisAdapterTest.php  | 38 ++++++++++---------
 .../Component/Cache/Traits/RedisTrait.php     | 32 ++++++++++++----
 2 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
index 514a0e92e1ba0..b54a5acc84260 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
@@ -36,36 +36,46 @@ public function createCachePool(int $defaultLifetime = 0): CacheItemPoolInterfac
         return $adapter;
     }
 
-    /**
-     * @dataProvider provideValidSchemes
-     */
-    public function testCreateConnection(string $dsnScheme)
+    public function testCreateConnection()
     {
-        $redis = RedisAdapter::createConnection($dsnScheme.':?host[h1]&host[h2]&host[/foo:]');
+        $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');
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost);
         $this->assertInstanceOf(\Redis::class, $redis);
         $this->assertTrue($redis->isConnected());
         $this->assertSame(0, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'/2');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
         $this->assertEquals(3, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost.'?timeout=4');
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection($dsnScheme.'://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
+    public function testCreateTlsConnection()
+    {
+        $redis = RedisAdapter::createConnection('rediss:?host[h1]&host[h2]&host[/foo:]');
+        $this->assertInstanceOf(\RedisArray::class, $redis);
+        $this->assertSame(['tls://h1:6379', 'tls://h2:6379', '/foo'], $redis->_hosts());
+        @$redis = null; // some versions of phpredis connect on destruct, let's silence the warning
+
+        $redisHost = getenv('REDIS_HOST');
+
+        $redis = RedisAdapter::createConnection('rediss://'.$redisHost.'?lazy=1');
+        $this->assertInstanceOf(RedisProxy::class, $redis);
+    }
+
     /**
      * @dataProvider provideFailedCreateConnection
      */
@@ -95,14 +105,6 @@ public function testInvalidCreateConnection(string $dsn)
         RedisAdapter::createConnection($dsn);
     }
 
-    public function provideValidSchemes(): array
-    {
-        return [
-            ['redis'],
-            ['rediss'],
-        ];
-    }
-
     public function provideInvalidCreateConnection(): array
     {
         return [
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index d48dd24b577b9..bf2ca1073b5df 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -118,6 +118,9 @@ public static function createConnection($dsn, array $options = [])
 
         $query = $hosts = [];
 
+        $tls = 'rediss' === $scheme;
+        $tcpScheme = $tls ? 'tls' : 'tcp';
+
         if (isset($params['query'])) {
             parse_str($params['query'], $query);
 
@@ -130,9 +133,9 @@ public static function createConnection($dsn, array $options = [])
                         parse_str($parameters, $parameters);
                     }
                     if (false === $i = strrpos($host, ':')) {
-                        $hosts[$host] = ['scheme' => 'tcp', 'host' => $host, 'port' => 6379] + $parameters;
+                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => $host, 'port' => 6379] + $parameters;
                     } elseif ($port = (int) substr($host, 1 + $i)) {
-                        $hosts[$host] = ['scheme' => 'tcp', 'host' => substr($host, 0, $i), 'port' => $port] + $parameters;
+                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => substr($host, 0, $i), 'port' => $port] + $parameters;
                     } else {
                         $hosts[$host] = ['scheme' => 'unix', 'path' => substr($host, 0, $i)] + $parameters;
                     }
@@ -148,7 +151,7 @@ public static function createConnection($dsn, array $options = [])
             }
 
             if (isset($params['host'])) {
-                array_unshift($hosts, ['scheme' => 'tcp', 'host' => $params['host'], 'port' => $params['port'] ?? 6379]);
+                array_unshift($hosts, ['scheme' => $tcpScheme, 'host' => $params['host'], 'port' => $params['port'] ?? 6379]);
             } else {
                 array_unshift($hosts, ['scheme' => 'unix', 'path' => $params['path']]);
             }
@@ -174,9 +177,16 @@ public static function createConnection($dsn, array $options = [])
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
             $redis = new $class();
 
-            $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts) {
+            $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts, $tls) {
+                $host = $hosts[0]['host'] ?? $hosts[0]['path'];
+                $port = $hosts[0]['port'] ?? null;
+
+                if (isset($hosts[0]['host']) && $tls) {
+                    $host = 'tls://'.$host;
+                }
+
                 try {
-                    @$redis->{$connect}($hosts[0]['host'] ?? $hosts[0]['path'], $hosts[0]['port'] ?? null, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();
@@ -210,7 +220,11 @@ public static function createConnection($dsn, array $options = [])
             }
         } elseif (is_a($class, \RedisArray::class, true)) {
             foreach ($hosts as $i => $host) {
-                $hosts[$i] = 'tcp' === $host['scheme'] ? $host['host'].':'.$host['port'] : $host['path'];
+                switch ($host['scheme']) {
+                    case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
+                    case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                    default: $hosts[$i] = $host['path'];
+                }
             }
             $params['lazy_connect'] = $params['lazy'] ?? true;
             $params['connect_timeout'] = $params['timeout'];
@@ -227,7 +241,11 @@ public static function createConnection($dsn, array $options = [])
         } elseif (is_a($class, \RedisCluster::class, true)) {
             $initializer = static function () use ($class, $params, $dsn, $hosts) {
                 foreach ($hosts as $i => $host) {
-                    $hosts[$i] = 'tcp' === $host['scheme'] ? $host['host'].':'.$host['port'] : $host['path'];
+                    switch ($host['scheme']) {
+                        case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
+                        case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
+                        default: $hosts[$i] = $host['path'];
+                    }
                 }
 
                 try {

From 8e1d3285ed1a6e65f3323d04e3d2b3c151254dec Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 22 Feb 2021 22:11:34 +0100
Subject: [PATCH 68/87] Adding templates for Belarusian

---
 .../Resources/translations/validators.be.xlf  | 120 ++++++++++++++++++
 .../Resources/translations/security.be.xlf    |   8 ++
 .../Resources/translations/validators.be.xlf  |  24 ++++
 3 files changed, 152 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
index 004ba594b3875..042722eba89eb 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
@@ -14,6 +14,126 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>CSRF-токен не сапраўдны. Калі ласка, паспрабуйце яшчэ раз адправіць форму.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>This value is not a valid HTML5 color.</target>
+            </trans-unit>
+            <trans-unit id="100">
+                <source>Please enter a valid birthdate.</source>
+                <target>Please enter a valid birthdate.</target>
+            </trans-unit>
+            <trans-unit id="101">
+                <source>The selected choice is invalid.</source>
+                <target>The selected choice is invalid.</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>The collection is invalid.</source>
+                <target>The collection is invalid.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>Please select a valid color.</source>
+                <target>Please select a valid color.</target>
+            </trans-unit>
+            <trans-unit id="104">
+                <source>Please select a valid country.</source>
+                <target>Please select a valid country.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>Please select a valid currency.</source>
+                <target>Please select a valid currency.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>Please choose a valid date interval.</source>
+                <target>Please choose a valid date interval.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Please enter a valid date and time.</source>
+                <target>Please enter a valid date and time.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Please enter a valid date.</source>
+                <target>Please enter a valid date.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Please select a valid file.</source>
+                <target>Please select a valid file.</target>
+            </trans-unit>
+            <trans-unit id="110">
+                <source>The hidden field is invalid.</source>
+                <target>The hidden field is invalid.</target>
+            </trans-unit>
+            <trans-unit id="111">
+                <source>Please enter an integer.</source>
+                <target>Please enter an integer.</target>
+            </trans-unit>
+            <trans-unit id="112">
+                <source>Please select a valid language.</source>
+                <target>Please select a valid language.</target>
+            </trans-unit>
+            <trans-unit id="113">
+                <source>Please select a valid locale.</source>
+                <target>Please select a valid locale.</target>
+            </trans-unit>
+            <trans-unit id="114">
+                <source>Please enter a valid money amount.</source>
+                <target>Please enter a valid money amount.</target>
+            </trans-unit>
+            <trans-unit id="115">
+                <source>Please enter a number.</source>
+                <target>Please enter a number.</target>
+            </trans-unit>
+            <trans-unit id="116">
+                <source>The password is invalid.</source>
+                <target>The password is invalid.</target>
+            </trans-unit>
+            <trans-unit id="117">
+                <source>Please enter a percentage value.</source>
+                <target>Please enter a percentage value.</target>
+            </trans-unit>
+            <trans-unit id="118">
+                <source>The values do not match.</source>
+                <target>The values do not match.</target>
+            </trans-unit>
+            <trans-unit id="119">
+                <source>Please enter a valid time.</source>
+                <target>Please enter a valid time.</target>
+            </trans-unit>
+            <trans-unit id="120">
+                <source>Please select a valid timezone.</source>
+                <target>Please select a valid timezone.</target>
+            </trans-unit>
+            <trans-unit id="121">
+                <source>Please enter a valid URL.</source>
+                <target>Please enter a valid URL.</target>
+            </trans-unit>
+            <trans-unit id="122">
+                <source>Please enter a valid search term.</source>
+                <target>Please enter a valid search term.</target>
+            </trans-unit>
+            <trans-unit id="123">
+                <source>Please provide a valid phone number.</source>
+                <target>Please provide a valid phone number.</target>
+            </trans-unit>
+            <trans-unit id="124">
+                <source>The checkbox has an invalid value.</source>
+                <target>The checkbox has an invalid value.</target>
+            </trans-unit>
+            <trans-unit id="125">
+                <source>Please enter a valid email address.</source>
+                <target>Please enter a valid email address.</target>
+            </trans-unit>
+            <trans-unit id="126">
+                <source>Please select a valid option.</source>
+                <target>Please select a valid option.</target>
+            </trans-unit>
+            <trans-unit id="127">
+                <source>Please select a valid range.</source>
+                <target>Please select a valid range.</target>
+            </trans-unit>
+            <trans-unit id="128">
+                <source>Please enter a valid week.</source>
+                <target>Please enter a valid week.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
index c3cd7911e55cb..216df88ed2561 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
@@ -62,6 +62,14 @@
                 <source>Account is locked.</source>
                 <target>Акаўнт заблакіраван.</target>
             </trans-unit>
+            <trans-unit id="17">
+                <source>Too many failed login attempts, please try again later.</source>
+                <target>Too many failed login attempts, please try again later.</target>
+            </trans-unit>
+            <trans-unit id="18">
+                <source>Invalid or expired login link.</source>
+                <target>Invalid or expired login link.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
index ab3845ee20153..e12c53c36e8b0 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
@@ -362,6 +362,30 @@
                 <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
                 <target>Гэты пароль быў выкрадзены ў выніку ўзлому дадзеных, таму яго нельга выкарыстоўваць. Калі ласка, выкарыстоўвайце іншы пароль.</target>
             </trans-unit>
+            <trans-unit id="94">
+                <source>This value should be between {{ min }} and {{ max }}.</source>
+                <target>This value should be between {{ min }} and {{ max }}.</target>
+            </trans-unit>
+            <trans-unit id="95">
+                <source>This value is not a valid hostname.</source>
+                <target>This value is not a valid hostname.</target>
+            </trans-unit>
+            <trans-unit id="96">
+                <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+                <target>The number of elements in this collection should be a multiple of {{ compared_value }}.</target>
+            </trans-unit>
+            <trans-unit id="97">
+                <source>This value should satisfy at least one of the following constraints:</source>
+                <target>This value should satisfy at least one of the following constraints:</target>
+            </trans-unit>
+            <trans-unit id="98">
+                <source>Each element of this collection should satisfy its own set of constraints.</source>
+                <target>Each element of this collection should satisfy its own set of constraints.</target>
+            </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid International Securities Identification Number (ISIN).</source>
+                <target>This value is not a valid International Securities Identification Number (ISIN).</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 56194a45354d99b110a41a69aa523fa45a680a06 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 23 Feb 2021 11:03:30 +0100
Subject: [PATCH 69/87] Move github templates at the org level

---
 .github/CODE_OF_CONDUCT.md                    |  8 -------
 .github/ISSUE_TEMPLATE/1_Bug_report.md        | 21 -------------------
 .github/ISSUE_TEMPLATE/2_Feature_request.md   | 12 -----------
 .github/ISSUE_TEMPLATE/3_Support_question.md  | 11 ----------
 .../ISSUE_TEMPLATE/4_Documentation_issue.md   | 10 ---------
 .github/SECURITY.md                           | 10 ---------
 6 files changed, 72 deletions(-)
 delete mode 100644 .github/CODE_OF_CONDUCT.md
 delete mode 100644 .github/ISSUE_TEMPLATE/1_Bug_report.md
 delete mode 100644 .github/ISSUE_TEMPLATE/2_Feature_request.md
 delete mode 100644 .github/ISSUE_TEMPLATE/3_Support_question.md
 delete mode 100644 .github/ISSUE_TEMPLATE/4_Documentation_issue.md
 delete mode 100644 .github/SECURITY.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index 16e2603b76a1d..0000000000000
--- a/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Code of Conduct
-
-This project follows a [Code of Conduct][code_of_conduct] in order to ensure an open and welcoming environment.
-Please read the full text for understanding the accepted and unaccepted behavior.
-Please read also the [reporting guidelines][guidelines], in case you encountered or witnessed any misbehavior.
-
-[code_of_conduct]: https://symfony.com/doc/current/contributing/code_of_conduct/index.html
-[guidelines]: https://symfony.com/doc/current/contributing/code_of_conduct/reporting_guidelines.html
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
deleted file mode 100644
index 4a64e16edf0a5..0000000000000
--- a/.github/ISSUE_TEMPLATE/1_Bug_report.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: 🐛 Bug Report
-about: Report errors and problems
-
----
-
-**Symfony version(s) affected**: x.y.z
-
-**Description**  
-<!-- A clear and concise description of the problem. -->
-
-**How to reproduce**  
-<!-- Code and/or config needed to reproduce the problem. If it's a complex bug,
-     create a "bug reproducer" as explained in:
-     https://symfony.com/doc/current/contributing/code/reproducer.html -->
-
-**Possible Solution**  
-<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
-
-**Additional context**  
-<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md
deleted file mode 100644
index 335321e413607..0000000000000
--- a/.github/ISSUE_TEMPLATE/2_Feature_request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: 🚀 Feature Request
-about: RFC and ideas for new features and improvements
-
----
-
-**Description**  
-<!-- A clear and concise description of the new feature. -->
-
-**Example**  
-<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
-     If the new feature changes an existing feature, include a simple before/after comparison. -->
diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
deleted file mode 100644
index 9480710c15655..0000000000000
--- a/.github/ISSUE_TEMPLATE/3_Support_question.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: ⛔ Support Question
-about: See https://symfony.com/support for questions about using Symfony and its components
-
----
-
-We use GitHub issues only to discuss about Symfony bugs and new features. For
-this kind of questions about using Symfony or third-party bundles, please use
-any of the support alternatives shown in https://symfony.com/support
-
-Thanks!
diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
deleted file mode 100644
index 0855c3c5f1e12..0000000000000
--- a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: ⛔ Documentation Issue
-about: See https://github.com/symfony/symfony-docs/issues for documentation issues
-
----
-
-Symfony Documentation has its own dedicated repository. Please open your
-documentation-related issue at https://github.com/symfony/symfony-docs/issues
-
-Thanks!
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
deleted file mode 100644
index 60990950bf039..0000000000000
--- a/.github/SECURITY.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Security Policy
-===============
-
-If you found any issues that might have security implications,
-please send a report to security[at]symfony.com
-DO NOT PUBLISH SECURITY REPORTS PUBLICLY.
-
-The full [Security Policy][1] is described in the official documentation.
-
-  [1]: https://symfony.com/security

From 97058559cc99f1b05ef89c62a070deebea9899dc Mon Sep 17 00:00:00 2001
From: Marie Minasyan <marie.minassyan@gmail.com>
Date: Tue, 23 Feb 2021 19:21:01 +0100
Subject: [PATCH 70/87] [Translation] Make `name` attribute optional in xliff2

Do not set a fake `name` attribute on `unit` element from xliff2 to allow using `source` attribute and avoid missing translation error
---
 .../Component/Translation/Dumper/XliffFileDumper.php      | 8 ++++----
 .../Translation/Tests/Dumper/XliffFileDumperTest.php      | 1 +
 .../Translation/Tests/fixtures/resources-2.0-clean.xlf    | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
index 72d9c6e9f3913..63f30a5b64590 100644
--- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
@@ -150,11 +150,11 @@ private function dumpXliff2(string $defaultLocale, MessageCatalogue $messages, ?
         foreach ($messages->all($domain) as $source => $target) {
             $translation = $dom->createElement('unit');
             $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._'));
-            $name = $source;
-            if (\strlen($source) > 80) {
-                $name = substr(md5($source), -7);
+
+            if (\strlen($source) <= 80) {
+                $translation->setAttribute('name', $source);
             }
-            $translation->setAttribute('name', $name);
+
             $metadata = $messages->getMetadata($source, $domain);
 
             // Add notes section
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
index 6377132f7009b..cb995553b557d 100644
--- a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
+++ b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
@@ -43,6 +43,7 @@ public function testFormatCatalogueXliff2()
             'foo' => 'bar',
             'key' => '',
             'key.with.cdata' => '<source> & <target>',
+            'translation.key.that.is.longer.than.eighty.characters.should.not.have.name.attribute' => 'value',
         ]);
         $catalogue->setMetadata('key', ['target-attributes' => ['order' => 1]]);
 
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
index efa69b27ffb5a..ccc5ef7a72bd0 100644
--- a/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
+++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
@@ -19,5 +19,11 @@
         <target><![CDATA[<source> & <target>]]></target>
       </segment>
     </unit>
+    <unit id="aF1tx51">
+      <segment>
+        <source>translation.key.that.is.longer.than.eighty.characters.should.not.have.name.attribute</source>
+        <target>value</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

From b2970456bff65ca3c86d7cdfafb657726a113a2d Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Thu, 25 Feb 2021 12:20:45 +0100
Subject: [PATCH 71/87] [TwigBridge] Install symfony/intl to run tests on
 Travis

---
 src/Symfony/Bridge/Twig/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 72ebca58f49c3..6878052543bac 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -29,6 +29,7 @@
         "symfony/form": "^4.4.17",
         "symfony/http-foundation": "^4.3|^5.0",
         "symfony/http-kernel": "^4.4",
+        "symfony/intl": "^4.4|^5.0",
         "symfony/mime": "^4.3|^5.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "^3.4|^4.0|^5.0",

From c5ed24d8cb0f218776dc36a2a3faa3d12b2307d0 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 16 Feb 2021 08:30:58 +0100
Subject: [PATCH 72/87] Adding a Github action to run Psalm

---
 .github/psalm/cache/.gitignore   |  2 +
 .github/psalm/psalm.baseline.xml |  3 +
 .github/workflows/psalm.yml      | 97 ++++++++++++++++++++++++++++++++
 psalm.xml                        | 20 +++++++
 4 files changed, 122 insertions(+)
 create mode 100644 .github/psalm/cache/.gitignore
 create mode 100644 .github/psalm/psalm.baseline.xml
 create mode 100644 .github/workflows/psalm.yml
 create mode 100644 psalm.xml

diff --git a/.github/psalm/cache/.gitignore b/.github/psalm/cache/.gitignore
new file mode 100644
index 0000000000000..d6b7ef32c8478
--- /dev/null
+++ b/.github/psalm/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/.github/psalm/psalm.baseline.xml b/.github/psalm/psalm.baseline.xml
new file mode 100644
index 0000000000000..f74693accd46f
--- /dev/null
+++ b/.github/psalm/psalm.baseline.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.x-dev@">
+</files>
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
new file mode 100644
index 0000000000000..3910d569d606f
--- /dev/null
+++ b/.github/workflows/psalm.yml
@@ -0,0 +1,97 @@
+name: Static analysis
+
+on:
+  pull_request: ~
+
+jobs:
+  psalm:
+    name: Psalm
+    runs-on: Ubuntu-20.04
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: "json,memcached,mongodb,redis,xsl,ldap,dom"
+          ini-values: "memory_limit=-1"
+          coverage: none
+
+      - name: Checkout PR
+        uses: actions/checkout@v2
+        with:
+          path: pr
+
+      - name: Checkout base
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.base_ref }}
+          path: base
+
+      - name: Configure composer
+        run: |
+            cd base
+            COMPOSER_HOME="$(composer config home)"
+            ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
+            echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
+
+      - name: Determine composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-${{ github.base_ref }}
+          restore-keys: composer-
+
+      - name: Install Psalm
+        run: |
+          composer require psalm/phar
+          cp ./vendor/bin/psalm.phar base/psalm.phar
+          cp ./vendor/bin/psalm.phar pr/psalm.phar
+
+      - name: Install dependencies for base
+        run: |
+            cd base
+            echo "::group::modify composer.json"
+            sed -i -re 's/"replace": \{/"replace": \{"symfony\/phpunit-bridge": "self.version",/' composer.json
+            composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
+            echo "::endgroup::"
+            echo "::group::composer update"
+            composer update --no-progress --ansi
+            echo "::endgroup::"
+
+      - name: Generate Psalm baseline
+        run: |
+          cd base
+          ./psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
+
+      - name: Copy baseline
+        run: |
+          cp base/.github/psalm/psalm.baseline.xml pr/.github/psalm/psalm.baseline.xml
+
+      - name: Install dependencies for PR
+        run: |
+            cd pr
+            echo "::group::modify composer.json"
+            sed -i -re 's/"replace": \{/"replace": \{"symfony\/phpunit-bridge": "self.version",/' composer.json
+            composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
+            echo "::endgroup::"
+            echo "::group::composer update"
+            composer update --no-progress --ansi
+            echo "::endgroup::"
+
+      - name: Cache Psalm
+        uses: actions/cache@v2
+        with:
+          path: pr/.github/psalm/cache/
+          key: psalm-${{ github.base_ref }}
+          restore-keys: psalm-
+
+      - name: Psalm
+        run: |
+          cd pr
+          ./psalm.phar --version
+          ./psalm.phar --output-format=github --no-progress
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000000000..3f12f1331c272
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="5"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    cacheDirectory="./.github/psalm/cache/"
+    errorBaseline=".github/psalm/psalm.baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="src/Symfony/*/*/Tests" />
+            <directory name="src/Symfony/*/*/*/Tests" />
+            <directory name="src/Symfony/*/*/*/*/Tests" />
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

From d5a05f1b30fa5aa3d1a06f30c87dd5fdb3c7c451 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Thu, 25 Feb 2021 17:35:56 +0100
Subject: [PATCH 73/87] Make sure the Psalm review CI job is working

---
 .github/workflows/psalm.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 3910d569d606f..11027c374e4fd 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -56,7 +56,7 @@ jobs:
         run: |
             cd base
             echo "::group::modify composer.json"
-            sed -i -re 's/"replace": \{/"replace": \{"symfony\/phpunit-bridge": "self.version",/' composer.json
+            composer remove symfony/phpunit-bridge --no-interaction --no-update
             composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
             echo "::endgroup::"
             echo "::group::composer update"
@@ -76,7 +76,7 @@ jobs:
         run: |
             cd pr
             echo "::group::modify composer.json"
-            sed -i -re 's/"replace": \{/"replace": \{"symfony\/phpunit-bridge": "self.version",/' composer.json
+            composer remove symfony/phpunit-bridge --no-interaction --no-update
             composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
             echo "::endgroup::"
             echo "::group::composer update"

From e82918cd6000343150ae6bb49edbf21d53baab7e Mon Sep 17 00:00:00 2001
From: tamcy <tamcy@users.noreply.github.com>
Date: Fri, 19 Feb 2021 12:13:03 +0800
Subject: [PATCH 74/87] [HttpKernel] Configure `session.cookie_secure` earlier

---
 .../Session/Storage/NativeSessionStorage.php     |  3 +++
 .../HttpKernel/EventListener/SessionListener.php | 16 +++++++++++++---
 .../Tests/EventListener/SessionListenerTest.php  |  8 ++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index e1da95509e1e6..8288d3c22d063 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -389,6 +389,9 @@ public function setOptions(array $options)
                     $this->emulateSameSite = $value;
                     continue;
                 }
+                if ('cookie_secure' === $key && 'auto' === $value) {
+                    continue;
+                }
                 ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value);
             }
         }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
index a53ade797cdac..6cff47b88d62b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
@@ -14,6 +14,7 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
  * Sets the session in the request.
@@ -33,10 +34,12 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    protected function getSession(): ?SessionInterface
+    public function onKernelRequest(GetResponseEvent $event)
     {
-        if (!$this->container->has('session')) {
-            return null;
+        parent::onKernelRequest($event);
+
+        if (!$event->isMasterRequest() || !$this->container->has('session')) {
+            return;
         }
 
         if ($this->container->has('session_storage')
@@ -46,6 +49,13 @@ protected function getSession(): ?SessionInterface
         ) {
             $storage->setOptions(['cookie_secure' => true]);
         }
+    }
+
+    protected function getSession(): ?SessionInterface
+    {
+        if (!$this->container->has('session')) {
+            return null;
+        }
 
         return $this->container->get('session');
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
index de1069606b6b6..e0dba81683ee9 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -59,7 +59,7 @@ public function testSessionIsSet()
         $listener = new SessionListener($container);
 
         $event = $this->createMock(RequestEvent::class);
-        $event->expects($this->once())->method('isMasterRequest')->willReturn(true);
+        $event->expects($this->exactly(2))->method('isMasterRequest')->willReturn(true);
         $event->expects($this->once())->method('getRequest')->willReturn($request);
 
         $listener->onKernelRequest($event);
@@ -203,12 +203,16 @@ public function testGetSessionIsCalledOnce()
         $listener = new SessionListener($container);
         $listener->onKernelRequest($event);
 
+        // storage->setOptions() should have been called already
+        $container->set('session_storage', null);
+        $sessionStorage = null;
+
         $subRequest = $masterRequest->duplicate();
         // at this point both master and subrequest have a closure to build the session
 
         $masterRequest->getSession();
 
-        // calling the factory on the subRequest should not trigger a second call to storage->sesOptions()
+        // calling the factory on the subRequest should not trigger a second call to storage->setOptions()
         $subRequest->getSession();
     }
 }

From 8dada95cbf28bfa9404c6ea884eae8d9b0a319b2 Mon Sep 17 00:00:00 2001
From: Pierrick VIGNAND <pierrick.vignand@manomano.com>
Date: Thu, 18 Feb 2021 14:41:11 +0100
Subject: [PATCH 75/87] fix: MockResponse total_time should not be simulated
 when provided

---
 .../HttpClient/Response/MockResponse.php       |  8 ++++----
 .../Tests/Response/MockResponseTest.php        | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
index 0f359f30b3265..8f5803202c1bf 100644
--- a/src/Symfony/Component/HttpClient/Response/MockResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -211,8 +211,8 @@ private static function writeRequest(self $response, array $options, ResponseInt
             $response->info['size_upload'] = 0.0;
         }
 
-        // simulate "total_time" if it is set
-        if (isset($response->info['total_time'])) {
+        // simulate "total_time" if it is not set
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -260,7 +260,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             'http_code' => $response->info['http_code'],
         ] + $info + $response->info;
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -287,7 +287,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             $offset = \strlen($body);
         }
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
index b4a4a22083eb7..2f389bcc80c79 100644
--- a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -11,6 +11,24 @@
  */
 class MockResponseTest extends TestCase
 {
+    public function testTotalTimeShouldBeSimulatedWhenNotProvided()
+    {
+        $response = new MockResponse('body');
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertNotNull($response->getInfo('total_time'));
+        $this->assertGreaterThan(0.0, $response->getInfo('total_time'));
+    }
+
+    public function testTotalTimeShouldNotBeSimulatedWhenProvided()
+    {
+        $totalTime = 4.2;
+        $response = new MockResponse('body', ['total_time' => $totalTime]);
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertEquals($totalTime, $response->getInfo('total_time'));
+    }
+
     public function testToArray()
     {
         $data = ['color' => 'orange', 'size' => 42];

From 3fb74abe627076904a77267ca42731a8d15e85c0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 25 Feb 2021 20:32:02 +0100
Subject: [PATCH 76/87] Speedup psalm

---
 .github/psalm/{cache => }/.gitignore  |   0
 .github/workflows/intl-data-tests.yml |  87 ++++++-----
 .github/workflows/phpunit-bridge.yml  |  43 +++---
 .github/workflows/psalm.yml           |  85 +++-------
 .github/workflows/tests.yml           | 213 ++++++++++++--------------
 5 files changed, 192 insertions(+), 236 deletions(-)
 rename .github/psalm/{cache => }/.gitignore (100%)

diff --git a/.github/psalm/cache/.gitignore b/.github/psalm/.gitignore
similarity index 100%
rename from .github/psalm/cache/.gitignore
rename to .github/psalm/.gitignore
diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
index 17e26dad0d1ec..0925858432268 100644
--- a/.github/workflows/intl-data-tests.yml
+++ b/.github/workflows/intl-data-tests.yml
@@ -1,47 +1,50 @@
 name: Intl data tests
 
 on:
-    push:
-        paths:
-          - 'src/Symfony/Component/Intl/Resources/data/**'
-    pull_request:
-        paths:
-          - 'src/Symfony/Component/Intl/Resources/data/**'
+  push:
+    paths:
+      - 'src/Symfony/Component/Intl/Resources/data/**'
+  pull_request:
+    paths:
+      - 'src/Symfony/Component/Intl/Resources/data/**'
 
-jobs:
+defaults:
+  run:
+    shell: bash
 
-    tests:
-        name: Tests (intl-data)
-        runs-on: ubuntu-latest
-
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v2
-
-            -   name: Define the ICU version
-                run: |
-                    SYMFONY_ICU_VERSION=$(php -r 'require "src/Symfony/Component/Intl/Intl.php"; echo Symfony\Component\Intl\Intl::getIcuStubVersion();')
-                    echo "SYMFONY_ICU_VERSION=$SYMFONY_ICU_VERSION" >> $GITHUB_ENV
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    coverage: "none"
-                    extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
-                    ini-values: "memory_limit=-1"
-                    php-version: "7.4"
-
-            -   name: Install dependencies
-                run: |
-                    echo "::group::composer update"
-                    composer update --no-progress --no-suggest --ansi
-                    echo "::endgroup::"
-                    echo "::group::install phpunit"
-                    ./phpunit install
-                    echo "::endgroup::"
-
-            -   name: Report the ICU version
-                run: icu-config --version && php -i | grep 'ICU version'
-
-            -   name: Run intl-data tests
-                run: ./phpunit --group intl-data -v
+jobs:
+  tests:
+    name: Tests (intl-data)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Define the ICU version
+        run: |
+          SYMFONY_ICU_VERSION=$(php -r 'require "src/Symfony/Component/Intl/Intl.php"; echo Symfony\Component\Intl\Intl::getIcuStubVersion();')
+          echo "SYMFONY_ICU_VERSION=$SYMFONY_ICU_VERSION" >> $GITHUB_ENV
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
+          ini-values: "memory_limit=-1"
+          php-version: "7.4"
+
+      - name: Install dependencies
+        run: |
+          echo "::group::composer update"
+          composer update --no-progress --no-suggest --ansi
+          echo "::endgroup::"
+          echo "::group::install phpunit"
+          ./phpunit install
+          echo "::endgroup::"
+
+      - name: Report the ICU version
+        run: icu-config --version && php -i | grep 'ICU version'
+
+      - name: Run intl-data tests
+        run: ./phpunit --group intl-data -v
diff --git a/.github/workflows/phpunit-bridge.yml b/.github/workflows/phpunit-bridge.yml
index bdda65de1b6f5..8fa97980ff0f8 100644
--- a/.github/workflows/phpunit-bridge.yml
+++ b/.github/workflows/phpunit-bridge.yml
@@ -1,28 +1,31 @@
 name: PhpUnitBridge
 
 on:
-    push:
-        paths:
-            - 'src/Symfony/Bridge/PhpUnit/**'
-    pull_request:
-        paths:
-            - 'src/Symfony/Bridge/PhpUnit/**'
+  push:
+    paths:
+      - 'src/Symfony/Bridge/PhpUnit/**'
+  pull_request:
+    paths:
+      - 'src/Symfony/Bridge/PhpUnit/**'
 
-jobs:
+defaults:
+  run:
+    shell: bash
 
-    lint:
-        name: Lint
-        runs-on: ubuntu-latest
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
 
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    coverage: "none"
-                    php-version: "5.5"
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          php-version: "5.5"
 
-            -   name: Lint
-                run: find ./src/Symfony/Bridge/PhpUnit -name '*.php' | grep -v -e /Tests/ -e ForV6 -e ForV7 -e ForV8 -e ForV9 -e ConstraintLogicTrait | parallel -j 4 php -l {}
+      - name: Lint
+        run: find ./src/Symfony/Bridge/PhpUnit -name '*.php' | grep -v -e /Tests/ -e ForV6 -e ForV7 -e ForV8 -e ForV9 -e ConstraintLogicTrait | parallel -j 4 php -l {}
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 11027c374e4fd..4c15203380059 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -3,6 +3,10 @@ name: Static analysis
 on:
   pull_request: ~
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   psalm:
     name: Psalm
@@ -17,81 +21,38 @@ jobs:
           ini-values: "memory_limit=-1"
           coverage: none
 
-      - name: Checkout PR
+      - name: Checkout target branch
         uses: actions/checkout@v2
         with:
-          path: pr
+          ref: ${{ github.base_ref }}
 
-      - name: Checkout base
+      - name: Checkout PR
         uses: actions/checkout@v2
-        with:
-          ref: ${{ github.base_ref }}
-          path: base
 
       - name: Configure composer
         run: |
-            cd base
-            COMPOSER_HOME="$(composer config home)"
-            ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-            echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
-
-      - name: Determine composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ github.base_ref }}
-          restore-keys: composer-
+          COMPOSER_HOME="$(composer config home)"
+          ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
+          echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
 
       - name: Install Psalm
         run: |
-          composer require psalm/phar
-          cp ./vendor/bin/psalm.phar base/psalm.phar
-          cp ./vendor/bin/psalm.phar pr/psalm.phar
-
-      - name: Install dependencies for base
-        run: |
-            cd base
-            echo "::group::modify composer.json"
-            composer remove symfony/phpunit-bridge --no-interaction --no-update
-            composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
-            echo "::endgroup::"
-            echo "::group::composer update"
-            composer update --no-progress --ansi
-            echo "::endgroup::"
+          echo "::group::modify composer.json"
+          composer remove --no-update --no-interaction symfony/phpunit-bridge
+          composer require --no-update psalm/phar phpunit/phpunit php-http/discovery psr/event-dispatcher
+          echo "::endgroup::"
+          echo "::group::composer update"
+          composer update --no-progress --ansi
+          git checkout composer.json
+          echo "::endgroup::"
+          ./vendor/bin/psalm.phar --version
 
       - name: Generate Psalm baseline
         run: |
-          cd base
-          ./psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
-
-      - name: Copy baseline
-        run: |
-          cp base/.github/psalm/psalm.baseline.xml pr/.github/psalm/psalm.baseline.xml
-
-      - name: Install dependencies for PR
-        run: |
-            cd pr
-            echo "::group::modify composer.json"
-            composer remove symfony/phpunit-bridge --no-interaction --no-update
-            composer require --no-update phpunit/phpunit php-http/discovery psr/event-dispatcher
-            echo "::endgroup::"
-            echo "::group::composer update"
-            composer update --no-progress --ansi
-            echo "::endgroup::"
-
-      - name: Cache Psalm
-        uses: actions/cache@v2
-        with:
-          path: pr/.github/psalm/cache/
-          key: psalm-${{ github.base_ref }}
-          restore-keys: psalm-
+          git checkout -m ${{ github.base_ref }}
+          ./vendor/bin/psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
+          git checkout -m FETCH_HEAD
 
       - name: Psalm
         run: |
-          cd pr
-          ./psalm.phar --version
-          ./psalm.phar --output-format=github --no-progress
+          ./vendor/bin/psalm.phar --output-format=github --no-progress
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9ef0b10c04ee9..5e187c78f7fec 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,127 +1,116 @@
 name: Tests
 
 on:
-    push:
-    pull_request:
+  push:
+  pull_request:
 
 jobs:
 
-    integration:
-        name: Integration
-        runs-on: ubuntu-latest
+  integration:
+    name: Integration
+    runs-on: ubuntu-latest
 
-        strategy:
-            matrix:
-                php: ['7.1', '7.4']
+    strategy:
+      matrix:
+        php: ['7.1', '7.4']
 
-        services:
-            ldap:
-                image: bitnami/openldap
-                ports:
-                    - 3389:3389
-                env:
-                    LDAP_ADMIN_USERNAME: admin
-                    LDAP_ADMIN_PASSWORD: symfony
-                    LDAP_ROOT: dc=symfony,dc=com
-                    LDAP_PORT_NUMBER: 3389
-                    LDAP_USERS: a
-                    LDAP_PASSWORDS: a
-            redis:
-                image: redis:6.0.0
-                ports:
-                    - 6379:6379
-            redis-cluster:
-                image: grokzen/redis-cluster:5.0.4
-                ports:
-                    - 7000:7000
-                    - 7001:7001
-                    - 7002:7002
-                    - 7003:7003
-                    - 7004:7004
-                    - 7005:7005
-                    - 7006:7006
-                env:
-                    STANDALONE: 1
-            redis-sentinel:
-                image: bitnami/redis-sentinel:6.0
-                ports:
-                    - 26379:26379
-                env:
-                    REDIS_MASTER_HOST: redis
-                    REDIS_MASTER_SET: redis_sentinel
-                    REDIS_SENTINEL_QUORUM: 1
-            memcached:
-                image: memcached:1.6.5
-                ports:
-                    - 11211:11211
-            rabbitmq:
-                image: rabbitmq:3.8.3
-                ports:
-                    - 5672:5672
+    services:
+      ldap:
+        image: bitnami/openldap
+        ports:
+          - 3389:3389
+        env:
+          LDAP_ADMIN_USERNAME: admin
+          LDAP_ADMIN_PASSWORD: symfony
+          LDAP_ROOT: dc=symfony,dc=com
+          LDAP_PORT_NUMBER: 3389
+          LDAP_USERS: a
+          LDAP_PASSWORDS: a
+      redis:
+        image: redis:6.0.0
+        ports:
+          - 6379:6379
+      redis-cluster:
+        image: grokzen/redis-cluster:5.0.4
+        ports:
+          - 7000:7000
+          - 7001:7001
+          - 7002:7002
+          - 7003:7003
+          - 7004:7004
+          - 7005:7005
+          - 7006:7006
+        env:
+          STANDALONE: 1
+      redis-sentinel:
+        image: bitnami/redis-sentinel:6.0
+        ports:
+          - 26379:26379
+        env:
+          REDIS_MASTER_HOST: redis
+          REDIS_MASTER_SET: redis_sentinel
+          REDIS_SENTINEL_QUORUM: 1
+      memcached:
+        image: memcached:1.6.5
+        ports:
+          - 11211:11211
+      rabbitmq:
+        image: rabbitmq:3.8.3
+        ports:
+          - 5672:5672
 
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    coverage: "none"
-                    extensions: "memcached,redis,xsl,ldap"
-                    ini-values: "memory_limit=-1"
-                    php-version: "${{ matrix.php }}"
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          extensions: "memcached,redis,xsl,ldap"
+          ini-values: "memory_limit=-1"
+          php-version: "${{ matrix.php }}"
 
-            -   name: Load fixtures
-                uses: docker://bitnami/openldap
-                with:
-                  entrypoint: /bin/bash
-                  args: -c "(/opt/bitnami/openldap/bin/ldapwhoami -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony||sleep 5) && /opt/bitnami/openldap/bin/ldapadd -h ldap:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/fixtures.ldif && /opt/bitnami/openldap/bin/ldapdelete -h ldap:3389 -D cn=admin,dc=symfony,dc=com -w symfony cn=a,ou=users,dc=symfony,dc=com"
+      - name: Load fixtures
+        uses: docker://bitnami/openldap
+        with:
+          entrypoint: /bin/bash
+          args: -c "(/opt/bitnami/openldap/bin/ldapwhoami -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony||sleep 5) && /opt/bitnami/openldap/bin/ldapadd -h ldap:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/fixtures.ldif && /opt/bitnami/openldap/bin/ldapdelete -h ldap:3389 -D cn=admin,dc=symfony,dc=com -w symfony cn=a,ou=users,dc=symfony,dc=com"
 
-            -   name: Configure composer
-                run: |
-                    COMPOSER_HOME="$(composer config home)"
-                    composer self-update
-                    ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
+      - name: Configure composer
+        run: |
+          COMPOSER_HOME="$(composer config home)"
+          composer self-update
+          ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
+          echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
 
-            -   name: Determine composer cache directory
-                id: composer-cache
-                run: echo "::set-output name=directory::$(composer config cache-dir)"
+      - name: Install dependencies
+        run: |
+          echo "::group::composer update"
+          composer update --no-progress --ansi
+          echo "::endgroup::"
+          echo "::group::install phpunit"
+          ./phpunit install
+          echo "::endgroup::"
 
-            -   name: Cache composer dependencies
-                uses: actions/cache@v1
-                with:
-                    path: ${{ steps.composer-cache.outputs.directory }}
-                    key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-                    restore-keys: ${{ matrix.php }}-composer-
+      - name: Run tests
+        run: ./phpunit --group integration -v
+        env:
+          REDIS_HOST: localhost
+          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
+          MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
+          MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
+          MEMCACHED_HOST: localhost
+          LDAP_HOST: localhost
+          LDAP_PORT: 3389
 
-            -   name: Install dependencies
-                run: |
-                    echo "::group::composer update"
-                    composer update --no-progress --ansi
-                    echo "::endgroup::"
-                    echo "::group::install phpunit"
-                    ./phpunit install
-                    echo "::endgroup::"
-
-            -   name: Run tests
-                run: ./phpunit --group integration -v
-                env:
-                    REDIS_HOST: localhost
-                    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
-                    MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
-                    MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
-                    MEMCACHED_HOST: localhost
-                    LDAP_HOST: localhost
-                    LDAP_PORT: 3389
-
-            -   name: Run HTTP push tests
-                if: matrix.php == '7.4'
-                run: |
-                    [ -d .phpunit ] && mv .phpunit .phpunit.bak
-                    wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin
-                    docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.4-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
-                    sudo rm -rf .phpunit
-                    [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
+      - name: Run HTTP push tests
+        if: matrix.php == '7.4'
+        run: |
+          [ -d .phpunit ] && mv .phpunit .phpunit.bak
+          wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin
+          docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.4-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
+          sudo rm -rf .phpunit
+          [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit

From 2ae5c33c80601041941217967ca1260328d062b3 Mon Sep 17 00:00:00 2001
From: DemigodCode <36764562+DemigodCode@users.noreply.github.com>
Date: Thu, 25 Feb 2021 02:07:32 +0100
Subject: [PATCH 77/87] [Cache] Add server-commands support for Predis
 Replication Environments

---
 .../Component/Cache/Adapter/RedisTagAwareAdapter.php   | 10 +++++++++-
 src/Symfony/Component/Cache/Traits/RedisTrait.php      | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
index ed20bd2308978..9409c346fb817 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -13,6 +13,7 @@
 
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\PredisCluster;
+use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Exception\LogicException;
@@ -278,7 +279,14 @@ private function getRedisEvictionPolicy(): string
             return $this->redisEvictionPolicy;
         }
 
-        foreach ($this->getHosts() as $host) {
+        $hosts = $this->getHosts();
+        $host = reset($hosts);
+        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
+            // Predis supports info command only on the master in replication environments
+            $hosts = [$host->getClientFor('master')];
+        }
+
+        foreach ($hosts as $host) {
             $info = $host->info('Memory');
             $info = $info['Memory'] ?? $info;
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index bf2ca1073b5df..9098df9465f9d 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -13,6 +13,7 @@
 
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\RedisCluster;
+use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
@@ -367,7 +368,14 @@ protected function doClear($namespace)
             $evalArgs = [[$namespace], 0];
         }
 
-        foreach ($this->getHosts() as $host) {
+        $hosts = $this->getHosts();
+        $host = reset($hosts);
+        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
+            // Predis supports info command only on the master in replication environments
+            $hosts = [$host->getClientFor('master')];
+        }
+
+        foreach ($hosts as $host) {
             if (!isset($namespace[0])) {
                 $cleared = $host->flushDb() && $cleared;
                 continue;

From 1a26ed43e7c9cf05bebcc6113bd41aba455a23e6 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 26 Feb 2021 11:19:16 +0100
Subject: [PATCH 78/87] improve exception message if symfony/security-csrf is
 missing

---
 src/Symfony/Component/Form/FormRenderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
index 64e7cf3746561..3aec936fd95a5 100644
--- a/src/Symfony/Component/Form/FormRenderer.php
+++ b/src/Symfony/Component/Form/FormRenderer.php
@@ -59,7 +59,7 @@ public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
     public function renderCsrfToken($tokenId)
     {
         if (null === $this->csrfTokenManager) {
-            throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct().');
+            throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct(). Try running "composer require symfony/security-csrf".');
         }
 
         return $this->csrfTokenManager->getToken($tokenId)->getValue();

From c31670866972e0889ec622d726953476a5201502 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 26 Feb 2021 13:01:23 +0100
Subject: [PATCH 79/87] zero parts can be omitted in date interval input

---
 .../Serializer/Normalizer/DateIntervalNormalizer.php      | 2 +-
 .../Tests/Normalizer/DateIntervalNormalizerTest.php       | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index 21abe49bb14db..74d43a74bda9b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -105,7 +105,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
                 $dateIntervalFormat = substr($dateIntervalFormat, 2);
                 break;
         }
-        $valuePattern = '/^'.$signPattern.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $dateIntervalFormat).'$/';
+        $valuePattern = '/^'.$signPattern.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?:(?P<$1>\d+)$2)?', preg_replace('/(T.*)$/', '($1)?', $dateIntervalFormat)).'$/';
         if (!preg_match($valuePattern, $data)) {
             throw new UnexpectedValueException(sprintf('Value "%s" contains intervals not accepted by format "%s".', $data, $dateIntervalFormat));
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
index beb1288e4470c..6badbb07dd0bd 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -124,6 +124,14 @@ public function testLegacyDenormalizeUsingFormatPassedInConstructor($format, $in
         $this->doTestDenormalizeUsingFormatPassedInConstructor($format, $input, $output, true);
     }
 
+    public function testDenormalizeIntervalsWithOmittedPartsBeingZero()
+    {
+        $normalizer = new DateIntervalNormalizer();
+
+        $this->assertDateIntervalEquals($this->getInterval('P3Y2M4DT0H0M0S'), $normalizer->denormalize('P3Y2M4D', \DateInterval::class));
+        $this->assertDateIntervalEquals($this->getInterval('P0Y0M0DT12H34M0S'), $normalizer->denormalize('PT12H34M', \DateInterval::class));
+    }
+
     private function doTestDenormalizeUsingFormatPassedInConstructor($format, $input, $output, bool $legacy = false)
     {
         $normalizer = $legacy ? new DateIntervalNormalizer($format) : new DateIntervalNormalizer([DateIntervalNormalizer::FORMAT_KEY => $format]);

From 4721097cab1681cf9bc49f2961e9d1cb9d4ad9d2 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 26 Feb 2021 14:50:45 +0100
Subject: [PATCH 80/87] deal with indented heredoc/nowdoc tokens

---
 .../Translation/Extractor/PhpExtractor.php    | 13 ++++++++++++
 .../Tests/Extractor/PhpExtractorTest.php      | 21 +++++++++++++++++++
 .../extractor-7.3/translation.html.php        | 13 ++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 src/Symfony/Component/Translation/Tests/fixtures/extractor-7.3/translation.html.php

diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index 88811418ca643..32389c677cacd 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -178,6 +178,19 @@ private function getValue(\Iterator $tokenIterator)
                     }
                     break;
                 case \T_END_HEREDOC:
+                    if ($indentation = strspn($t[1], ' ')) {
+                        $docPartWithLineBreaks = $docPart;
+                        $docPart = '';
+
+                        foreach (preg_split('~(\r\n|\n|\r)~', $docPartWithLineBreaks, -1, \PREG_SPLIT_DELIM_CAPTURE) as $str) {
+                            if (\in_array($str, ["\r\n", "\n", "\r"], true)) {
+                                $docPart .= $str;
+                            } else {
+                                $docPart .= substr($str, $indentation);
+                            }
+                        }
+                    }
+
                     $message .= PhpStringTokenParser::parseDocString($docToken, $docPart);
                     $docToken = '';
                     $docPart = '';
diff --git a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
index a6d7c5001cff7..5a693977da6e4 100644
--- a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
+++ b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
@@ -75,6 +75,27 @@ public function testExtraction($resource)
         $this->assertEquals(['sources' => [$filename.':43']], $catalogue->getMetadata('other-domain-test-no-params-short-array', 'not_messages'));
     }
 
+    /**
+     * @requires PHP 7.3
+     */
+    public function testExtractionFromIndentedHeredocNowdoc()
+    {
+        $catalogue = new MessageCatalogue('en');
+
+        $extractor = new PhpExtractor();
+        $extractor->setPrefix('prefix');
+        $extractor->extract(__DIR__.'/../fixtures/extractor-7.3/translation.html.php', $catalogue);
+
+        $expectedCatalogue = [
+            'messages' => [
+                "heredoc\nindented\n  further" => "prefixheredoc\nindented\n  further",
+                "nowdoc\nindented\n  further" => "prefixnowdoc\nindented\n  further",
+            ],
+        ];
+
+        $this->assertEquals($expectedCatalogue, $catalogue->all());
+    }
+
     public function resourcesProvider()
     {
         $directory = __DIR__.'/../fixtures/extractor/';
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor-7.3/translation.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor-7.3/translation.html.php
new file mode 100644
index 0000000000000..35ffe8812ed66
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor-7.3/translation.html.php
@@ -0,0 +1,13 @@
+This template is used for translation message extraction tests
+<?php echo $view['translator']->trans(<<<EOF
+    heredoc
+    indented
+      further
+    EOF
+); ?>
+<?php echo $view['translator']->trans(<<<'EOF'
+    nowdoc
+    indented
+      further
+    EOF
+); ?>

From 3c47e03e92177ff3c889fefeeaf68a1b102b438d Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Tue, 2 Mar 2021 10:27:35 +0100
Subject: [PATCH 81/87] Specify that we run CI on Ubuntu-20.04

---
 .github/workflows/intl-data-tests.yml | 2 +-
 .github/workflows/phpunit-bridge.yml  | 2 +-
 .github/workflows/tests.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
index 0925858432268..0ca0322281448 100644
--- a/.github/workflows/intl-data-tests.yml
+++ b/.github/workflows/intl-data-tests.yml
@@ -15,7 +15,7 @@ defaults:
 jobs:
   tests:
     name: Tests (intl-data)
-    runs-on: ubuntu-latest
+    runs-on: Ubuntu-20.04
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/phpunit-bridge.yml b/.github/workflows/phpunit-bridge.yml
index 8fa97980ff0f8..b503ce48d8a17 100644
--- a/.github/workflows/phpunit-bridge.yml
+++ b/.github/workflows/phpunit-bridge.yml
@@ -15,7 +15,7 @@ defaults:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: Ubuntu-20.04
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5e187c78f7fec..603c05bff80d7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
 
   integration:
     name: Integration
-    runs-on: ubuntu-latest
+    runs-on: Ubuntu-20.04
 
     strategy:
       matrix:

From a9de390676996fbebdce6be1e9754b7f2d4e62ab Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Wed, 3 Mar 2021 13:08:43 +0100
Subject: [PATCH 82/87] fix parsing calls of methods named "method"

---
 .../Component/DependencyInjection/Loader/YamlFileLoader.php     | 2 +-
 .../DependencyInjection/Tests/Fixtures/yaml/alt_call.yaml       | 2 ++
 .../DependencyInjection/Tests/Loader/YamlFileLoaderTest.php     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 1133254c6ce40..e9b09cc2eb67d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -471,7 +471,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa
                     throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
                 }
 
-                if (isset($call['method'])) {
+                if (isset($call['method']) && \is_string($call['method'])) {
                     $method = $call['method'];
                     $args = $call['arguments'] ?? [];
                     $returnsClone = $call['returns_clone'] ?? false;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/alt_call.yaml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/alt_call.yaml
index 26cf9e628c6fd..fb7f3440ded3c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/alt_call.yaml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/alt_call.yaml
@@ -3,3 +3,5 @@ services:
         calls:
             - foo: [1, 2, 3]
             - bar: !returns_clone [1, 2, 3]
+            - method:
+                  - url
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 2e15f615fb5e1..b20302cf977ba 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -968,6 +968,7 @@ public function testAlternativeMethodCalls()
         $expected = [
             ['foo', [1, 2, 3]],
             ['bar', [1, 2, 3], true],
+            ['method', ['url']],
         ];
 
         $this->assertSame($expected, $container->getDefinition('foo')->getMethodCalls());

From 1b84d5d23b1b88804f8eb189031eec28585d202f Mon Sep 17 00:00:00 2001
From: OxanaKozlova <ooksanakozlova@gmail.com>
Date: Wed, 24 Feb 2021 15:36:10 +0300
Subject: [PATCH 83/87] Add translation for Belarusian

---
 .../Resources/translations/validators.be.xlf  | 60 +++++++++----------
 .../Resources/translations/security.be.xlf    |  4 +-
 .../Resources/translations/validators.be.xlf  | 12 ++--
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
index 042722eba89eb..0513ca1dc9f7f 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.be.xlf
@@ -16,123 +16,123 @@
             </trans-unit>
             <trans-unit id="99">
                 <source>This value is not a valid HTML5 color.</source>
-                <target>This value is not a valid HTML5 color.</target>
+                <target>Значэнне не з'яўляецца карэктным HTML5 колерам.</target>
             </trans-unit>
             <trans-unit id="100">
                 <source>Please enter a valid birthdate.</source>
-                <target>Please enter a valid birthdate.</target>
+                <target>Калі ласка, увядзіце карэктную дату нараджэння.</target>
             </trans-unit>
             <trans-unit id="101">
                 <source>The selected choice is invalid.</source>
-                <target>The selected choice is invalid.</target>
+                <target>Выбраны варыянт некарэктны.</target>
             </trans-unit>
             <trans-unit id="102">
                 <source>The collection is invalid.</source>
-                <target>The collection is invalid.</target>
+                <target>Калекцыя некарэктна.</target>
             </trans-unit>
             <trans-unit id="103">
                 <source>Please select a valid color.</source>
-                <target>Please select a valid color.</target>
+                <target>Калі ласка, выберыце карэктны колер.</target>
             </trans-unit>
             <trans-unit id="104">
                 <source>Please select a valid country.</source>
-                <target>Please select a valid country.</target>
+                <target>Калі ласка, выберыце карэктную краіну.</target>
             </trans-unit>
             <trans-unit id="105">
                 <source>Please select a valid currency.</source>
-                <target>Please select a valid currency.</target>
+                <target>Калі ласка, выберыце карэктную валюту.</target>
             </trans-unit>
             <trans-unit id="106">
                 <source>Please choose a valid date interval.</source>
-                <target>Please choose a valid date interval.</target>
+                <target>Калі ласка, выберыце карэктны інтэрвал дат.</target>
             </trans-unit>
             <trans-unit id="107">
                 <source>Please enter a valid date and time.</source>
-                <target>Please enter a valid date and time.</target>
+                <target>Калі ласка, увядзіце карэктныя дату і час.</target>
             </trans-unit>
             <trans-unit id="108">
                 <source>Please enter a valid date.</source>
-                <target>Please enter a valid date.</target>
+                <target>Калі ласка, увядзіце карэктную дату.</target>
             </trans-unit>
             <trans-unit id="109">
                 <source>Please select a valid file.</source>
-                <target>Please select a valid file.</target>
+                <target>Калі ласка, выберыце карэктны файл.</target>
             </trans-unit>
             <trans-unit id="110">
                 <source>The hidden field is invalid.</source>
-                <target>The hidden field is invalid.</target>
+                <target>Значэнне схаванага поля некарэктна.</target>
             </trans-unit>
             <trans-unit id="111">
                 <source>Please enter an integer.</source>
-                <target>Please enter an integer.</target>
+                <target>Калі ласка, увядзіце цэлы лік.</target>
             </trans-unit>
             <trans-unit id="112">
                 <source>Please select a valid language.</source>
-                <target>Please select a valid language.</target>
+                <target>Калі ласка, выберыце карэктную мову.</target>
             </trans-unit>
             <trans-unit id="113">
                 <source>Please select a valid locale.</source>
-                <target>Please select a valid locale.</target>
+                <target>Калі ласка, выберыце карэктную лакаль.</target>
             </trans-unit>
             <trans-unit id="114">
                 <source>Please enter a valid money amount.</source>
-                <target>Please enter a valid money amount.</target>
+                <target>Калі ласка, увядзіце карэктную колькасць грошай.</target>
             </trans-unit>
             <trans-unit id="115">
                 <source>Please enter a number.</source>
-                <target>Please enter a number.</target>
+                <target>Калі ласка, увядзіце нумар.</target>
             </trans-unit>
             <trans-unit id="116">
                 <source>The password is invalid.</source>
-                <target>The password is invalid.</target>
+                <target>Няправільны пароль.</target>
             </trans-unit>
             <trans-unit id="117">
                 <source>Please enter a percentage value.</source>
-                <target>Please enter a percentage value.</target>
+                <target>Калі ласка, увядзіце працэнтнае значэнне.</target>
             </trans-unit>
             <trans-unit id="118">
                 <source>The values do not match.</source>
-                <target>The values do not match.</target>
+                <target>Значэнні не супадаюць.</target>
             </trans-unit>
             <trans-unit id="119">
                 <source>Please enter a valid time.</source>
-                <target>Please enter a valid time.</target>
+                <target>Калі ласка, увядзіце карэктны час.</target>
             </trans-unit>
             <trans-unit id="120">
                 <source>Please select a valid timezone.</source>
-                <target>Please select a valid timezone.</target>
+                <target>Калі ласка, выберыце карэктны гадзінны пояс.</target>
             </trans-unit>
             <trans-unit id="121">
                 <source>Please enter a valid URL.</source>
-                <target>Please enter a valid URL.</target>
+                <target>Калі ласка, увядзіце карэктны URL.</target>
             </trans-unit>
             <trans-unit id="122">
                 <source>Please enter a valid search term.</source>
-                <target>Please enter a valid search term.</target>
+                <target>Калі ласка, увядзіце карэктны пошукавы запыт.</target>
             </trans-unit>
             <trans-unit id="123">
                 <source>Please provide a valid phone number.</source>
-                <target>Please provide a valid phone number.</target>
+                <target>Калі ласка, увядзіце карэктны нумар тэлефона.</target>
             </trans-unit>
             <trans-unit id="124">
                 <source>The checkbox has an invalid value.</source>
-                <target>The checkbox has an invalid value.</target>
+                <target>Флажок мае некарэктнае значэнне.</target>
             </trans-unit>
             <trans-unit id="125">
                 <source>Please enter a valid email address.</source>
-                <target>Please enter a valid email address.</target>
+                <target>Калі ласка, увядзіце карэктны адрас электроннай пошты.</target>
             </trans-unit>
             <trans-unit id="126">
                 <source>Please select a valid option.</source>
-                <target>Please select a valid option.</target>
+                <target>Калі ласка, выберыце карэктны варыянт.</target>
             </trans-unit>
             <trans-unit id="127">
                 <source>Please select a valid range.</source>
-                <target>Please select a valid range.</target>
+                <target>Калі ласка, выберыце карэктны дыяпазон.</target>
             </trans-unit>
             <trans-unit id="128">
                 <source>Please enter a valid week.</source>
-                <target>Please enter a valid week.</target>
+                <target>Калі ласка, увядзіце карэктны тыдзень.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
index 216df88ed2561..b24a5c421acfa 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
@@ -64,11 +64,11 @@
             </trans-unit>
             <trans-unit id="17">
                 <source>Too many failed login attempts, please try again later.</source>
-                <target>Too many failed login attempts, please try again later.</target>
+                <target>Зашмат няўдалых спроб уваходу, калі ласка, паспрабуйце пазней.</target>
             </trans-unit>
             <trans-unit id="18">
                 <source>Invalid or expired login link.</source>
-                <target>Invalid or expired login link.</target>
+                <target>Спасылка для ўваходу несапраўдная або пратэрмінаваная.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
index e12c53c36e8b0..5f9988ef3cdbe 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
@@ -364,27 +364,27 @@
             </trans-unit>
             <trans-unit id="94">
                 <source>This value should be between {{ min }} and {{ max }}.</source>
-                <target>This value should be between {{ min }} and {{ max }}.</target>
+                <target>Значэнне павінна быць паміж {{min}} і {{max}}.</target>
             </trans-unit>
             <trans-unit id="95">
                 <source>This value is not a valid hostname.</source>
-                <target>This value is not a valid hostname.</target>
+                <target>Значэнне не з'яўляецца карэктным імем хаста.</target>
             </trans-unit>
             <trans-unit id="96">
                 <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
-                <target>The number of elements in this collection should be a multiple of {{ compared_value }}.</target>
+                <target>Колькасць элементаў у гэтай калекцыі павінна быць кратным {{compared_value}}.</target>
             </trans-unit>
             <trans-unit id="97">
                 <source>This value should satisfy at least one of the following constraints:</source>
-                <target>This value should satisfy at least one of the following constraints:</target>
+                <target>Значэнне павінна задавальняць як мінімум аднаму з наступных абмежаванняў:</target>
             </trans-unit>
             <trans-unit id="98">
                 <source>Each element of this collection should satisfy its own set of constraints.</source>
-                <target>Each element of this collection should satisfy its own set of constraints.</target>
+                <target>Кожны элемент гэтай калекцыі павінен задавальняць свайму ўласнаму набору абмежаванняў.</target>
             </trans-unit>
             <trans-unit id="99">
                 <source>This value is not a valid International Securities Identification Number (ISIN).</source>
-                <target>This value is not a valid International Securities Identification Number (ISIN).</target>
+                <target>Значэнне не з'яўляецца карэктным міжнародным ідэнтыфікацыйным нумарам каштоўных папер (ISIN).</target>
             </trans-unit>
         </body>
     </file>

From e67ef5bbfff768733f299f24f908ac9486a56fb3 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Wed, 3 Mar 2021 23:49:57 +0100
Subject: [PATCH 84/87] [Validator] Fix return types

---
 src/Symfony/Component/Validator/Constraint.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index 7cd3a68b869f6..2683c68360fdb 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -25,7 +25,7 @@
  *
  * Constraint instances are immutable and serializable.
  *
- * @property array $groups The groups that the constraint belongs to
+ * @property string[] $groups The groups that the constraint belongs to
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
@@ -246,7 +246,7 @@ public function getDefaultOption()
      *
      * Override this method if you want to define required options.
      *
-     * @return array
+     * @return string[]
      *
      * @see __construct()
      */
@@ -276,7 +276,7 @@ public function validatedBy()
      * This method should return one or more of the constants
      * Constraint::CLASS_CONSTRAINT and Constraint::PROPERTY_CONSTRAINT.
      *
-     * @return string|array One or more constant values
+     * @return string|string[] One or more constant values
      */
     public function getTargets()
     {

From a68006d691001be30189cb00fe3ae6ac9217d3a7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 4 Mar 2021 19:00:15 +0100
Subject: [PATCH 85/87] Update CHANGELOG for 4.4.20

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

diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md
index 78e12222ef3b8..3811db5442333 100644
--- a/CHANGELOG-4.4.md
+++ b/CHANGELOG-4.4.md
@@ -7,6 +7,50 @@ 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.20 (2021-03-04)
+
+ * bug #40318 [Translation] deal with indented heredoc/nowdoc tokens (xabbuh)
+ * bug #40350 [DependencyInjection] fix parsing calls of methods named "method" (xabbuh)
+ * bug #40316 [Serializer] zero parts can be omitted in date interval input (xabbuh)
+ * bug #40239 MockResponse total_time should not be simulated when provided (Pierrick VIGNAND)
+ * bug #40299 [Cache] Add server-commands support for Predis Replication Environments (DemigodCode)
+ * bug #40231 [HttpKernel] Configure `session.cookie_secure` earlier (tamcy)
+ * bug #40283 [Translation] Make `name` attribute optional in xliff2 (MarieMinasyan)
+ * bug #39599 [Cache] Fix Redis TLS scheme `rediss` for Redis connection (misaert)
+ * bug #40244 [Routing] fix conflict with param named class in attribute (nlhommet)
+ * bug #40273 [Cache] fix setting items' metadata on commit() (nicolas-grekas)
+ * bug #40258 [Form] Ignoring invalid forms from delete_empty behavior in CollectionType (yceruto)
+ * bug #40162 [Intl] fix Locale::getFallback() throwing exception on long $locale (AmirHo3ein13)
+ * bug #40208 [PropertyInfo] fix resolving self to name of the analyzed class (xabbuh)
+ * bug #40209 [WebLink] Escape double quotes in attributes values (fancyweb)
+ * bug #40192 [Console] fix QuestionHelper::getHiddenResponse() not working with space in project directory name (Yendric)
+ * bug #40175 [PropertyInfo]  use the right context for properties defined in traits (xabbuh)
+ * bug #40172 [Translation] Allow using dashes in locale when linting Xliff files (localheinz)
+ * bug #40187 [Console] Fix PHP 8.1 null error for preg_match flag (kylekatarnls)
+ * bug #39659 [Form] keep valid submitted choices when additional choices are submitted (xabbuh)
+ * bug #40188 [HttpFoundation] Fix PHP 8.1 null values (kylekatarnls)
+ * bug #40167 [DependencyInjection] Definition::removeMethodCall should remove all matching calls (ruudk)
+ * bug #40160 [PropertyInfo] fix extracting mixed type-hinted property types (xabbuh)
+ * bug #40040 [Finder] Use a lazyIterator to close files descriptors when no longer used (jderusse)
+ * bug #40135 [FrameworkBundle] Fix freshness checks with boolean parameters on routes (HypeMC)
+ * bug #40138 [FrameworkBundle] fix registering "annotations.cache" on the "container.hot_path" (nicolas-grekas)
+ * bug #40116 [FrameworkBundle][Translator] scan directories for translations sequentially (xabbuh)
+ * bug #40104 [HttpKernel] [Kernel] Silence failed deprecations logs writes (fancyweb)
+ * bug #40098 [DependencyInjection] fix tracking of changes to vendor/ dirs (nicolas-grekas)
+ * bug #39980 [Mailer][Mime] Update inline part names with newly generated ContentId (ddegentesh)
+ * bug #40043 [HttpFoundation] Setting `REQUEST_TIME_FLOAT` when constructing a Request object (ctasada)
+ * bug #40050 [FrameworkBundle][Translator] Fixed updating catalogue metadata from Intl domain (yceruto)
+ * bug #40089 [SecurityBundle] role_names variable instead of roles (wickedOne)
+ * bug #40042 [Doctrine] Restore priority for EventSubscribers (jderusse)
+ * bug #40066 [ErrorHandler] fix parsing return types in DebugClassLoader (nicolas-grekas)
+ * bug #40065 [ErrorHandler] fix handling messages with null bytes from anonymous classes (nicolas-grekas)
+ * bug #40067 [PhpUnitBridge] fix reporting deprecations when they come from DebugClassLoader (nicolas-grekas)
+ * bug #40060 fix validator when we have false returned by the current element of the iterator (FabienSalles)
+ * bug #40062 [Mime] Fix case-sensitive handling of header names (piku235)
+ * bug #40023 [Finder]  use proper keys to not override appended files (xabbuh)
+ * bug #40019 [ErrorHandler] Fix strpos error when trying to call a method without a name (Deuchnord)
+ * bug #40004 [Serializer] Prevent access to private properties without getters (julienfalque)
+
 * 4.4.19 (2021-01-27)
 
  * bug #38900 [Serializer] Exclude non-initialized properties accessed with getters (BoShurik)

From 0e4e0ed7732fbcb1c72ca8bec8ae8f15a6322677 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 4 Mar 2021 19:00:24 +0100
Subject: [PATCH 86/87] Update CONTRIBUTORS for 4.4.20

---
 CONTRIBUTORS.md | 96 ++++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 41 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b64aa797a5b14..09e940bebd83c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -4,17 +4,14 @@ CONTRIBUTORS
 Symfony is the result of the work of many people who made the code better.
 
 The Symfony Connect username in parenthesis allows to get more information
-about contributors (like https://connect.symfony.com/profile/fabpot). See
-https://symfony.com/contributors for more information.
-
  - Fabien Potencier (fabpot)
  - Nicolas Grekas (nicolas-grekas)
  - Christian Flothmann (xabbuh)
  - Bernhard Schussek (bschussek)
  - Tobias Schultze (tobion)
  - Robin Chalas (chalas_r)
- - Christophe Coevoet (stof)
  - Alexander M. Turek (derrabus)
+ - Christophe Coevoet (stof)
  - Kévin Dunglas (dunglas)
  - Maxime Steinhausser (ogizanagi)
  - Jordi Boggiano (seldaek)
@@ -26,12 +23,12 @@ https://symfony.com/contributors for more information.
  - Jakub Zalas (jakubzalas)
  - Johannes S (johannes)
  - Kris Wallsmith (kriswallsmith)
- - Wouter de Jong (wouterj)
+ - Wouter De Jong (wouterj)
  - Jérémy DERUSSÉ (jderusse)
  - Thomas Calvet (fancyweb)
- - Yonel Ceruto (yonelceruto)
+ - Yonel Ceruto González (yonelceruto)
  - Hugo Hamon (hhamon)
- - Abdellatif Ait boudad (aitboudad)
+ - Ait Boudad Abdellatif (aitboudad)
  - Samuel ROZE (sroze)
  - Romain Neutron (romain)
  - Pascal Borreli (pborreli)
@@ -39,20 +36,20 @@ https://symfony.com/contributors for more information.
  - Karma Dordrak (drak)
  - Jules Pietri (heah)
  - Lukas Kahwe Smith (lsmith)
- - Martin Hasoň (hason)
- - Hamza Amrouche (simperfit)
  - Tobias Nyholm (tobias)
+ - Martin Hasoň (hason)
+ - Amrouche Hamza (simperfit)
  - Jeremy Mikola (jmikola)
+ - Oskar Stark (oskarstark)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
- - Oskar Stark (oskarstark)
  - Eriksen Costa (eriksencosta)
- - Guilhem Niot (energetick)
+ - Ener-Getick (energetick)
  - Sarah Khalil (saro0h)
  - Jan Schädlich (jschaedl)
  - Jonathan Wage (jwage)
- - Lynn van der Berg (kjarli)
+ - Iltar van der Berg (kjarli)
  - Pierre du Plessis (pierredup)
  - Matthias Pigulla (mpdude)
  - Diego Saint Esteben (dosten)
@@ -70,7 +67,7 @@ https://symfony.com/contributors for more information.
  - Bulat Shakirzyanov (avalanche123)
  - Saša Stamenković (umpirsky)
  - Peter Rehm (rpet)
- - Gabriel Ostrolucký (gadelat)
+ - gadelat (gadelat)
  - Titouan Galopin (tgalopin)
  - David Maicher (dmaicher)
  - Gábor Egyed (1ed)
@@ -90,14 +87,14 @@ https://symfony.com/contributors for more information.
  - Eric Clemmons (ericclemmons)
  - Charles Sarrazin (csarrazi)
  - Douglas Greenshields (shieldo)
+ - Jérôme Tamarelle (gromnan)
  - Laurent VOULLEMIER (lvo)
  - Arnout Boks (aboks)
  - Graham Campbell (graham)
- - Jérôme Tamarelle (gromnan)
+ - David Buchmann (dbu)
  - Deni
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
- - David Buchmann (dbu)
  - Dariusz Ruminski
  - Fran Moreno (franmomu)
  - Lee McDermott
@@ -130,6 +127,7 @@ https://symfony.com/contributors for more information.
  - Massimiliano Arione (garak)
  - Włodzimierz Gajda (gajdaw)
  - Adrien Brault (adrienbrault)
+ - Antoine M (amakdessi)
  - Jacob Dreesen (jdreesen)
  - Florian Voutzinos (florianv)
  - Teoh Han Hui (teohhanhui)
@@ -137,21 +135,21 @@ https://symfony.com/contributors for more information.
  - Colin Frei
  - Javier Spagnoletti (phansys)
  - Joshua Thijssen
- - Antoine Makdessi (amakdessi)
  - Daniel Wehner (dawehner)
  - Tugdual Saunier (tucksaun)
+ - Julien Falque (julienfalque)
  - excelwebzone
  - Gordon Franke (gimler)
  - Joel Wurtz (brouznouf)
  - Fabien Pennequin (fabienpennequin)
- - Julien Falque (julienfalque)
  - Théo FIDRY (theofidry)
  - Eric GELOEN (gelo)
  - Jannik Zschiesche (apfelbox)
- - jeremyFreeAgent (jeremyfreeagent)
+ - Jérémy Romey (jeremyfreeagent)
  - Robert Schönthal (digitalkaoz)
  - Gregor Harlan (gharlan)
  - Florian Lonqueu-Brochard (florianlb)
+ - Tigran Azatyan (tigranazatyan)
  - Gabriel Caruso (carusogabriel)
  - Stefano Sala (stefano.sala)
  - Yanick Witschi (toflar)
@@ -159,7 +157,6 @@ https://symfony.com/contributors for more information.
  - Vincent AUBERT (vincent)
  - Juti Noppornpitak (shiroyuki)
  - Anthony MARTIN (xurudragon)
- - Tigran Azatyan (tigranazatyan)
  - Sebastian Hörl (blogsh)
  - Daniel Gomes (danielcsgomes)
  - Hidenori Goto (hidenorigoto)
@@ -176,13 +173,14 @@ https://symfony.com/contributors for more information.
  - François-Xavier de Guillebon (de-gui_f)
  - Oleg Voronkovich
  - Tomas Norkūnas (norkunas)
- - Philipp Wahala (hifi)
+ - hacfi (hifi)
  - Rafael Dohms (rdohms)
  - jwdeitch
  - Ahmed TAILOULOUTE (ahmedtai)
  - Mathias Arlaud (mtarld)
  - Mikael Pajunen
  - Gary PEGEOT (gary-p)
+ - HypeMC (hypemc)
  - Arman Hosseini (arman)
  - Niels Keurentjes (curry684)
  - Vyacheslav Pavlov
@@ -195,7 +193,6 @@ https://symfony.com/contributors for more information.
  - Ben Davies (bendavies)
  - Andreas Schempp (aschempp)
  - Clemens Tolboom
- - HypeMC (hypemc)
  - Helmer Aaviksoo
  - Hiromi Hishida (77web)
  - Matthieu Ouellette-Vachon (maoueh)
@@ -203,6 +200,7 @@ https://symfony.com/contributors for more information.
  - Dawid Nowak
  - Maxime Helias (maxhelias)
  - Amal Raghav (kertz)
+ - Albert Casademont (acasademont)
  - Jonathan Ingram (jonathaningram)
  - Artur Kotyrba
  - Tyson Andre
@@ -210,7 +208,7 @@ https://symfony.com/contributors for more information.
  - Samuel NELA (snela)
  - Olivier Dolbeau (odolbeau)
  - Fabien Bourigault (fbourigault)
- - Saif (╯°□°)╯ (azjezz)
+ - Saif Eddin Gmati (azjezz)
  - James Halsall (jaitsu)
  - Florent Mata (fmata)
  - Warnar Boekkooi (boekkooi)
@@ -224,7 +222,7 @@ https://symfony.com/contributors for more information.
  - Michaël Perrin (michael.perrin)
  - Sergey Linnik (linniksa)
  - Richard Miller (mr_r_miller)
- - Albert Casademont (acasademont)
+ - Ruud Kamphuis (ruudk)
  - Wouter J
  - Mario A. Alvarez Garcia (nomack84)
  - Dennis Benkert (denderello)
@@ -238,7 +236,7 @@ https://symfony.com/contributors for more information.
  - Benjamin Dulau (dbenjamin)
  - Jan Rosier (rosier)
  - Mathieu Lemoine (lemoinem)
- - Rémon van de Kamp (rpkamp)
+ - Remon van de Kamp (rpkamp)
  - Christian Schmidt
  - Andreas Hucks (meandmymonkey)
  - Tom Van Looy (tvlooy)
@@ -263,6 +261,7 @@ https://symfony.com/contributors for more information.
  - Hidde Wieringa (hiddewie)
  - Jeremy Livingston (jeremylivingston)
  - Michael Lee (zerustech)
+ - Timo Bakx (timobakx)
  - Dmitrii Poddubnyi (karser)
  - Matthieu Auger (matthieuauger)
  - Leszek Prabucki (l3l0)
@@ -279,6 +278,7 @@ https://symfony.com/contributors for more information.
  - Maxime Veber (nek-)
  - Rui Marinho (ruimarinho)
  - Eugene Wissner
+ - Andreas Möller (localheinz)
  - Edi Modrić (emodric)
  - Pascal Montoya
  - Julien Brochet (mewt)
@@ -287,7 +287,6 @@ https://symfony.com/contributors for more information.
  - Victor Bocharsky (bocharsky_bw)
  - Marcel Beerta (mazen)
  - Christopher Hertel (chertel)
- - Ruud Kamphuis (ruudk)
  - Chi-teck
  - Pavel Batanov (scaytrase)
  - Mantis Development
@@ -300,7 +299,6 @@ https://symfony.com/contributors for more information.
  - julien pauli (jpauli)
  - Lorenz Schori
  - Sébastien Lavoie (lavoiesl)
- - Timo Bakx (timobakx)
  - Dariusz
  - Farhad Safarov (safarov)
  - Michael Babker (mbabker)
@@ -348,7 +346,7 @@ https://symfony.com/contributors for more information.
  - Joseph Rouff (rouffj)
  - Félix Labrecque (woodspire)
  - GordonsLondon
- - Quynh Xuan Nguyen (xuanquynh)
+ - Nguyen Xuan Quynh (xuanquynh)
  - Jan Sorgalla (jsor)
  - Ray
  - Chekote
@@ -362,10 +360,11 @@ https://symfony.com/contributors for more information.
  - Nikita Konstantinov
  - Wodor Wodorski
  - Joe Bennett (kralos)
+ - Simon Berger
  - soyuka
  - Giorgio Premi
  - renanbr
- - Alex Rock (pierstoval)
+ - Alex Rock Ancelet (pierstoval)
  - Beau Simensen (simensen)
  - Michael Hirschler (mvhirsch)
  - Robert Kiss (kepten)
@@ -431,6 +430,7 @@ https://symfony.com/contributors for more information.
  - Julien Galenski (ruian)
  - Thomas Landauer (thomas-landauer)
  - Bongiraud Dominique
+ - Kyle
  - janschoenherr
  - Emanuele Gaspari (inmarelibero)
  - Dariusz Rumiński
@@ -442,7 +442,6 @@ https://symfony.com/contributors for more information.
  - Mark Challoner (markchalloner)
  - ivan
  - Karoly Gossler (connorhu)
- - Simon Berger
  - Ahmed Raafat
  - Philippe Segatori
  - Gennady Telegin (gtelegin)
@@ -469,6 +468,7 @@ https://symfony.com/contributors for more information.
  - Sylvain Fabre (sylfabre)
  - Artur Eshenbrener
  - Harm van Tilborg (hvt)
+ - Malte Schlüter (maltemaltesich)
  - Thomas Perez (scullwm)
  - Felix Labrecque
  - Yaroslav Kiliba
@@ -494,7 +494,7 @@ https://symfony.com/contributors for more information.
  - ShinDarth
  - Stéphane PY (steph_py)
  - Philipp Kräutli (pkraeutli)
- - Grzegorz (Greg) Zdanowski (kiler129)
+ - Grzegorz Zdanowski (kiler129)
  - Dimitri Gritsajuk (ottaviano)
  - Kirill chEbba Chebunin (chebba)
  - 
@@ -576,6 +576,7 @@ https://symfony.com/contributors for more information.
  - Mihai Stancu
  - Ivan Nikolaev (destillat)
  - Gildas Quéméner (gquemener)
+ - BoShurik
  - Laurent Masforné (heisenberg)
  - Claude Khedhiri (ck-developer)
  - Desjardins Jérôme (jewome62)
@@ -593,7 +594,6 @@ https://symfony.com/contributors for more information.
  - Asier Illarramendi (doup)
  - Martijn Cuppens
  - Vlad Gregurco (vgregurco)
- - Malte Schlüter (maltemaltesich)
  - Boris Vujicic (boris.vujicic)
  - Artem Lopata
  - Judicaël RUFFIEUX (axanagor)
@@ -624,6 +624,7 @@ https://symfony.com/contributors for more information.
  - Tavo Nieves J
  - Luc Vieillescazes (iamluc)
  - Lukáš Holeczy (holicz)
+ - Erik Saunier (snickers)
  - franek (franek)
  - Raulnet
  - Christian Wahler
@@ -658,6 +659,7 @@ https://symfony.com/contributors for more information.
  - Nathan Dench (ndenc2)
  - Sebastian Bergmann
  - Miroslav Sustek
+ - Michał (bambucha15)
  - Pablo Díez (pablodip)
  - Kevin McBride
  - Sergio Santoro
@@ -666,6 +668,7 @@ https://symfony.com/contributors for more information.
  - Manuel de Ruiter (manuel)
  - Nathanael Noblet (gnat)
  - nikos.sotiropoulos
+ - BENOIT POLASZEK (bpolaszek)
  - Eduardo Oliveira (entering)
  - Oleksii Zhurbytskyi
  - Ilya Antipenko (aivus)
@@ -752,7 +755,6 @@ https://symfony.com/contributors for more information.
  - Michiel Boeckaert (milio)
  - Geoffrey Tran (geoff)
  - Pablo Lozano (arkadis)
- - Kyle
  - Jan Behrens
  - Mantas Var (mvar)
  - Terje Bråten
@@ -794,7 +796,6 @@ https://symfony.com/contributors for more information.
  - James Johnston
  - Noémi Salaün (noemi-salaun)
  - Sinan Eldem
- - BoShurik
  - Alexandre Dupuy (satchette)
  - Michel Hunziker
  - Malte Blättermann
@@ -848,7 +849,7 @@ https://symfony.com/contributors for more information.
  - adev
  - Stefan Warman
  - Tristan Maindron (tmaindron)
- - Behnoush Norouzali (behnoush)
+ - Behnoush norouzali (behnoush)
  - Marko H. Tamminen (gzumba)
  - Wesley Lancel
  - Xavier Briand (xavierbriand)
@@ -871,6 +872,7 @@ https://symfony.com/contributors for more information.
  - Ivan Grigoriev
  - Johann Saunier (prophet777)
  - Sergey (upyx)
+ - Fabien Salles (blacked)
  - Andreas Erhard
  - Michael Devery (mickadoo)
  - Antoine Corcy
@@ -929,7 +931,6 @@ https://symfony.com/contributors for more information.
  - Michel Roca (mroca)
  - Reedy
  - Arturas Smorgun (asarturas)
- - Michał (bambucha15)
  - Alexander Volochnev (exelenz)
  - Michael Piecko
  - Toni Peric (tperic)
@@ -980,8 +981,10 @@ https://symfony.com/contributors for more information.
  - Andrew Tchircoff (andrewtch)
  - michaelwilliams
  - Martin Kirilov
+ - Alexandre Parent
  - 1emming
  - Nykopol (nykopol)
+ - Piotr Kugla (piku235)
  - Jordan Deitch
  - Casper Valdemar Poulsen
  - Josiah (josiah)
@@ -990,9 +993,9 @@ https://symfony.com/contributors for more information.
  - John Bohn (jbohn)
  - Marc Morera (mmoreram)
  - Jason Tan
- - BENOIT POLASZEK (bpolaszek)
  - Julien Pauli
  - Mathieu Rochette (mathroc)
+ - Jérôme Tanghe (deuchnord)
  - Andrew Hilobok (hilobok)
  - Noah Heck (myesain)
  - Christian Soronellas (theunic)
@@ -1045,7 +1048,6 @@ https://symfony.com/contributors for more information.
  - Rafał Wrzeszcz (rafalwrzeszcz)
  - Vincent CHALAMON (vincentchalamon)
  - Reen Lokum
- - Andreas Möller (localheinz)
  - Dennis Langen (nijusan)
  - Martin Parsiegla (spea)
  - Manuel Alejandro Paz Cetina
@@ -1174,7 +1176,6 @@ https://symfony.com/contributors for more information.
  - Benoît Merlet (trompette)
  - Koen Kuipers
  - datibbaw
- - Erik Saunier (snickers)
  - Thiago Cordeiro (thiagocordeiro)
  - Rootie
  - Bernd Stellwag
@@ -1219,6 +1220,7 @@ https://symfony.com/contributors for more information.
  - Christin Gruber (christingruber)
  - Phan Thanh Ha (haphan)
  - Chris Jones (leek)
+ - James Hemery
  - neghmurken
  - xaav
  - Mahmoud Mostafa (mahmoud)
@@ -1547,6 +1549,7 @@ https://symfony.com/contributors for more information.
  - Jorge Vahldick (jvahldick)
  - Frederic Godfrin
  - Paul Matthews
+ - Xesxen
  - Jakub Kisielewski
  - Vacheslav Silyutin
  - Aleksandr Dankovtsev
@@ -1618,6 +1621,7 @@ https://symfony.com/contributors for more information.
  - Lars Ambrosius Wallenborn (larsborn)
  - Oriol Mangas Abellan (oriolman)
  - Sebastian Göttschkes (sgoettschkes)
+ - Frankie Wittevrongel
  - Tatsuya Tsuruoka
  - Ross Tuck
  - Gerben Oolbekkink
@@ -1649,7 +1653,6 @@ https://symfony.com/contributors for more information.
  - Sebastian Utz
  - Adrien Gallou (agallou)
  - Andrea Sprega (asprega)
- - Fabien Salles (blacked)
  - Maks Rafalko (bornfree)
  - Karol Sójko (karolsojko)
  - sl_toto (sl_toto)
@@ -1670,7 +1673,6 @@ https://symfony.com/contributors for more information.
  - Cédric Lahouste (rapotor)
  - Samuel Vogel (samuelvogel)
  - Osayawe Ogbemudia Terry (terdia)
- - Alexandre Parent
  - Berat Doğan
  - Guillaume LECERF
  - Juanmi Rodriguez Cerón
@@ -1701,6 +1703,7 @@ https://symfony.com/contributors for more information.
  - Łukasz Makuch
  - George Giannoulopoulos
  - Alexander Pasichnick
+ - Ilya Ch. (ilya0)
  - Luis Ramirez (luisdeimos)
  - Daniel Richter (richtermeister)
  - ChrisC
@@ -1735,6 +1738,7 @@ https://symfony.com/contributors for more information.
  - Fabien S (bafs)
  - Daniel Rotter (danrot)
  - Frédéric Bouchery (fbouchery)
+ - kylekatarnls (kylekatarnls)
  - Patrick Daley (padrig)
  - Max Summe
  - WedgeSama
@@ -1858,6 +1862,7 @@ https://symfony.com/contributors for more information.
  - Dominik Piekarski (dompie)
  - Andrew (drew)
  - kor3k kor3k (kor3k)
+ - Rares Sebastian Moldovan (raresmldvn)
  - Stelian Mocanita (stelian)
  - Justin (wackymole)
  - Flavian (2much)
@@ -1865,6 +1870,7 @@ https://symfony.com/contributors for more information.
  - mike
  - Gilbertsoft
  - tadas
+ - Bastien Picharles
  - Kirk Madera
  - Keith Maika
  - Mephistofeles
@@ -1901,10 +1907,10 @@ https://symfony.com/contributors for more information.
  - wusuopu
  - povilas
  - Gavin Staniforth
+ - bahram
  - Alessandro Tagliapietra (alex88)
  - Andy Palmer (andyexeter)
  - Biji (biji)
- - Jérôme Tanghe (deuchnord)
  - Alex Teterin (errogaht)
  - Gunnar Lium (gunnarlium)
  - Tiago Garcia (tiagojsag)
@@ -2210,6 +2216,7 @@ https://symfony.com/contributors for more information.
  - Ahmed Hannachi (tiecoders)
  - Vincent LEFORT (vlefort)
  - Walid BOUGHDIRI (walidboughdiri)
+ - wicliff wolda (wickedone)
  - Wim Molenberghs (wimm)
  - Darryl Hein (xmmedia)
  - Sadicov Vladimir (xtech)
@@ -2252,10 +2259,12 @@ https://symfony.com/contributors for more information.
  - Götz Gottwald
  - Veres Lajos
  - Ernest Hymel
+ - LoginovIlya
  - Nick Chiu
  - grifx
  - Robert Campbell
  - Matt Lehner
+ - carlos-ea
  - Helmut Januschka
  - Jérémy Benoist
  - Hein Zaw Htet™
@@ -2272,6 +2281,7 @@ https://symfony.com/contributors for more information.
  - Marin Nicolae
  - Alessandro Loffredo
  - Ian Phillips
+ - Carlos Tasada
  - Haritz
  - Matthieu Prat
  - Grummfy
@@ -2465,6 +2475,7 @@ https://symfony.com/contributors for more information.
  - Matt Fields
  - Olatunbosun Egberinde
  - Andras Debreczeni
+ - Knallcharge
  - Vladimir Sazhin
  - Michel Bardelmeijer
  - Tomas Kmieliauskas
@@ -2513,6 +2524,7 @@ https://symfony.com/contributors for more information.
  - Alexis BOYER
  - Kaipi Yann
  - adam-mospan
+ - Steve Hyde
  - Sam Williams
  - Guillaume Aveline
  - Adrian Philipp
@@ -2624,6 +2636,7 @@ https://symfony.com/contributors for more information.
  - sualko
  - Molkobain
  - Bilge
+ - Yendric
  - ADmad
  - Nicolas Roudaire
  - Matthias Meyer
@@ -2779,6 +2792,7 @@ https://symfony.com/contributors for more information.
  - Michael
  - fh-github@fholzhauer.de
  - AbdElKader Bouadjadja
+ - ddegentesh
  - DSeemiller
  - Jan Emrich
  - Mark Topper

From 369dea8c7275adff9229e325311649dae74ee3c9 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 4 Mar 2021 19:00:27 +0100
Subject: [PATCH 87/87] Update VERSION for 4.4.20

---
 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 b335a4f2077de..18ac83f6a8f45 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.20-DEV';
+    public const VERSION = '4.4.20';
     public const VERSION_ID = 40420;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
     public const RELEASE_VERSION = 20;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';