From 9bf4a24a6e3321c067c7412348b4bc62fbfc235f Mon Sep 17 00:00:00 2001
From: Laurent VOULLEMIER <laurent.voullemier@gmail.com>
Date: Sun, 11 Apr 2021 11:56:19 +0200
Subject: [PATCH 01/67] [Routing] Fix localized paths

---
 .../Component/Routing/Annotation/Route.php    | 14 ++-
 .../Routing/Tests/Annotation/RouteTest.php    | 93 ++++++++++++-------
 .../AnnotationFixtures/FooController.php      | 78 ++++++++++++++++
 .../AttributeFixtures/FooController.php       | 58 ++++++++++++
 4 files changed, 208 insertions(+), 35 deletions(-)
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/FooController.php
 create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/FooController.php

diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index 4751f14b2d84d..dda98eac70ed5 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -69,7 +69,19 @@ public function __construct(
         } elseif (!\is_array($data)) {
             throw new \TypeError(sprintf('"%s": Argument $data is expected to be a string or array, got "%s".', __METHOD__, get_debug_type($data)));
         } elseif ([] !== $data) {
-            trigger_deprecation('symfony/routing', '5.3', 'Passing an array as first argument to "%s" is deprecated. Use named arguments instead.', __METHOD__);
+            $deprecation = false;
+            foreach ($data as $key => $val) {
+                if (\in_array($key, ['path', 'name', 'requirements', 'options', 'defaults', 'host', 'methods', 'schemes', 'condition', 'priority', 'locale', 'format', 'utf8', 'stateless', 'env', 'value'])) {
+                    $deprecation = true;
+                }
+            }
+
+            if ($deprecation) {
+                trigger_deprecation('symfony/routing', '5.3', 'Passing an array as first argument to "%s" is deprecated. Use named arguments instead.', __METHOD__);
+            } else {
+                $localizedPaths = $data;
+                $data = ['path' => $localizedPaths];
+            }
         }
         if (null !== $path && !\is_string($path) && !\is_array($path)) {
             throw new \TypeError(sprintf('"%s": Argument $path is expected to be a string, array or null, got "%s".', __METHOD__, get_debug_type($path)));
diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
index d0c57113adab8..d5f4e19291c6f 100644
--- a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
@@ -11,73 +11,98 @@
 
 namespace Symfony\Component\Routing\Tests\Annotation;
 
+use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\FooController;
+use Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\FooController as FooAttributesController;
 
 class RouteTest extends TestCase
 {
     use ExpectDeprecationTrait;
 
-    /**
-     * @group legacy
-     */
-    public function testInvalidRouteParameter()
+    private function getMethodAnnotation(string $method, bool $attributes): Route
     {
-        $this->expectException(\BadMethodCallException::class);
-        new Route(['foo' => 'bar']);
+        $class = $attributes ? FooAttributesController::class : FooController::class;
+        $reflection = new \ReflectionMethod($class, $method);
+
+        if ($attributes) {
+            $attributes = $reflection->getAttributes(Route::class);
+            $route = $attributes[0]->newInstance();
+        } else {
+            $reader = new AnnotationReader();
+            $route = $reader->getMethodAnnotation($reflection, Route::class);
+        }
+
+        if (!$route instanceof Route) {
+            throw new \Exception('Can\'t parse annotation');
+        }
+
+        return $route;
+    }
+
+    public function provideDeprecationArrayAsFirstArgument()
+    {
+        return [
+            ['requirements', ['locale' => 'en'], 'getRequirements'],
+            ['options', ['compiler_class' => 'RouteCompiler'], 'getOptions'],
+            ['name', 'blog_index', 'getName'],
+            ['defaults', ['_controller' => 'MyBlogBundle:Blog:index'], 'getDefaults'],
+            ['schemes', ['https'], 'getSchemes'],
+            ['methods', ['GET', 'POST'], 'getMethods'],
+            ['host', '{locale}.example.com', 'getHost'],
+            ['condition', 'context.getMethod() == "GET"', 'getCondition'],
+            ['value', '/Blog', 'getPath'],
+            ['value', ['nl' => '/hier', 'en' => '/here'], 'getLocalizedPaths'],
+        ];
     }
 
     /**
      * @group legacy
+     * @dataProvider provideDeprecationArrayAsFirstArgument
      */
-    public function testTryingToSetLocalesDirectly()
+    public function testDeprecationArrayAsFirstArgument(string $parameter, $value, string $getter)
     {
-        $this->expectException(\BadMethodCallException::class);
-        new Route(['locales' => ['nl' => 'bar']]);
+        $this->expectDeprecation('Since symfony/routing 5.3: Passing an array as first argument to "Symfony\Component\Routing\Annotation\Route::__construct" is deprecated. Use named arguments instead.');
+
+        $route = new Route([$parameter => $value]);
+        $this->assertEquals($route->$getter(), $value);
     }
 
     /**
      * @requires PHP 8
      * @dataProvider getValidParameters
      */
-    public function testRouteParameters(string $parameter, $value, string $getter)
+    public function testRouteParameters(string $methodName, string $getter, $expectedReturn)
     {
-        $route = new Route(...[$parameter => $value]);
-        $this->assertEquals($route->$getter(), $value);
+        $route = $this->getMethodAnnotation($methodName, true);
+        $this->assertEquals($route->$getter(), $expectedReturn);
     }
 
     /**
      * @group legacy
-     * @dataProvider getLegacyValidParameters
+     * @dataProvider getValidParameters
      */
-    public function testLegacyRouteParameters(string $parameter, $value, string $getter)
+    public function testLegacyRouteParameters(string $methodName, string $getter, $expectedReturn)
     {
-        $this->expectDeprecation('Since symfony/routing 5.3: Passing an array as first argument to "Symfony\Component\Routing\Annotation\Route::__construct" is deprecated. Use named arguments instead.');
-
-        $route = new Route([$parameter => $value]);
-        $this->assertEquals($route->$getter(), $value);
+        $route = $this->getMethodAnnotation($methodName, false);
+        $this->assertEquals($route->$getter(), $expectedReturn);
     }
 
     public function getValidParameters(): iterable
     {
         return [
-            ['requirements', ['locale' => 'en'], 'getRequirements'],
-            ['options', ['compiler_class' => 'RouteCompiler'], 'getOptions'],
-            ['name', 'blog_index', 'getName'],
-            ['defaults', ['_controller' => 'MyBlogBundle:Blog:index'], 'getDefaults'],
-            ['schemes', ['https'], 'getSchemes'],
-            ['methods', ['GET', 'POST'], 'getMethods'],
-            ['host', '{locale}.example.com', 'getHost'],
-            ['condition', 'context.getMethod() == "GET"', 'getCondition'],
+            ['simplePath', 'getPath', '/Blog'],
+            ['localized', 'getLocalizedPaths', ['nl' => '/hier', 'en' => '/here']],
+            ['requirements', 'getRequirements', ['locale' => 'en']],
+            ['options', 'getOptions', ['compiler_class' => 'RouteCompiler']],
+            ['name', 'getName', 'blog_index'],
+            ['defaults', 'getDefaults', ['_controller' => 'MyBlogBundle:Blog:index']],
+            ['schemes', 'getSchemes', ['https']],
+            ['methods', 'getMethods', ['GET', 'POST']],
+            ['host', 'getHost', '{locale}.example.com'],
+            ['condition', 'getCondition', 'context.getMethod() == \'GET\''],
         ];
     }
-
-    public function getLegacyValidParameters(): iterable
-    {
-        yield from $this->getValidParameters();
-
-        yield ['value', '/Blog', 'getPath'];
-        yield ['value', ['nl' => '/hier', 'en' => '/here'], 'getLocalizedPaths'];
-    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/FooController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/FooController.php
new file mode 100644
index 0000000000000..2eea313bba5a2
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/FooController.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class FooController
+{
+    /**
+     * @Route("/Blog")
+     */
+    public function simplePath()
+    {
+    }
+
+    /**
+     * @Route({"nl":"/hier","en":"/here"})
+     */
+    public function localized()
+    {
+    }
+
+    /**
+     * @Route(requirements={"locale":"en"})
+     */
+    public function requirements()
+    {
+    }
+
+    /**
+     * @Route(options={"compiler_class":"RouteCompiler"})
+     */
+    public function options()
+    {
+    }
+
+    /**
+     * @Route(name="blog_index")
+     */
+    public function name()
+    {
+    }
+
+    /**
+     * @Route(defaults={"_controller":"MyBlogBundle:Blog:index"})
+     */
+    public function defaults()
+    {
+    }
+
+    /**
+     * @Route(schemes={"https"})
+     */
+    public function schemes()
+    {
+    }
+
+    /**
+     * @Route(methods={"GET","POST"})
+     */
+    public function methods()
+    {
+    }
+
+    /**
+     * @Route(host="{locale}.example.com")
+     */
+    public function host()
+    {
+    }
+
+    /**
+     * @Route(condition="context.getMethod() == 'GET'")
+     */
+    public function condition()
+    {
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/FooController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/FooController.php
new file mode 100644
index 0000000000000..d34855913a6dc
--- /dev/null
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/FooController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class FooController
+{
+    #[Route('/Blog')]
+    public function simplePath()
+    {
+    }
+
+    #[Route(['nl' => '/hier', 'en' => '/here'])]
+    public function localized()
+    {
+    }
+
+    #[Route(requirements: ['locale' => 'en'])]
+    public function requirements()
+    {
+    }
+
+    #[Route(options: ['compiler_class' => 'RouteCompiler'])]
+    public function options()
+    {
+    }
+
+    #[Route(name: 'blog_index')]
+    public function name()
+    {
+    }
+
+    #[Route(defaults: ['_controller' => 'MyBlogBundle:Blog:index'])]
+    public function defaults()
+    {
+    }
+
+    #[Route(schemes: ['https'])]
+    public function schemes()
+    {
+    }
+
+    #[Route(methods: ['GET', 'POST'])]
+    public function methods()
+    {
+    }
+
+    #[Route(host: '{locale}.example.com')]
+    public function host()
+    {
+    }
+
+    #[Route(condition: 'context.getMethod() == \'GET\'')]
+    public function condition()
+    {
+    }
+}

From 25813e380470d1780447e5971cfd77cdee9f48cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Fri, 23 Apr 2021 17:09:03 +0200
Subject: [PATCH 02/67] [DependencyInjection] Better exception when a
 configurator is not type hinted

---
 .../Component/DependencyInjection/Loader/PhpFileLoader.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index f10aaac4a16d8..9cc191481d7ee 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -102,7 +102,7 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
         foreach ($parameters as $parameter) {
             $reflectionType = $parameter->getType();
             if (!$reflectionType instanceof \ReflectionNamedType) {
-                throw new \InvalidArgumentException(sprintf('Could not resolve argument "$%s" for "%s".', $parameter->getName(), $path));
+                throw new \InvalidArgumentException(sprintf('Could not resolve argument "$%s" for "%s". You must typehint it (for example with "%s" or "%s").', $parameter->getName(), $path, ContainerConfigurator::class, ContainerBuilder::class));
             }
             $type = $reflectionType->getName();
 

From b7658aac3fc48a9c7762ed2040debf3015a428f8 Mon Sep 17 00:00:00 2001
From: Maciej Zgadzaj <mzgadzaj@hubside.com>
Date: Sat, 24 Apr 2021 23:53:14 +0200
Subject: [PATCH 03/67] PhpDocExtractor: Handle "true" and "false" property
 types

---
 .../Tests/Extractor/PhpDocExtractorTest.php   |  4 +++
 .../Extractor/ReflectionExtractorTest.php     |  8 ++++++
 .../Tests/Fixtures/ParentDummy.php            | 28 +++++++++++++++++++
 src/Symfony/Component/PropertyInfo/Type.php   |  4 +++
 4 files changed, 44 insertions(+)

diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index 3acadc6484be2..1a7dd664af4b8 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -109,7 +109,11 @@ public function typesProvider()
             ['a', [new Type(Type::BUILTIN_TYPE_INT)], 'A.', null],
             ['b', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')], 'B.', null],
             ['c', [new Type(Type::BUILTIN_TYPE_BOOL, true)], null, null],
+            ['ct', [new Type(Type::BUILTIN_TYPE_TRUE, true)], null, null],
+            ['cf', [new Type(Type::BUILTIN_TYPE_FALSE, true)], null, null],
             ['d', [new Type(Type::BUILTIN_TYPE_BOOL)], null, null],
+            ['dt', [new Type(Type::BUILTIN_TYPE_TRUE)], null, null],
+            ['df', [new Type(Type::BUILTIN_TYPE_FALSE)], null, null],
             ['e', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))], null, null],
             ['f', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))], null, null],
             ['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)], 'Nullable array.', null],
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 1f65e57b62bd9..4fad83ef83a37 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -88,7 +88,11 @@ public function testGetProperties()
                 'date',
                 'element',
                 'c',
+                'ct',
+                'cf',
                 'd',
+                'dt',
+                'df',
                 'e',
                 'f',
             ],
@@ -134,7 +138,11 @@ public function testGetPropertiesWithCustomPrefixes()
                 'parentAnnotationNoParent',
                 'date',
                 'c',
+                'ct',
+                'cf',
                 'd',
+                'dt',
+                'df',
                 'e',
                 'f',
             ],
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
index d698983254d75..a7c1f513a78c7 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
@@ -65,6 +65,20 @@ public function isC()
     {
     }
 
+    /**
+     * @return true|null
+     */
+    public function isCt()
+    {
+    }
+
+    /**
+     * @return false|null
+     */
+    public function isCf()
+    {
+    }
+
     /**
      * @return bool
      */
@@ -72,6 +86,20 @@ public function canD()
     {
     }
 
+    /**
+     * @return true
+     */
+    public function canDt()
+    {
+    }
+
+    /**
+     * @return false
+     */
+    public function canDf()
+    {
+    }
+
     /**
      * @param resource $e
      */
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
index 582b98d6411f5..02c387db47483 100644
--- a/src/Symfony/Component/PropertyInfo/Type.php
+++ b/src/Symfony/Component/PropertyInfo/Type.php
@@ -24,6 +24,8 @@ class Type
     public const BUILTIN_TYPE_FLOAT = 'float';
     public const BUILTIN_TYPE_STRING = 'string';
     public const BUILTIN_TYPE_BOOL = 'bool';
+    public const BUILTIN_TYPE_TRUE = 'true';
+    public const BUILTIN_TYPE_FALSE = 'false';
     public const BUILTIN_TYPE_RESOURCE = 'resource';
     public const BUILTIN_TYPE_OBJECT = 'object';
     public const BUILTIN_TYPE_ARRAY = 'array';
@@ -41,6 +43,8 @@ class Type
         self::BUILTIN_TYPE_FLOAT,
         self::BUILTIN_TYPE_STRING,
         self::BUILTIN_TYPE_BOOL,
+        self::BUILTIN_TYPE_TRUE,
+        self::BUILTIN_TYPE_FALSE,
         self::BUILTIN_TYPE_RESOURCE,
         self::BUILTIN_TYPE_OBJECT,
         self::BUILTIN_TYPE_ARRAY,

From 838f36b09f9dc5763b8b2f8007547d0b8b1de9a7 Mon Sep 17 00:00:00 2001
From: Pavel Kirpitsov <pavel.kirpichyov@gmail.com>
Date: Tue, 27 Apr 2021 13:20:43 +0300
Subject: [PATCH 04/67] [Notifier] [Bridge] Store message id for slack
 transport's SendMessage

---
 .../Notifier/Bridge/Slack/SlackTransport.php         |  5 ++++-
 .../Bridge/Slack/Tests/SlackTransportTest.php        | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
index 5a98638ab30d5..740a4937ebd6b 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
@@ -91,6 +91,9 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new TransportException(sprintf('Unable to post the Slack message: "%s".', $result['error']), $response);
         }
 
-        return new SentMessage($message, (string) $this);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['ts']);
+
+        return $sentMessage;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
index 3b7a3c6f8ff64..12e00e3f4a951 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -110,7 +110,7 @@ public function testSendWithOptions()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true]));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
 
         $expectedBody = json_encode(['channel' => $channel, 'text' => $message]);
 
@@ -122,7 +122,9 @@ public function testSendWithOptions()
 
         $transport = $this->createTransport($client, $channel);
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
     }
 
     public function testSendWithNotification()
@@ -138,7 +140,7 @@ public function testSendWithNotification()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true]));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
 
         $notification = new Notification($message);
         $chatMessage = ChatMessage::fromNotification($notification);
@@ -158,7 +160,9 @@ public function testSendWithNotification()
 
         $transport = $this->createTransport($client, $channel);
 
-        $transport->send($chatMessage);
+        $sentMessage = $transport->send($chatMessage);
+
+        $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
     }
 
     public function testSendWithInvalidOptions()

From 92a61b1cf60a90470d620a7f04377dd7e9d9d9f8 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 23 Apr 2021 18:47:46 +0200
Subject: [PATCH 05/67] [Translation] Set default locale for
 IdentityTranslatorTest

---
 .../Component/Translation/Tests/IdentityTranslatorTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php b/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
index a630a7a3ce4f0..16945d38a293a 100644
--- a/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
@@ -23,6 +23,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->defaultLocale = \Locale::getDefault();
+        \Locale::setDefault('en');
     }
 
     protected function tearDown(): void

From a942b5f6849810d45aab163c40381a16d5e8dbd9 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 28 Apr 2021 13:42:03 +0200
Subject: [PATCH 06/67] Avoid regenerating the remember me token if it is still
 fresh

---
 .../Http/RememberMe/PersistentRememberMeHandler.php       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
index 03d41a3950505..952b78cb56418 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
@@ -74,8 +74,12 @@ public function processRememberMe(RememberMeDetails $rememberMeDetails, UserInte
             throw new AuthenticationException('The cookie has expired.');
         }
 
-        $tokenValue = base64_encode(random_bytes(64));
-        $this->tokenProvider->updateToken($series, $this->generateHash($tokenValue), new \DateTime());
+        // if a token was regenerated less than a minute ago, there is no need to regenerate it
+        // if multiple concurrent requests reauthenticate a user we do not want to update the token several times
+        if ($persistentToken->getLastUsed()->getTimestamp() + 60 < time()) {
+            $tokenValue = base64_encode(random_bytes(64));
+            $this->tokenProvider->updateToken($series, $this->generateHash($tokenValue), new \DateTime());
+        }
 
         $this->createCookie($rememberMeDetails->withValue($tokenValue));
     }

From a95bbaaaef1f706836a59f021ac42cd5af576609 Mon Sep 17 00:00:00 2001
From: Roman Anasal <roman.anasal@bdsu.de>
Date: Wed, 28 Apr 2021 22:58:08 +0200
Subject: [PATCH 07/67] [TwigBridge] Fix HTML for translatable custom-file
 label in Bootstrap 4 theme

Bootstraps allows to translate the label of the button of a custom-file
input with SCSS variables depending on the lang attribute of the
*input*.
This attribute was set on the label instead and thus had no effect.
---
 .../Twig/Resources/views/Form/bootstrap_4_layout.html.twig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index c990d81370f3c..b279477265bf8 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -121,11 +121,12 @@
 {% block file_widget -%}
     <{{ element|default('div') }} class="custom-file">
         {%- set type = type|default('file') -%}
-        {{- block('form_widget_simple') -}}
-        {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim }) -%}
         {%- set input_lang = 'en' -%}
         {% if app is defined and app.request is defined %}{%- set input_lang = app.request.locale -%}{%- endif -%}
-        <label for="{{ form.vars.id }}" lang="{{ input_lang }}" {% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
+        {%- set attr = {lang: input_lang} | merge(attr) -%}
+        {{- block('form_widget_simple') -}}
+        {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim }) -%}
+        <label for="{{ form.vars.id }}" {% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
             {%- if attr.placeholder is defined and attr.placeholder is not none -%}
                 {{- translation_domain is same as(false) ? attr.placeholder : attr.placeholder|trans({}, translation_domain) -}}
             {%- endif -%}

From 0501ecc2d82b05b05dd20b599c4071b60bc7f49f Mon Sep 17 00:00:00 2001
From: Alexander Menshchikov <amenshchikov@gmail.com>
Date: Thu, 29 Apr 2021 23:06:38 +0300
Subject: [PATCH 08/67] More accurate message on invalid config builder

Throw exception when try to autowire nested bundle config instead of ConfigBuilder.
Also renamed test class AcmeConfigBuilder to AcmeConfig according config builders auto naming.
---
 .../Loader/PhpFileLoader.php                  |  6 ++-
 .../Tests/Fixtures/AcmeConfig.php             | 42 +++++++++++++++++++
 .../Fixtures/AcmeConfig/NestedConfig.php      | 10 +++++
 .../Tests/Fixtures/AcmeConfigBuilder.php      | 27 ------------
 .../Tests/Fixtures/config/config_builder.php  |  4 +-
 .../Fixtures/config/nested_bundle_config.php  |  7 ++++
 .../Tests/Loader/PhpFileLoaderTest.php        | 12 ++++++
 7 files changed, 78 insertions(+), 30 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig/NestedConfig.php
 delete mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfigBuilder.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_bundle_config.php

diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index a777653140da6..1bf87cd59efd2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -159,12 +159,16 @@ private function configBuilder(string $namespace): ConfigBuilderInterface
 
         // If it does not start with Symfony\Config\ we dont know how to handle this
         if ('Symfony\\Config\\' !== substr($namespace, 0, 15)) {
-            throw new InvalidargumentException(sprintf('Could not find or generate class "%s".', $namespace));
+            throw new InvalidArgumentException(sprintf('Could not find or generate class "%s".', $namespace));
         }
 
         // Try to get the extension alias
         $alias = Container::underscore(substr($namespace, 15, -6));
 
+        if (false !== strpos($alias, '\\')) {
+            throw new InvalidArgumentException('You can only use "root" ConfigBuilders from "Symfony\\Config\\" namespace. Nested classes like "Symfony\\Config\\Framework\\CacheConfig" cannot be used.');
+        }
+
         if (!$this->container->hasExtension($alias)) {
             $extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
             throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s". Looked for namespace "%s", found "%s".', $namespace, $alias, $extensions ? implode('", "', $extensions) : 'none'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig.php
new file mode 100644
index 0000000000000..c6bb3d3244ca4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\Config\Builder\ConfigBuilderInterface;
+
+class AcmeConfig implements ConfigBuilderInterface
+{
+    private $color;
+
+    private $nested;
+
+    public function color($value)
+    {
+        $this->color = $value;
+    }
+
+    public function nested(array $value)
+    {
+        if (null === $this->nested) {
+            $this->nested = new \Symfony\Config\AcmeConfig\NestedConfig();
+        } elseif ([] !== $value) {
+            throw new \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException(sprintf('The node created by "nested()" has already been initialized. You cannot pass values the second time you call nested().'));
+        }
+
+        return $this->nested;
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'color' => $this->color
+        ];
+    }
+
+    public function getExtensionAlias(): string
+    {
+        return 'acme';
+    }
+}
+
+class_alias(AcmeConfig::class, '\\Symfony\\Config\\AcmeConfig');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig/NestedConfig.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig/NestedConfig.php
new file mode 100644
index 0000000000000..0920fa0b264e6
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfig/NestedConfig.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;
+
+class NestedConfig
+{
+}
+
+class_alias(NestedConfig::class, '\\Symfony\\Config\\AcmeConfig\\NestedConfig');
+
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfigBuilder.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfigBuilder.php
deleted file mode 100644
index a89fe4a5447cd..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AcmeConfigBuilder.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
-
-use Symfony\Component\Config\Builder\ConfigBuilderInterface;
-
-class AcmeConfigBuilder implements ConfigBuilderInterface
-{
-    private $color;
-
-    public function color($value)
-    {
-        $this->color = $value;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'color' => $this->color
-        ];
-    }
-
-    public function getExtensionAlias(): string
-    {
-        return 'acme';
-    }
-}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php
index 3dcacf032fcce..71f5e58910be8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/config_builder.php
@@ -1,7 +1,7 @@
 <?php
 
-use Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfigBuilder;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AcmeConfig;
 
-return static function (AcmeConfigBuilder $config) {
+return static function (AcmeConfig $config) {
     $config->color('blue');
 };
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_bundle_config.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_bundle_config.php
new file mode 100644
index 0000000000000..ba1e5de40df32
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/nested_bundle_config.php
@@ -0,0 +1,7 @@
+<?php
+
+use Symfony\Config\AcmeConfig\NestedConfig;
+
+return static function (NestedConfig $config) {
+    throw new RuntimeException('This code should not be run.');
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index ca5ea2cb1c1eb..6fdb4768af566 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -164,4 +164,16 @@ public function testDeprecatedWithoutPackageAndVersion()
         $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
         $loader->load($fixtures.'/config/deprecated_without_package_version.php');
     }
+
+    public function testNestedBundleConfigNotAllowed()
+    {
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $container = new ContainerBuilder();
+        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/^'.preg_quote('Could not resolve argument "Symfony\\Config\\AcmeConfig\\NestedConfig $config"', '/').'/');
+
+        $loader->load($fixtures.'/config/nested_bundle_config.php');
+    }
 }

From 97cafc72e2fc23a4dc00a44c6418a0a57d22fccc Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:38:41 +0200
Subject: [PATCH 09/67] Update CHANGELOG for 4.4.22

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

diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md
index 3a2f916e7fc34..270b76c1c13f2 100644
--- a/CHANGELOG-4.4.md
+++ b/CHANGELOG-4.4.md
@@ -7,6 +7,33 @@ 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.22 (2021-05-01)
+
+ * bug #40993 [Security] [Security/Core] fix checking for bcrypt (nicolas-grekas)
+ * bug #40923 [Yaml] expose references detected in inline notation structures (xabbuh)
+ * bug #40964 [HttpFoundation] Fixes for PHP 8.1 deprecations (jrmajor)
+ * bug #40514 [Yaml] Allow tabs as separators between tokens (bertramakers)
+ * bug #40882 [Cache] phpredis: Added full TLS support for RedisCluster (jackthomasatl)
+ * bug #40793 [DoctrineBridge] Add support for a driver type "attribute" (beberlei)
+ * bug #40807 RequestMatcher issue when `_controller` is a closure (Plopix)
+ * bug #40811 [PropertyInfo] Use the right context for methods defined in traits (colinodell)
+ * bug #40330 [SecurityBundle] Empty line starting with dash under "access_control" causes all rules to be skipped (monteiro)
+ * bug #40780 [Cache] Apply NullAdapter as Null Object (roukmoute)
+ * bug #40740 [Cache][FrameworkBundle] Fix logging for TagAwareAdapter (fancyweb)
+ * bug #40755 [Routing] Better inline requirements and defaults parsing (Foxprodev)
+ * bug #40754 [PhpUnitBridge] Fix phpunit symlink on Windows (johnstevenson)
+ * bug #40707 [Yaml] Fixed infinite loop when parser goes through an additional and invalid closing tag (alexandre-daubois)
+ * bug #40679 [Debug][ErrorHandler] Avoid warning with Xdebug 3 with develop mode disabled (Jean85)
+ * bug #40702 [HttpClient] allow CurlHttpClient on Windows (n0rbyt3)
+ * bug #40503 [Yaml] fix parsing some block sequences (a1812)
+ * bug #40610 Fixed bugs found by psalm (Nyholm)
+ * bug #40603 [Config] Fixed support for nodes not extending BaseNode (Nyholm)
+ * bug #40645 [FrameworkBundle] Dont store cache misses on warmup (Nyholm)
+ * bug #40629 [DependencyInjection] Fix "url" env var processor behavior when the url has no path (fancyweb)
+ * bug #40655 [Cache] skip storing failure-to-save as misses in ArrayAdapter (nicolas-grekas)
+ * bug #40522 [Serializer] Allow AbstractNormalizer to use null for non-optional nullable constructor parameters without default value (Pierre Rineau)
+ * bug #40595 add missing queue_name to find(id) in doctrine messenger transport (monteiro)
+
 * 4.4.21 (2021-03-29)
 
  * bug #40598 [Form] error if the input string couldn't be parsed as a date (xabbuh)

From 7aa72b9028c7a04840a3019962c3edec1ebff58b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:38:47 +0200
Subject: [PATCH 10/67] Update CONTRIBUTORS for 4.4.22

---
 CONTRIBUTORS.md | 70 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8a5518bb3390f..7bc0c71137f9d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -22,25 +22,25 @@ The Symfony Connect username in parenthesis allows to get more information
  - Roland Franssen (ro0)
  - Jakub Zalas (jakubzalas)
  - Johannes S (johannes)
- - Kris Wallsmith (kriswallsmith)
  - Wouter De Jong (wouterj)
+ - Kris Wallsmith (kriswallsmith)
  - Jérémy DERUSSÉ (jderusse)
  - Thomas Calvet (fancyweb)
  - Yonel Ceruto González (yonelceruto)
  - Hugo Hamon (hhamon)
+ - Tobias Nyholm (tobias)
  - Ait Boudad Abdellatif (aitboudad)
  - Samuel ROZE (sroze)
  - Romain Neutron (romain)
  - Pascal Borreli (pborreli)
  - Joseph Bielawski (stloyd)
- - Tobias Nyholm (tobias)
  - Karma Dordrak (drak)
  - Jules Pietri (heah)
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
  - Amrouche Hamza (simperfit)
- - Jeremy Mikola (jmikola)
  - Oskar Stark (oskarstark)
+ - Jeremy Mikola (jmikola)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
@@ -86,15 +86,16 @@ The Symfony Connect username in parenthesis allows to get more information
  - Christian Raue
  - Eric Clemmons (ericclemmons)
  - Charles Sarrazin (csarrazi)
+ - Laurent VOULLEMIER (lvo)
  - Douglas Greenshields (shieldo)
  - Jérôme Tamarelle (gromnan)
- - Laurent VOULLEMIER (lvo)
  - Arnout Boks (aboks)
  - Graham Campbell (graham)
  - David Buchmann (dbu)
  - Deni
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
+ - Vasilij Duško (staff)
  - Dariusz Ruminski
  - Fran Moreno (franmomu)
  - Lee McDermott
@@ -104,16 +105,17 @@ The Symfony Connect username in parenthesis allows to get more information
  - Alex Pott
  - Toni Uebernickel (havvg)
  - Bart van den Burg (burgov)
+ - Vasilij Dusko | CREATION
  - Jordan Alliot (jalliot)
  - John Wards (johnwards)
  - Antoine Hérault (herzult)
  - Paráda József (paradajozsef)
+ - Jérôme Vasseur (jvasseur)
  - Arnaud Le Blanc (arnaud-lb)
  - Sebastiaan Stok (sstok)
  - Maxime STEINHAUSSER
  - Baptiste Clavié (talus)
  - Michal Piotrowski (eventhorizon)
- - Jérôme Vasseur (jvasseur)
  - Tim Nagel (merk)
  - Alexander Schranz (alexander-schranz)
  - Chris Wilkinson (thewilkybarkid)
@@ -122,12 +124,12 @@ The Symfony Connect username in parenthesis allows to get more information
  - marc.weistroff
  - Tomáš Votruba (tomas_votruba)
  - Lars Strojny (lstrojny)
+ - Antoine M (amakdessi)
  - lenar
  - Alexander Schwenn (xelaris)
  - Massimiliano Arione (garak)
  - Włodzimierz Gajda (gajdaw)
  - Adrien Brault (adrienbrault)
- - Antoine M (amakdessi)
  - Jacob Dreesen (jdreesen)
  - Florian Voutzinos (florianv)
  - Teoh Han Hui (teohhanhui)
@@ -144,6 +146,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Fabien Pennequin (fabienpennequin)
  - Théo FIDRY (theofidry)
  - Eric GELOEN (gelo)
+ - Vasilij Dusko
  - Jannik Zschiesche (apfelbox)
  - Jérémy Romey (jeremyfreeagent)
  - Robert Schönthal (digitalkaoz)
@@ -159,11 +162,13 @@ The Symfony Connect username in parenthesis allows to get more information
  - Anthony MARTIN (xurudragon)
  - Sebastian Hörl (blogsh)
  - Daniel Gomes (danielcsgomes)
+ - Vincent Langlet (deviling)
  - Hidenori Goto (hidenorigoto)
  - Alessandro Chitolina (alekitto)
  - Andréia Bohner (andreia)
  - Arnaud Kleinpeter (nanocom)
  - Guilherme Blanco (guilhermeblanco)
+ - Mathias Arlaud (mtarld)
  - SpacePossum
  - Pablo Godel (pgodel)
  - Andreas Braun
@@ -177,7 +182,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Rafael Dohms (rdohms)
  - jwdeitch
  - Ahmed TAILOULOUTE (ahmedtai)
- - Mathias Arlaud (mtarld)
  - Mikael Pajunen
  - Gary PEGEOT (gary-p)
  - HypeMC (hypemc)
@@ -189,6 +193,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Richard Shank (iampersistent)
  - Thomas Rabaix (rande)
  - Vincent Touzet (vincenttouzet)
+ - Saif Eddin Gmati (azjezz)
  - Rouven Weßling (realityking)
  - Jérôme Parmentier (lctrs)
  - Ben Davies (bendavies)
@@ -209,13 +214,14 @@ The Symfony Connect username in parenthesis allows to get more information
  - Samuel NELA (snela)
  - Olivier Dolbeau (odolbeau)
  - Fabien Bourigault (fbourigault)
- - Saif Eddin Gmati (azjezz)
  - James Halsall (jaitsu)
+ - Christian Scheb
  - Florent Mata (fmata)
  - Warnar Boekkooi (boekkooi)
  - Dmitrii Chekaliuk (lazyhammer)
  - Clément JOBEILI (dator)
  - Marek Štípek (maryo)
+ - Jesse Rushlow (geeshoe)
  - Filippo Tessarotto (slamdunk)
  - Daniel Espendiller
  - Possum
@@ -233,7 +239,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Marco Pivetta (ocramius)
  - Smaine Milianni (ismail1432)
  - mcfedr (mcfedr)
- - Christian Scheb
  - Ruben Gonzalez (rubenrua)
  - Benjamin Dulau (dbenjamin)
  - Mathieu Lemoine (lemoinem)
@@ -266,11 +271,13 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dmitrii Poddubnyi (karser)
  - Matthieu Auger (matthieuauger)
  - Leszek Prabucki (l3l0)
+ - Colin O&#039;Dell (colinodell)
  - François Zaninotto (fzaninotto)
  - Dustin Whittle (dustinwhittle)
  - jeff
  - John Kary (johnkary)
  - Tien Vo (tienvx)
+ - Alessandro Lai (jean85)
  - YaFou
  - Justin Hileman (bobthecow)
  - Blanchon Vincent (blanchonvincent)
@@ -279,7 +286,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Baptiste Lafontaine (magnetik)
  - Maxime Veber (nek-)
  - Rui Marinho (ruimarinho)
- - Jesse Rushlow (geeshoe)
  - Eugene Wissner
  - Andreas Möller (localheinz)
  - Edi Modrić (emodric)
@@ -293,6 +299,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Chi-teck
  - Pavel Batanov (scaytrase)
  - Mantis Development
+ - Guilliam Xavier
  - Loïc Faugeron
  - dFayet
  - Antonio Pauletich (x-coder264)
@@ -306,7 +313,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Michael Babker (mbabker)
  - Thomas Lallement (raziel057)
  - Francois Zaninotto
- - Colin O&#039;Dell (colinodell)
  - Alexander Kotynia (olden)
  - Daniel Tschinder
  - Christian Schmidt
@@ -316,7 +322,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Danny Berger (dpb587)
  - zairig imad (zairigimad)
  - Antonio J. García Lagar (ajgarlag)
- - Alessandro Lai (jean85)
  - Adam Prager (padam87)
  - Benoît Burnichon (bburnichon)
  - Maciej Malarz (malarzm)
@@ -358,8 +363,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Bob den Otter (bopp)
  - Thomas Schulz (king2500)
  - Frank de Jonge (frenkynet)
+ - Hugo Monteiro (monteiro)
  - Nikita Konstantinov
  - Wodor Wodorski
+ - Sebastien Morel (plopix)
  - Joe Bennett (kralos)
  - Simon Berger
  - soyuka
@@ -374,7 +381,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Alexander Menshchikov (zmey_kk)
  - Emanuele Panzeri (thepanz)
  - Kim Hemsø Rasmussen (kimhemsoe)
- - Langlet Vincent (deviling)
  - Pascal Luna (skalpa)
  - Wouter Van Hecke
  - Iker Ibarguren (ikerib)
@@ -437,7 +443,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Berny Cantos (xphere81)
  - Thierry Thuon (lepiaf)
  - Guilhem N (guilhemn)
- - Sebastien Morel (plopix)
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
  - ivan
@@ -466,6 +471,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Christian Gärtner (dagardner)
  - Dmytro Borysovskyi (dmytr0)
  - Tomasz Kowalczyk (thunderer)
+ - Johann Pardanaud
  - Sylvain Fabre (sylfabre)
  - Artur Eshenbrener
  - Harm van Tilborg (hvt)
@@ -550,8 +556,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Sander Toonen (xatoo)
  - Anthon Pang (robocoder)
  - Marko Kaznovac (kaznovac)
- - Guilliam Xavier
  - Sébastien Santoro (dereckson)
+ - Mathieu Santostefano
  - Brian King
  - Michel Salib (michelsalib)
  - quentin neyrat (qneyrat)
@@ -565,6 +571,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Webnet team (webnet)
  - Ben Ramsey (ramsey)
  - Marcin Szepczynski (czepol)
+ - Lescot Edouard (idetox)
  - Mohammad Emran Hasan (phpfour)
  - Dmitriy Mamontov (mamontovdmitriy)
  - Jan Schumann
@@ -576,7 +583,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Greg Anderson
  - Islam93
  - lancergr
- - Vincent Langlet
  - Tri Pham (phamuyentri)
  - Mihai Stancu
  - Ivan Nikolaev (destillat)
@@ -605,6 +611,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Judicaël RUFFIEUX (axanagor)
  - Chris Sedlmayr (catchamonkey)
  - Indra Gunawan (indragunawan)
+ - Mathias STRASSER (roukmoute)
  - Kamil Kokot (pamil)
  - Seb Koelen
  - Christoph Mewes (xrstf)
@@ -639,6 +646,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Gintautas Miselis
  - Rob Bast
  - Roberto Espinoza (respinoza)
+ - Pierre Rineau
  - Soufian EZ-ZANTAR (soezz)
  - Zander Baldwin
  - Adam Harvey
@@ -664,8 +672,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Joshua Nye
  - Nathan Dench (ndenc2)
  - Sebastian Bergmann
+ - Matthew Grasmick
  - Miroslav Sustek
  - Pablo Díez (pablodip)
+ - Alexandre Daubois (alexandre-daubois)
  - Kevin McBride
  - Sergio Santoro
  - Robin van der Vleuten (robinvdvleuten)
@@ -676,6 +686,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - BENOIT POLASZEK (bpolaszek)
  - Eduardo Oliveira (entering)
  - Oleksii Zhurbytskyi
+ - Roman Martinuk (a2a4)
  - Ilya Antipenko (aivus)
  - Ricardo Oliveira (ricardolotr)
  - Roy Van Ginneken (rvanginneken)
@@ -700,7 +711,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Jakub Škvára (jskvara)
  - Andrew Udvare (audvare)
  - alexpods
- - Johann Pardanaud
  - Adam Szaraniec (mimol)
  - Dariusz Ruminski
  - Erik Trapman (eriktrapman)
@@ -767,6 +777,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Baptiste Leduc (bleduc)
  - Julien Maulny
  - Gennadi Janzen
+ - James Hemery
  - Jean-Christophe Cuvelier [Artack]
  - Julien Montel (julienmgel)
  - Mátyás Somfai (smatyas)
@@ -807,10 +818,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Simeon Kolev (simeon_kolev9)
  - Joost van Driel (j92)
  - Jonas Elfering
- - Hugo Monteiro (monteiro)
  - Nahuel Cuesta (ncuesta)
  - Chris Boden (cboden)
  - Christophe Villeger (seragan)
+ - Krystian Marcisz (simivar)
  - Matthias Krauser (mkrauser)
  - Julien Fredon
  - Xavier Leune (xleune)
@@ -836,11 +847,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Carlos Pereira De Amorim (epitre)
  - zenmate
  - Michal Trojanowski
- - Lescot Edouard (idetox)
  - Andrii Popov (andrii-popov)
  - David Fuhr
  - Rodrigo Aguilera
- - Mathias STRASSER (roukmoute)
+ - Vladimir Varlamov (iamvar)
  - Max Grigorian (maxakawizard)
  - Guilherme Augusto Henschel
  - Rostyslav Kinash
@@ -871,7 +881,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Chris Heng (gigablah)
  - Shaun Simmons (simshaun)
  - Richard Bradley
- - Mathieu Santostefano
  - Ulumuddin Yunus (joenoez)
  - rtek
  - Ivan Grigoriev
@@ -947,7 +956,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Indra Gunawan (guind)
  - Roberto Nygaard
  - Peter Ward
- - Matthew Grasmick
  - Davide Borsatto (davide.borsatto)
  - Gert de Pagter
  - Julien DIDIER (juliendidier)
@@ -959,7 +967,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Jeroen van den Enden (stoefke)
  - Pascal Helfenstein
  - Baldur Rensch (brensch)
- - Pierre Rineau
  - Fritz Michael Gschwantner
  - Vladyslav Petrovych
  - Alex Xandra Albert Sim
@@ -1099,7 +1106,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Peter Bowyer (pbowyer)
  - Aleksey Podskrebyshev
  - Calin Mihai Pristavu
- - Vincent Langlet
  - David Marín Carreño (davefx)
  - Fabien LUCAS (flucas2)
  - Konstantin Grachev (grachevko)
@@ -1203,6 +1209,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - d-ph
  - Stewart Malik
  - Renan Taranto (renan-taranto)
+ - Stefan Graupner (efrane)
  - Gemorroj (gemorroj)
  - Rikijs Murgs
  - Mihail Krasilnikov (krasilnikovm)
@@ -1229,7 +1236,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Christin Gruber (christingruber)
  - Phan Thanh Ha (haphan)
  - Chris Jones (leek)
- - James Hemery
  - neghmurken
  - xaav
  - Mahmoud Mostafa (mahmoud)
@@ -1258,7 +1264,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Iliya Miroslavov Iliev (i.miroslavov)
  - Safonov Nikita (ns3777k)
  - Ross Motley (rossmotley)
- - Krystian Marcisz (simivar)
  - ttomor
  - Mei Gwilym (meigwilym)
  - Michael H. Arieli (excelwebzone)
@@ -1313,6 +1318,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - DerManoMann
  - Damien  Fayet (rainst0rm)
  - Ippei SUmida (ippey_s)
+ - Maxim Dovydenok (shiftby)
  - MatTheCat
  - Guillaume Royer
  - Artem (digi)
@@ -1433,6 +1439,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Cristobal Dabed
  - Daniel Mecke (daniel_mecke)
  - Matteo Giachino (matteosister)
+ - Pavel Kirpitsov (pavel-kirpichyov)
  - Alex Demchenko (pilot)
  - Tadas Gliaubicas (tadcka)
  - Thanos Polymeneas (thanos)
@@ -1769,6 +1776,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Frédéric Bouchery (fbouchery)
  - kylekatarnls (kylekatarnls)
  - Patrick Daley (padrig)
+ - Foxprodev
  - Max Summe
  - WedgeSama
  - Hugo Sales
@@ -1835,7 +1843,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Wouter Diesveld
  - Romain
  - Matěj Humpál
- - Vincent Langlet
  - Amine Matmati
  - caalholm
  - Nouhail AL FIDI (alfidi)
@@ -1936,6 +1943,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Maarten de Boer
  - Malte Wunsch
  - wusuopu
+ - Markus Staab
  - povilas
  - Gavin Staniforth
  - bahram
@@ -1970,6 +1978,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - ryunosuke
  - Bruno BOUTAREL
  - victoria
+ - John Stevenson
  - Francisco Facioni (fran6co)
  - Stanislav Gamayunov (happyproff)
  - Iwan van Staveren (istaveren)
@@ -1988,6 +1997,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Matt Farmer
  - catch
  - siganushka
+ - roromix
  - Alexandre Segura
  - Josef Cech
  - Glodzienski
@@ -2126,6 +2136,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Chris
  - Farid Jalilov
  - Florent Olivaud
+ - Foxprodev
  - Eric Hertwig
  - JakeFr
  - Oliver Klee
@@ -2268,6 +2279,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - James Hudson
  - Tom Maguire
  - Mateusz Lerczak
+ - Andrii Dembitskyi
  - Richard Quadling
  - David Zuelke
  - Adrian
@@ -2319,6 +2331,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Haritz
  - Matthieu Prat
  - Grummfy
+ - lerminou
  - pdragun
  - Paul Le Corre
  - Filipe Guerra
@@ -2399,6 +2412,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Joeri Verdeyen (jverdeyen)
  - Kevin Verschaeve (keversc)
  - Kevin Herrera (kherge)
+ - Kubicki Kamil (kubik)
  - Simon Leblanc (leblanc_simon)
  - Luis Ramón López López (lrlopez)
  - Mehdi Mabrouk (mehdidev)
@@ -2469,6 +2483,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ramon Henrique Ornelas (ramonornela)
  - Ricardo de Vries (ricknox)
  - Simon Heimberg (simon_heimberg)
+ - Stefano Cappellini (stefano_cappellini)
  - Thomas Dutrion (theocrite)
  - Till Klampaeckel (till)
  - Tobias Weinert (tweini)
@@ -2568,6 +2583,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Kasperki
  - Tammy D
  - tsilefy
+ - Enrico
  - Ryan Rud
  - Ondrej Slinták
  - vlechemin

From f015673f30fe4573627203ee6533c2e671e7e86e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:38:48 +0200
Subject: [PATCH 11/67] Update VERSION for 4.4.22

---
 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 447c9936eb1d9..947c871e15191 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.22-DEV';
+    public const VERSION = '4.4.22';
     public const VERSION_ID = 40422;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
     public const RELEASE_VERSION = 22;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';

From 30dd60857692d182aaa0a0d38ee69cb2848fdd3b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:48:05 +0200
Subject: [PATCH 12/67] Bump Symfony version to 4.4.23

---
 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 947c871e15191..c0d460634dec4 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.22';
-    public const VERSION_ID = 40422;
+    public const VERSION = '4.4.23-DEV';
+    public const VERSION_ID = 40423;
     public const MAJOR_VERSION = 4;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 22;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 23;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '11/2022';
     public const END_OF_LIFE = '11/2023';

From 849829f3f170c883821fa10d0af6996453cd4d62 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:53:01 +0200
Subject: [PATCH 13/67] Update CHANGELOG for 5.2.7

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

diff --git a/CHANGELOG-5.2.md b/CHANGELOG-5.2.md
index 5e5f455254f7a..112bd2968ddf3 100644
--- a/CHANGELOG-5.2.md
+++ b/CHANGELOG-5.2.md
@@ -7,6 +7,42 @@ in 5.2 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/v5.2.0...v5.2.1
 
+* 5.2.7 (2021-05-01)
+
+ * bug #41008 [Security] Do not try to rehash null-passwords (tjveldhuizen)
+ * bug #40993 [Security] [Security/Core] fix checking for bcrypt (nicolas-grekas)
+ * bug #40923 [Yaml] expose references detected in inline notation structures (xabbuh)
+ * bug #40964 [HttpFoundation] Fixes for PHP 8.1 deprecations (jrmajor)
+ * bug #40919 [Mailer] use correct spelling when accessing the SMTP php.ini value (xabbuh)
+ * bug #40514 [Yaml] Allow tabs as separators between tokens (bertramakers)
+ * bug #40882 [Cache] phpredis: Added full TLS support for RedisCluster (jackthomasatl)
+ * bug #40872 [DependencyInjection] [AliasDeprecatedPublicServicesPass] Noop when the service is private (fancyweb)
+ * bug #40802 [FrameworkBundle] Fix array controller link in debug:router (fancyweb)
+ * bug #40793 [DoctrineBridge] Add support for a driver type "attribute" (beberlei)
+ * bug #40807 RequestMatcher issue when `_controller` is a closure (Plopix)
+ * bug #40811 [PropertyInfo] Use the right context for methods defined in traits (colinodell)
+ * bug #40791 [WebProfilerBundle] Use ControllerReference instead of URL in twig render() (Foxprodev)
+ * bug #40330 [SecurityBundle] Empty line starting with dash under "access_control" causes all rules to be skipped (monteiro)
+ * bug #40780 [Cache] Apply NullAdapter as Null Object (roukmoute)
+ * bug #40740 [Cache][FrameworkBundle] Fix logging for TagAwareAdapter (fancyweb)
+ * bug #40755 [Routing] Better inline requirements and defaults parsing (Foxprodev)
+ * bug #40754 [PhpUnitBridge] Fix phpunit symlink on Windows (johnstevenson)
+ * bug #40660 [Form] Fix 'invalid_message' use in multiple ChoiceType (alexandre-daubois)
+ * bug #40707 [Yaml] Fixed infinite loop when parser goes through an additional and invalid closing tag (alexandre-daubois)
+ * bug #40698 [Console] Add Helper::width() and Helper::length() (Nyholm, grasmash)
+ * bug #40679 [Debug][ErrorHandler] Avoid warning with Xdebug 3 with develop mode disabled (Jean85)
+ * bug #40702 [HttpClient] allow CurlHttpClient on Windows (n0rbyt3)
+ * bug #40503 [Yaml] fix parsing some block sequences (a1812)
+ * bug #40610 Fixed bugs found by psalm (Nyholm)
+ * bug #40603 [Config] Fixed support for nodes not extending BaseNode (Nyholm)
+ * bug #40658 [RateLimiter] Fix sleep value (jderusse)
+ * bug #40645 [FrameworkBundle] Dont store cache misses on warmup (Nyholm)
+ * bug #40629 [DependencyInjection] Fix "url" env var processor behavior when the url has no path (fancyweb)
+ * bug #40655 [Cache] skip storing failure-to-save as misses in ArrayAdapter (nicolas-grekas)
+ * bug #40522 [Serializer] Allow AbstractNormalizer to use null for non-optional nullable constructor parameters without default value (Pierre Rineau)
+ * bug #40595 add missing queue_name to find(id) in doctrine messenger transport (monteiro)
+ * bug #40619 [FrameworkBundle] dont access the container to configure http_cache (nicolas-grekas)
+
 * 5.2.6 (2021-03-29)
 
  * bug #40598 [Form] error if the input string couldn't be parsed as a date (xabbuh)

From c3b3c33d4193d00181f05d2725ccc16d624d964b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:53:15 +0200
Subject: [PATCH 14/67] Update VERSION for 5.2.7

---
 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 774f1f3a4d085..112f9f2bd8fd1 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -74,12 +74,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '5.2.7-DEV';
+    public const VERSION = '5.2.7';
     public const VERSION_ID = 50207;
     public const MAJOR_VERSION = 5;
     public const MINOR_VERSION = 2;
     public const RELEASE_VERSION = 7;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '07/2021';
     public const END_OF_LIFE = '07/2021';

From 77c2496c884f781ff21252c2f5a18011bd36a125 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 16:56:20 +0200
Subject: [PATCH 15/67] Bump Symfony version to 5.2.8

---
 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 112f9f2bd8fd1..0366897e82820 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -74,12 +74,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '5.2.7';
-    public const VERSION_ID = 50207;
+    public const VERSION = '5.2.8-DEV';
+    public const VERSION_ID = 50208;
     public const MAJOR_VERSION = 5;
     public const MINOR_VERSION = 2;
-    public const RELEASE_VERSION = 7;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 8;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '07/2021';
     public const END_OF_LIFE = '07/2021';

From b6966d90911028b12e920c5d9e6e53562af665e0 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 1 May 2021 17:01:32 +0200
Subject: [PATCH 16/67] Bump Symfony version to 5.3.0

---
 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 480fb5dc3ca4c..330ca1ef85c7d 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -75,12 +75,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '5.3.0-BETA2';
+    public const VERSION = '5.3.0-DEV';
     public const VERSION_ID = 50300;
     public const MAJOR_VERSION = 5;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'BETA2';
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '05/2021';
     public const END_OF_LIFE = '01/2022';

From 2ba1f89a3a25cfa41c54c3a54785b3ea2b1cdea9 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sun, 2 May 2021 10:42:38 +0200
Subject: [PATCH 17/67] fix merge

---
 .../Http/Tests/EventListener/PasswordMigratingListenerTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
index 3d8be2767bf78..8164548dacb0d 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -114,7 +114,7 @@ public function testUserWithoutPassword()
     {
         $this->user = new User('test', null);
 
-        $this->encoderFactory->expects($this->never())->method('getEncoder');
+        $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
         $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word')]));
         $this->listener->onLoginSuccess($event);

From d2b38fa54a920c93da45029fc257d0ab5014509f Mon Sep 17 00:00:00 2001
From: cybernet <cybernet2u@yahoo.com>
Date: Sun, 2 May 2021 11:15:38 +0100
Subject: [PATCH 18/67] Update Romanian Translation based on English

2 missing keys
---
 .../Core/Resources/translations/security.ro.xlf    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
index 1462e650e9c4b..9324a8649d1a1 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ro.xlf
@@ -20,7 +20,7 @@
             </trans-unit>
             <trans-unit id="5">
                 <source>Cookie has already been used by someone else.</source>
-                <target>Cookieul este folosit deja de altcineva.</target>
+                <target>Cookie este folosit deja de altcineva.</target>
             </trans-unit>
             <trans-unit id="6">
                 <source>Not privileged to request the resource.</source>
@@ -28,7 +28,7 @@
             </trans-unit>
             <trans-unit id="7">
                 <source>Invalid CSRF token.</source>
-                <target>Tokenul CSRF este invalid.</target>
+                <target>Token CSRF este invalid.</target>
             </trans-unit>
             <trans-unit id="9">
                 <source>No authentication provider found to support the authentication token.</source>
@@ -36,7 +36,7 @@
             </trans-unit>
             <trans-unit id="10">
                 <source>No session available, it either timed out or cookies are not enabled.</source>
-                <target>Sesiunea nu mai este disponibilă, a expirat sau suportul pentru cookieuri nu este activat.</target>
+                <target>Sesiunea nu mai este disponibilă, a expirat sau suportul pentru cookies nu este activat.</target>
             </trans-unit>
             <trans-unit id="11">
                 <source>No token could be found.</source>
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Link de autentificare invalid sau expirat.</target>
             </trans-unit>
+             <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Prea multe încercări nereușite, încearcă din nou în %minutes% minut.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Prea multe încercări nereușite, încearcă din nou în %minutes% minute.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 0caad4f72d08d007b9c1282836aa2bb17a49ab78 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 1 May 2021 20:09:29 +0200
Subject: [PATCH 19/67] [PasswordHasher] Improved BC layer

---
 .../Hasher/PasswordHasherFactory.php          | 13 +++-
 .../Hasher/PasswordHasherFactoryTest.php      | 19 ++++++
 .../Component/PasswordHasher/composer.json    |  3 +
 .../Security/Core/Encoder/EncoderFactory.php  | 10 +++-
 .../Encoder/LegacyPasswordHasherEncoder.php   | 52 ++++++++++++++++
 .../Core/Encoder/PasswordHasherAdapter.php    | 46 ++++++++++++++
 .../Core/Encoder/PasswordHasherEncoder.php    | 60 +++++++++++++++++++
 .../Core/Tests/Encoder/EncoderFactoryTest.php | 32 ++++++++--
 8 files changed, 229 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Component/Security/Core/Encoder/LegacyPasswordHasherEncoder.php
 create mode 100644 src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php
 create mode 100644 src/Symfony/Component/Security/Core/Encoder/PasswordHasherEncoder.php

diff --git a/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php b/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php
index b75573f746e89..62c5e37e85a81 100644
--- a/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php
+++ b/src/Symfony/Component/PasswordHasher/Hasher/PasswordHasherFactory.php
@@ -14,6 +14,8 @@
 use Symfony\Component\PasswordHasher\Exception\LogicException;
 use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface;
+use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
+use Symfony\Component\Security\Core\Encoder\PasswordHasherAdapter;
 
 /**
  * A generic hasher factory implementation.
@@ -25,6 +27,9 @@ class PasswordHasherFactory implements PasswordHasherFactoryInterface
 {
     private $passwordHashers;
 
+    /**
+     * @param array<string, PasswordHasherInterface|array> $passwordHashers
+     */
     public function __construct(array $passwordHashers)
     {
         $this->passwordHashers = $passwordHashers;
@@ -57,7 +62,10 @@ public function getPasswordHasher($user): PasswordHasherInterface
         }
 
         if (!$this->passwordHashers[$hasherKey] instanceof PasswordHasherInterface) {
-            $this->passwordHashers[$hasherKey] = $this->createHasher($this->passwordHashers[$hasherKey]);
+            $this->passwordHashers[$hasherKey] = $this->passwordHashers[$hasherKey] instanceof PasswordEncoderInterface
+                ? new PasswordHasherAdapter($this->passwordHashers[$hasherKey])
+                : $this->createHasher($this->passwordHashers[$hasherKey])
+            ;
         }
 
         return $this->passwordHashers[$hasherKey];
@@ -82,6 +90,9 @@ private function createHasher(array $config, bool $isExtra = false): PasswordHas
         }
 
         $hasher = new $config['class'](...$config['arguments']);
+        if (!$hasher instanceof PasswordHasherInterface && $hasher instanceof PasswordEncoderInterface) {
+            $hasher = new PasswordHasherAdapter($hasher);
+        }
 
         if ($isExtra || !\in_array($config['class'], [NativePasswordHasher::class, SodiumPasswordHasher::class], true)) {
             return $hasher;
diff --git a/src/Symfony/Component/PasswordHasher/Tests/Hasher/PasswordHasherFactoryTest.php b/src/Symfony/Component/PasswordHasher/Tests/Hasher/PasswordHasherFactoryTest.php
index 633e38e39eef0..bebd95b1958df 100644
--- a/src/Symfony/Component/PasswordHasher/Tests/Hasher/PasswordHasherFactoryTest.php
+++ b/src/Symfony/Component/PasswordHasher/Tests/Hasher/PasswordHasherFactoryTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface;
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;
 use Symfony\Component\PasswordHasher\Hasher\SodiumPasswordHasher;
+use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -176,6 +177,24 @@ public function testDefaultMigratingHashers()
             (new PasswordHasherFactory([SomeUser::class => ['class' => SodiumPasswordHasher::class, 'arguments' => []]]))->getPasswordHasher(SomeUser::class)
         );
     }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyEncoderObject()
+    {
+        $factory = new PasswordHasherFactory([SomeUser::class => new PlaintextPasswordEncoder()]);
+        self::assertSame('foo{bar}', $factory->getPasswordHasher(SomeUser::class)->hash('foo', 'bar'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testLegacyEncoderClass()
+    {
+        $factory = new PasswordHasherFactory([SomeUser::class => ['class' => PlaintextPasswordEncoder::class, 'arguments' => []]]);
+        self::assertSame('foo{bar}', $factory->getPasswordHasher(SomeUser::class)->hash('foo', 'bar'));
+    }
 }
 
 class SomeUser implements UserInterface
diff --git a/src/Symfony/Component/PasswordHasher/composer.json b/src/Symfony/Component/PasswordHasher/composer.json
index 2ed22ee7066d5..009895076017b 100644
--- a/src/Symfony/Component/PasswordHasher/composer.json
+++ b/src/Symfony/Component/PasswordHasher/composer.json
@@ -23,6 +23,9 @@
         "symfony/security-core": "^5.3",
         "symfony/console": "^5"
     },
+    "conflict": {
+        "symfony/security-core": "<5.3"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PasswordHasher\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
index d1855aa1e47d5..526c461e5ec40 100644
--- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
+++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface;
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;
+use Symfony\Component\PasswordHasher\LegacyPasswordHasherInterface;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\Exception\LogicException;
 
 trigger_deprecation('symfony/security-core', '5.3', 'The "%s" class is deprecated, use "%s" instead.', EncoderFactory::class, PasswordHasherFactory::class);
@@ -60,7 +62,13 @@ public function getEncoder($user)
         }
 
         if (!$this->encoders[$encoderKey] instanceof PasswordEncoderInterface) {
-            $this->encoders[$encoderKey] = $this->createEncoder($this->encoders[$encoderKey]);
+            if ($this->encoders[$encoderKey] instanceof LegacyPasswordHasherInterface) {
+                $this->encoders[$encoderKey] = new LegacyPasswordHasherEncoder($this->encoders[$encoderKey]);
+            } elseif ($this->encoders[$encoderKey] instanceof PasswordHasherInterface) {
+                $this->encoders[$encoderKey] = new PasswordHasherEncoder($this->encoders[$encoderKey]);
+            } else {
+                $this->encoders[$encoderKey] = $this->createEncoder($this->encoders[$encoderKey]);
+            }
         }
 
         return $this->encoders[$encoderKey];
diff --git a/src/Symfony/Component/Security/Core/Encoder/LegacyPasswordHasherEncoder.php b/src/Symfony/Component/Security/Core/Encoder/LegacyPasswordHasherEncoder.php
new file mode 100644
index 0000000000000..7e57ff2383e05
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Encoder/LegacyPasswordHasherEncoder.php
@@ -0,0 +1,52 @@
+<?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\Security\Core\Encoder;
+
+use Symfony\Component\PasswordHasher\Exception\InvalidPasswordException;
+use Symfony\Component\PasswordHasher\LegacyPasswordHasherInterface;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+
+/**
+ * Forward compatibility for new new PasswordHasher component.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @internal To be removed in Symfony 6
+ */
+final class LegacyPasswordHasherEncoder implements PasswordEncoderInterface
+{
+    private $passwordHasher;
+
+    public function __construct(LegacyPasswordHasherInterface $passwordHasher)
+    {
+        $this->passwordHasher = $passwordHasher;
+    }
+
+    public function encodePassword(string $raw, ?string $salt): string
+    {
+        try {
+            return $this->passwordHasher->hash($raw, $salt);
+        } catch (InvalidPasswordException $e) {
+            throw new BadCredentialsException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function isPasswordValid(string $encoded, string $raw, ?string $salt): bool
+    {
+        return $this->passwordHasher->verify($encoded, $raw, $salt);
+    }
+
+    public function needsRehash(string $encoded): bool
+    {
+        return $this->passwordHasher->needsRehash($encoded);
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php
new file mode 100644
index 0000000000000..4a4b9c0b138bb
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherAdapter.php
@@ -0,0 +1,46 @@
+<?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\Security\Core\Encoder;
+
+use Symfony\Component\PasswordHasher\LegacyPasswordHasherInterface;
+
+/**
+ * Forward compatibility for new new PasswordHasher component.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @internal To be removed in Symfony 6
+ */
+final class PasswordHasherAdapter implements LegacyPasswordHasherInterface
+{
+    private $passwordEncoder;
+
+    public function __construct(PasswordEncoderInterface $passwordEncoder)
+    {
+        $this->passwordEncoder = $passwordEncoder;
+    }
+
+    public function hash(string $plainPassword, ?string $salt = null): string
+    {
+        return $this->passwordEncoder->encodePassword($plainPassword, $salt);
+    }
+
+    public function verify(string $hashedPassword, string $plainPassword, ?string $salt = null): bool
+    {
+        return $this->passwordEncoder->isPasswordValid($hashedPassword, $plainPassword, $salt);
+    }
+
+    public function needsRehash(string $hashedPassword): bool
+    {
+        return $this->passwordEncoder->needsRehash($hashedPassword);
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordHasherEncoder.php b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherEncoder.php
new file mode 100644
index 0000000000000..d37875dcc2770
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Encoder/PasswordHasherEncoder.php
@@ -0,0 +1,60 @@
+<?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\Security\Core\Encoder;
+
+use Symfony\Component\PasswordHasher\Exception\InvalidPasswordException;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+
+/**
+ * Forward compatibility for new new PasswordHasher component.
+ *
+ * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @internal To be removed in Symfony 6
+ */
+final class PasswordHasherEncoder implements PasswordEncoderInterface, SelfSaltingEncoderInterface
+{
+    private $passwordHasher;
+
+    public function __construct(PasswordHasherInterface $passwordHasher)
+    {
+        $this->passwordHasher = $passwordHasher;
+    }
+
+    public function encodePassword(string $raw, ?string $salt): string
+    {
+        if (null !== $salt) {
+            throw new \InvalidArgumentException('This password hasher does not support passing a salt.');
+        }
+
+        try {
+            return $this->passwordHasher->hash($raw);
+        } catch (InvalidPasswordException $e) {
+            throw new BadCredentialsException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    public function isPasswordValid(string $encoded, string $raw, ?string $salt): bool
+    {
+        if (null !== $salt) {
+            throw new \InvalidArgumentException('This password hasher does not support passing a salt.');
+        }
+
+        return $this->passwordHasher->verify($encoded, $raw);
+    }
+
+    public function needsRehash(string $encoded): bool
+    {
+        return $this->passwordHasher->needsRehash($encoded);
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
index 3744e05bc0efa..7b05c9be0a93c 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -12,17 +12,20 @@
 namespace Symfony\Component\Security\Core\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\PasswordHasher\Hasher\MessageDigestPasswordHasher;
+use Symfony\Component\PasswordHasher\Hasher\NativePasswordHasher;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;
+use Symfony\Component\PasswordHasher\Hasher\PlaintextPasswordHasher;
 use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\MigratingPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
+use Symfony\Component\Security\Core\Encoder\SelfSaltingEncoderInterface;
 use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder;
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface;
-use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;
-use Symfony\Component\PasswordHasher\Hasher\MessageDigestPasswordHasher;
 
 /**
  * @group legacy
@@ -193,6 +196,28 @@ public function testHasherAwareCompat()
         $expectedEncoder = new MessageDigestPasswordHasher('sha1');
         $this->assertEquals($expectedEncoder->hash('foo', ''), $encoder->hash('foo', ''));
     }
+
+    public function testLegacyPasswordHasher()
+    {
+        $factory = new EncoderFactory([
+            SomeUser::class => new PlaintextPasswordHasher(),
+        ]);
+
+        $encoder = $factory->getEncoder(new SomeUser());
+        self::assertNotInstanceOf(SelfSaltingEncoderInterface::class, $encoder);
+        self::assertSame('foo{bar}', $encoder->encodePassword('foo', 'bar'));
+    }
+
+    public function testPasswordHasher()
+    {
+        $factory = new EncoderFactory([
+            SomeUser::class => new NativePasswordHasher(),
+        ]);
+
+        $encoder = $factory->getEncoder(new SomeUser());
+        self::assertInstanceOf(SelfSaltingEncoderInterface::class, $encoder);
+        self::assertTrue($encoder->isPasswordValid($encoder->encodePassword('foo', null), 'foo', null));
+    }
 }
 
 class SomeUser implements UserInterface
@@ -236,7 +261,6 @@ public function getEncoderName(): ?string
     }
 }
 
-
 class HasherAwareUser extends SomeUser implements PasswordHasherAwareInterface
 {
     public $hasherName = 'encoder_name';

From 89057b97d0a46dd18c96e11408a76e68c0ff6066 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@gmail.com>
Date: Sun, 2 May 2021 17:43:59 +0200
Subject: [PATCH 20/67] Add missing Hungarian translations

---
 .../Security/Core/Resources/translations/security.hu.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
index e27a7b4505c53..4587e8a96aadc 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.hu.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Érvénytelen vagy lejárt bejelentkezési link.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Túl sok sikertelen bejelentkezési kísérlet, kérjük próbálja újra %minutes% perc múlva.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Túl sok sikertelen bejelentkezési kísérlet, kérjük próbálja újra %minutes% perc múlva.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 3703010b1bd4e01da11f9fae1a3aa6a14ad67816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <schaedlich.jan@gmail.com>
Date: Sun, 2 May 2021 18:29:24 +0100
Subject: [PATCH 21/67] add missing vietnamese translations

---
 .../Security/Core/Resources/translations/security.vi.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
index efe83c3194b0c..5ad00a69b9a5c 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.vi.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Liên kết đăng nhập không hợp lệ hoặc quá hạn.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Quá nhiều lần thử đăng nhập không thành công, vui lòng thử lại sau %minutes% phút.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Quá nhiều lần thử đăng nhập không thành công, vui lòng thử lại sau %minutes% phút.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 68c10337ccc7d7a661b56a56af25ea2c13c8b5f4 Mon Sep 17 00:00:00 2001
From: Mouad ZIANI <mouad.ziani1997@gmail.com>
Date: Sun, 2 May 2021 09:00:17 +0000
Subject: [PATCH 22/67] [Security] Update Security Arabic Translations

---
 .../Security/Core/Resources/translations/security.ar.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
index 5dda050e22e7e..11b20016016e3 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ar.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>رابط تسجيل الدخول غير صالح أو منتهي الصلاحية.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>عدد كبير جدا من محاولات الدخول الفاشلة، يرجى اعادة المحاولة بعد %minutes% دقيقة.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>عدد كبير جدا من محاولات الدخول الفاشلة، يرجى اعادة المحاولة بعد %minutes% دقيقة.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From e30eb8f555b3090ebb3dd552247cfb0ae0a8a146 Mon Sep 17 00:00:00 2001
From: Christiaan Wiesenekker <cwiesenekker@gmail.com>
Date: Sun, 2 May 2021 22:22:44 +0200
Subject: [PATCH 23/67] [Security] Add missing Dutch translations

---
 .../Security/Core/Resources/translations/security.nl.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
index 978d92b15b728..b07c785799514 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nl.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ongeldige of verlopen inloglink.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuut.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Te veel onjuiste inlogpogingen, probeer het opnieuw over %minutes% minuten.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 7a1a91017df6a852e9089b0bf095707e30b10f0d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 2 May 2021 19:36:00 +0200
Subject: [PATCH 24/67] [ErrorHandler] Skip "same vendor" `@method`
 deprecations for `Symfony\*` classes unless symfony/symfony is being tested

---
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 9938ff71865e7..36fb2ded75b3e 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\ErrorHandler;
 
+use Composer\InstalledVersions;
 use Doctrine\Common\Persistence\Proxy as LegacyProxy;
 use Doctrine\Persistence\Proxy;
 use Mockery\MockInterface;
@@ -492,6 +493,14 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
                         self::$method[$class] = self::$method[$use];
                     }
                 } elseif (!$refl->isInterface()) {
+                    if (!strncmp($vendor, str_replace('_', '\\', $use), $vendorLen)
+                        && 0 === strpos($className, 'Symfony\\')
+                        && (!class_exists(InstalledVersions::class)
+                            || 'symfony/symfony' !== InstalledVersions::getRootPackage()['name'])
+                    ) {
+                        // skip "same vendor" @method deprecations for Symfony\* classes unless symfony/symfony is being tested
+                        continue;
+                    }
                     $hasCall = $refl->hasMethod('__call');
                     $hasStaticCall = $refl->hasMethod('__callStatic');
                     foreach (self::$method[$use] as $method) {

From 337f828b2362fddcb4663b335848f03c2c821d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <schaedlich.jan@gmail.com>
Date: Fri, 23 Apr 2021 06:58:19 +0100
Subject: [PATCH 25/67] Make FailoverTransport always pick the first transport

---
 .../Tests/Transport/FailoverTransportTest.php | 166 ++++++++++++++++++
 .../Notifier/Transport/FailoverTransport.php  |   5 +
 .../Transport/RoundRobinTransport.php         |  21 ++-
 3 files changed, 188 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php

diff --git a/src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php b/src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php
new file mode 100644
index 0000000000000..2b48c20e20ff0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Tests/Transport/FailoverTransportTest.php
@@ -0,0 +1,166 @@
+<?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\Notifier\Tests\Transport;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Notifier\Exception\LogicException;
+use Symfony\Component\Notifier\Exception\RuntimeException;
+use Symfony\Component\Notifier\Exception\TransportExceptionInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\FailoverTransport;
+use Symfony\Component\Notifier\Transport\TransportInterface;
+
+/**
+ * @group time-sensitive
+ */
+class FailoverTransportTest extends TestCase
+{
+    public function testSendNoTransports()
+    {
+        $this->expectException(LogicException::class);
+
+        new FailoverTransport([]);
+    }
+
+    public function testToString()
+    {
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->expects($this->once())->method('__toString')->willReturn('t1://local');
+
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->expects($this->once())->method('__toString')->willReturn('t2://local');
+
+        $t = new FailoverTransport([$t1, $t2]);
+
+        $this->assertEquals('t1://local || t2://local', (string) $t);
+    }
+
+    public function testSendMessageNotSupportedByAnyTransport()
+    {
+        $t1 = $this->createMock(TransportInterface::class);
+        $t2 = $this->createMock(TransportInterface::class);
+
+        $t = new FailoverTransport([$t1, $t2]);
+
+        $this->expectException(LogicException::class);
+
+        $t->send(new DummyMessage());
+    }
+
+    public function testSendFirstWork()
+    {
+        $message = new DummyMessage();
+
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->method('supports')->with($message)->willReturn(true);
+        $t1->expects($this->exactly(3))->method('send')->with($message)->willReturn(new SentMessage($message, 'test'));
+
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->expects($this->never())->method('send');
+
+        $t = new FailoverTransport([$t1, $t2]);
+
+        $t->send($message);
+        $t->send($message);
+        $t->send($message);
+    }
+
+    public function testSendAllDead()
+    {
+        $message = new DummyMessage();
+
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->method('supports')->with($message)->willReturn(true);
+        $t1->expects($this->once())->method('send')->with($message)->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->method('supports')->with($message)->willReturn(true);
+        $t2->expects($this->once())->method('send')->with($message)->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+
+        $t = new FailoverTransport([$t1, $t2]);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('All transports failed.');
+
+        $t->send($message);
+    }
+
+    public function testSendOneDead()
+    {
+        $message = new DummyMessage();
+
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->method('supports')->with($message)->willReturn(true);
+        $t1->expects($this->once())->method('send')->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->method('supports')->with($message)->willReturn(true);
+        $t2->expects($this->exactly(1))->method('send')->with($message)->willReturn(new SentMessage($message, 'test'));
+
+        $t = new FailoverTransport([$t1, $t2]);
+
+        $t->send($message);
+    }
+
+    public function testSendAllDeadWithinRetryPeriod()
+    {
+        $message = new DummyMessage();
+
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->method('supports')->with($message)->willReturn(true);
+        $t1->method('send')->will($this->throwException($this->createMock(TransportExceptionInterface::class)));
+        $t1->expects($this->once())->method('send');
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->method('supports')->with($message)->willReturn(true);
+        $t2->expects($this->exactly(3))
+            ->method('send')
+            ->willReturnOnConsecutiveCalls(
+                new SentMessage($message, 't2'),
+                new SentMessage($message, 't2'),
+                $this->throwException($this->createMock(TransportExceptionInterface::class))
+            );
+        $t = new FailoverTransport([$t1, $t2], 40);
+        $t->send($message);
+        sleep(4);
+        $t->send($message);
+        sleep(4);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('All transports failed.');
+
+        $t->send($message);
+    }
+
+    public function testSendOneDeadButRecover()
+    {
+        $message = new DummyMessage();
+
+        $t1 = $this->createMock(TransportInterface::class);
+        $t1->method('supports')->with($message)->willReturn(true);
+        $t1->expects($this->exactly(2))->method('send')->willReturnOnConsecutiveCalls(
+            $this->throwException($this->createMock(TransportExceptionInterface::class)),
+            new SentMessage($message, 't1')
+        );
+        $t2 = $this->createMock(TransportInterface::class);
+        $t2->method('supports')->with($message)->willReturn(true);
+        $t2->expects($this->exactly(2))->method('send')->willReturnOnConsecutiveCalls(
+            new SentMessage($message, 't2'),
+            $this->throwException($this->createMock(TransportExceptionInterface::class))
+        );
+
+        $t = new FailoverTransport([$t1, $t2], 1);
+
+        $t->send($message);
+        sleep(2);
+        $t->send($message);
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Transport/FailoverTransport.php b/src/Symfony/Component/Notifier/Transport/FailoverTransport.php
index 68edb9f1188fa..23a13154d1d7c 100644
--- a/src/Symfony/Component/Notifier/Transport/FailoverTransport.php
+++ b/src/Symfony/Component/Notifier/Transport/FailoverTransport.php
@@ -33,6 +33,11 @@ protected function getNextTransport(MessageInterface $message): ?TransportInterf
         return $this->currentTransport;
     }
 
+    protected function getInitialCursor(): int
+    {
+        return 0;
+    }
+
     protected function getNameSymbol(): string
     {
         return '||';
diff --git a/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php b/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php
index a67bccb95c76e..cfc544a4c39ad 100644
--- a/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php
+++ b/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php
@@ -29,7 +29,7 @@ class RoundRobinTransport implements TransportInterface
     private $deadTransports;
     private $transports = [];
     private $retryPeriod;
-    private $cursor = 0;
+    private $cursor = -1;
 
     /**
      * @param TransportInterface[] $transports
@@ -43,9 +43,6 @@ public function __construct(array $transports, int $retryPeriod = 60)
         $this->transports = $transports;
         $this->deadTransports = new \SplObjectStorage();
         $this->retryPeriod = $retryPeriod;
-        // the cursor initial value is randomized so that
-        // when are not in a daemon, we are still rotating the transports
-        $this->cursor = mt_rand(0, \count($transports) - 1);
     }
 
     public function __toString(): string
@@ -66,6 +63,10 @@ public function supports(MessageInterface $message): bool
 
     public function send(MessageInterface $message): SentMessage
     {
+        if (!$this->supports($message)) {
+            throw new LogicException(sprintf('None of the configured Transports of "%s" supports the given message.', static::class));
+        }
+
         while ($transport = $this->getNextTransport($message)) {
             try {
                 return $transport->send($message);
@@ -82,12 +83,17 @@ public function send(MessageInterface $message): SentMessage
      */
     protected function getNextTransport(MessageInterface $message): ?TransportInterface
     {
+        if (-1 === $this->cursor) {
+            $this->cursor = $this->getInitialCursor();
+        }
+
         $cursor = $this->cursor;
         while (true) {
             $transport = $this->transports[$cursor];
 
             if (!$transport->supports($message)) {
                 $cursor = $this->moveCursor($cursor);
+
                 continue;
             }
 
@@ -116,6 +122,13 @@ protected function isTransportDead(TransportInterface $transport): bool
         return $this->deadTransports->contains($transport);
     }
 
+    protected function getInitialCursor(): int
+    {
+        // the cursor initial value is randomized so that
+        // when are not in a daemon, we are still rotating the transports
+        return mt_rand(0, \count($this->transports) - 1);
+    }
+
     protected function getNameSymbol(): string
     {
         return '&&';

From 22aad3962c6af2a834c3dfc24df658d692130d0b Mon Sep 17 00:00:00 2001
From: Ana Raro <araro@eos-uptrade.de>
Date: Mon, 3 May 2021 08:02:13 +0100
Subject: [PATCH 26/67] Added translations for pt security file.

---
 .../Security/Core/Resources/translations/security.pt.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf
index 286dab2665e14..e4034ae4a0339 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ligação de login inválida ou expirada.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Demasiadas tentativas de login, tente novamente num minuto.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Demasiadas tentativas de login, tente novamente em %minutes% minutos.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From af53ecd1fd0c593b8bc0c3224b85d04072ec9c24 Mon Sep 17 00:00:00 2001
From: Koray Zorluoglu <koray.zorluoglu@esono.de>
Date: Mon, 3 May 2021 09:22:23 +0200
Subject: [PATCH 27/67] ref #41087: missing turkish translations from security
 component

---
 .../Security/Core/Resources/translations/security.tr.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
index 4bc4d2cda882a..3466f8fe4ac8b 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Geçersiz veya süresi dolmuş oturum açma bağlantısı.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From bcf63398b9c8619ea1f09935b49f16010d3b4934 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 1 May 2021 15:37:51 +0200
Subject: [PATCH 28/67] [Mime] update types map

---
 src/Symfony/Component/Mime/MimeTypes.php      | 189 +++++++++++++-----
 .../Mime/Resources/bin/update_mime_types.php  |  49 ++---
 2 files changed, 159 insertions(+), 79 deletions(-)

diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
index 24cd68c77e196..acd3dc3ead8a9 100644
--- a/src/Symfony/Component/Mime/MimeTypes.php
+++ b/src/Symfony/Component/Mime/MimeTypes.php
@@ -163,6 +163,7 @@ public function guessMimeType(string $path): ?string
         'application/atsc-held+xml' => ['held'],
         'application/atsc-rsat+xml' => ['rsat'],
         'application/bdoc' => ['bdoc'],
+        'application/bzip2' => ['bz2', 'bz'],
         'application/calendar+xml' => ['xcs'],
         'application/ccxml+xml' => ['ccxml'],
         'application/cdfx+xml' => ['cdfx'],
@@ -262,15 +263,16 @@ public function guessMimeType(string $path): ?string
         'application/ogg' => ['ogx'],
         'application/omdoc+xml' => ['omdoc'],
         'application/onenote' => ['onetoc', 'onetoc2', 'onetmp', 'onepkg'],
+        'application/ovf' => ['ova'],
         'application/owl+xml' => ['owx'],
-        'application/oxps' => ['oxps', 'xps'],
+        'application/oxps' => ['oxps'],
         'application/p2p-overlay+xml' => ['relo'],
         'application/patch-ops-error+xml' => ['xer'],
         'application/pcap' => ['pcap', 'cap', 'dmp'],
         'application/pdf' => ['pdf'],
         'application/pgp' => ['pgp', 'gpg', 'asc'],
         'application/pgp-encrypted' => ['pgp', 'gpg', 'asc'],
-        'application/pgp-keys' => ['skr', 'pkr', 'asc', 'pgp', 'gpg'],
+        'application/pgp-keys' => ['skr', 'pkr', 'asc', 'pgp', 'gpg', 'key'],
         'application/pgp-signature' => ['asc', 'sig', 'pgp', 'gpg'],
         'application/photoshop' => ['psd'],
         'application/pics-rules' => ['prf'],
@@ -331,9 +333,10 @@ public function guessMimeType(string $path): ?string
         'application/sru+xml' => ['sru'],
         'application/ssdl+xml' => ['ssdl'],
         'application/ssml+xml' => ['ssml'],
-        'application/stuffit' => ['sit'],
+        'application/stuffit' => ['sit', 'hqx'],
         'application/swid+xml' => ['swidtag'],
         'application/tei+xml' => ['tei', 'teicorpus'],
+        'application/tga' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'application/thraud+xml' => ['tfi'],
         'application/timestamped-data' => ['tsd'],
         'application/toml' => ['toml'],
@@ -361,6 +364,7 @@ public function guessMimeType(string $path): ?string
         'application/vnd.airzip.filesecure.azf' => ['azf'],
         'application/vnd.airzip.filesecure.azs' => ['azs'],
         'application/vnd.amazon.ebook' => ['azw'],
+        'application/vnd.amazon.mobi8-ebook' => ['azw3', 'kfx'],
         'application/vnd.americandynamics.acc' => ['acc'],
         'application/vnd.amiga.ami' => ['ami'],
         'application/vnd.android.package-archive' => ['apk'],
@@ -592,7 +596,7 @@ public function guessMimeType(string $path): ?string
         'application/vnd.ms-word.template.macroenabled.12' => ['dotm'],
         'application/vnd.ms-works' => ['wps', 'wks', 'wcm', 'wdb', 'xlr'],
         'application/vnd.ms-wpl' => ['wpl'],
-        'application/vnd.ms-xpsdocument' => ['xps', 'oxps'],
+        'application/vnd.ms-xpsdocument' => ['xps'],
         'application/vnd.msaccess' => ['mdb'],
         'application/vnd.mseq' => ['mseq'],
         'application/vnd.musician' => ['mus'],
@@ -769,7 +773,7 @@ public function guessMimeType(string $path): ?string
         'application/wspolicy+xml' => ['wspolicy'],
         'application/wwf' => ['wwf'],
         'application/x-123' => ['123', 'wk1', 'wk3', 'wk4', 'wks'],
-        'application/x-7z-compressed' => ['7z'],
+        'application/x-7z-compressed' => ['7z', '7z.001'],
         'application/x-abiword' => ['abw', 'abw.CRASHED', 'abw.gz', 'zabw'],
         'application/x-ace' => ['ace'],
         'application/x-ace-compressed' => ['ace'],
@@ -779,6 +783,8 @@ public function guessMimeType(string $path): ?string
         'application/x-annodex' => ['anx'],
         'application/x-aportisdoc' => ['pdb', 'pdc'],
         'application/x-apple-diskimage' => ['dmg'],
+        'application/x-apple-systemprofiler+xml' => ['spx'],
+        'application/x-appleworks-document' => ['cwk'],
         'application/x-applix-spreadsheet' => ['as'],
         'application/x-applix-word' => ['aw'],
         'application/x-archive' => ['a', 'ar'],
@@ -796,6 +802,7 @@ public function guessMimeType(string $path): ?string
         'application/x-bittorrent' => ['torrent'],
         'application/x-blender' => ['blender', 'blend', 'BLEND'],
         'application/x-blorb' => ['blb', 'blorb'],
+        'application/x-bps-patch' => ['bps'],
         'application/x-bsdiff' => ['bsdiff'],
         'application/x-bzdvi' => ['dvi.bz2'],
         'application/x-bzip' => ['bz', 'bz2'],
@@ -820,6 +827,7 @@ public function guessMimeType(string $path): ?string
         'application/x-cisco-vpn-settings' => ['pcf'],
         'application/x-cocoa' => ['cco'],
         'application/x-compress' => ['Z'],
+        'application/x-compressed-iso' => ['cso'],
         'application/x-compressed-tar' => ['tar.gz', 'tgz'],
         'application/x-conference' => ['nsc'],
         'application/x-coreldraw' => ['cdr'],
@@ -839,9 +847,11 @@ public function guessMimeType(string $path): ?string
         'application/x-dia-diagram' => ['dia'],
         'application/x-dia-shape' => ['shape'],
         'application/x-director' => ['dir', 'dcr', 'dxr', 'cst', 'cct', 'cxt', 'w3d', 'fgd', 'swa'],
+        'application/x-discjuggler-cd-image' => ['cdi'],
         'application/x-docbook+xml' => ['dbk', 'docbook'],
         'application/x-doom' => ['wad'],
         'application/x-doom-wad' => ['wad'],
+        'application/x-dreamcast-rom' => ['iso'],
         'application/x-dtbncx+xml' => ['ncx'],
         'application/x-dtbook+xml' => ['dtb'],
         'application/x-dtbresource+xml' => ['res'],
@@ -879,9 +889,10 @@ public function guessMimeType(string $path): ?string
         'application/x-gamegear-rom' => ['gg'],
         'application/x-gba-rom' => ['gba', 'agb'],
         'application/x-gca-compressed' => ['gca'],
+        'application/x-gd-rom-cue' => ['gdi'],
         'application/x-gedcom' => ['ged', 'gedcom'],
         'application/x-genesis-32x-rom' => ['32x', 'mdx'],
-        'application/x-genesis-rom' => ['gen', 'smd'],
+        'application/x-genesis-rom' => ['gen', 'smd', 'sgd'],
         'application/x-gettext' => ['po'],
         'application/x-gettext-translation' => ['gmo', 'mo'],
         'application/x-glade' => ['glade'],
@@ -910,11 +921,14 @@ public function guessMimeType(string $path): ?string
         'application/x-hwt' => ['hwt'],
         'application/x-ica' => ['ica'],
         'application/x-install-instructions' => ['install'],
+        'application/x-ips-patch' => ['ips'],
         'application/x-ipynb+json' => ['ipynb'],
         'application/x-iso9660-appimage' => ['appimage'],
         'application/x-iso9660-image' => ['iso', 'iso9660'],
         'application/x-it87' => ['it87'],
         'application/x-iwork-keynote-sffkey' => ['key'],
+        'application/x-iwork-numbers-sffnumbers' => ['numbers'],
+        'application/x-iwork-pages-sffpages' => ['pages'],
         'application/x-jar' => ['jar'],
         'application/x-java' => ['class'],
         'application/x-java-archive' => ['jar'],
@@ -966,12 +980,14 @@ public function guessMimeType(string $path): ?string
         'application/x-m4' => ['m4'],
         'application/x-magicpoint' => ['mgp'],
         'application/x-makeself' => ['run'],
+        'application/x-mame-chd' => ['chd'],
         'application/x-markaby' => ['mab'],
         'application/x-mathematica' => ['nb'],
         'application/x-mdb' => ['mdb'],
         'application/x-mie' => ['mie'],
         'application/x-mif' => ['mif'],
         'application/x-mimearchive' => ['mhtml', 'mht'],
+        'application/x-mobi8-ebook' => ['azw3', 'kfx'],
         'application/x-mobipocket-ebook' => ['prc', 'mobi'],
         'application/x-ms-application' => ['application'],
         'application/x-ms-asx' => ['asx', 'wax', 'wvx', 'wmx'],
@@ -1007,6 +1023,8 @@ public function guessMimeType(string $path): ?string
         'application/x-nes-rom' => ['nes', 'nez', 'unf', 'unif'],
         'application/x-netcdf' => ['nc', 'cdf'],
         'application/x-netshow-channel' => ['nsc'],
+        'application/x-nintendo-3ds-executable' => ['3dsx'],
+        'application/x-nintendo-3ds-rom' => ['3ds', 'cci'],
         'application/x-nintendo-ds-rom' => ['nds'],
         'application/x-ns-proxy-autoconfig' => ['pac'],
         'application/x-nzb' => ['nzb'],
@@ -1031,7 +1049,11 @@ public function guessMimeType(string $path): ?string
         'application/x-planperfect' => ['pln'],
         'application/x-pocket-word' => ['psw'],
         'application/x-pw' => ['pw'],
+        'application/x-pyspread-bz-spreadsheet' => ['pys'],
+        'application/x-pyspread-spreadsheet' => ['pysu'],
         'application/x-python-bytecode' => ['pyc', 'pyo'],
+        'application/x-qed-disk' => ['qed'],
+        'application/x-qemu-disk' => ['qcow2', 'qcow'],
         'application/x-qpress' => ['qp'],
         'application/x-qtiplot' => ['qti', 'qti.gz'],
         'application/x-quattropro' => ['wb1', 'wb2', 'wb3'],
@@ -1051,10 +1073,11 @@ public function guessMimeType(string $path): ?string
         'application/x-ruby' => ['rb'],
         'application/x-sami' => ['smi', 'sami'],
         'application/x-sap-file' => ['sap'],
-        'application/x-saturn-rom' => ['bin', 'iso'],
+        'application/x-saturn-rom' => ['iso'],
         'application/x-sdp' => ['sdp'],
         'application/x-sea' => ['sea'],
-        'application/x-sega-cd-rom' => ['bin', 'iso'],
+        'application/x-sega-cd-rom' => ['iso'],
+        'application/x-sega-pico-rom' => ['iso'],
         'application/x-sg1000-rom' => ['sg'],
         'application/x-sh' => ['sh'],
         'application/x-shar' => ['shar'],
@@ -1086,6 +1109,7 @@ public function guessMimeType(string $path): ?string
         'application/x-t602' => ['602'],
         'application/x-tads' => ['gam'],
         'application/x-tar' => ['tar', 'gtar', 'gem'],
+        'application/x-targa' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'application/x-tarz' => ['tar.Z', 'taz'],
         'application/x-tcl' => ['tcl', 'tk'],
         'application/x-tex' => ['tex', 'ltx', 'sty', 'cls', 'dtx', 'ins', 'latex'],
@@ -1093,6 +1117,7 @@ public function guessMimeType(string $path): ?string
         'application/x-tex-pk' => ['pk'],
         'application/x-tex-tfm' => ['tfm'],
         'application/x-texinfo' => ['texinfo', 'texi'],
+        'application/x-tga' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'application/x-tgif' => ['obj'],
         'application/x-theme' => ['theme'],
         'application/x-thomson-cartridge-memo7' => ['m7'],
@@ -1105,6 +1130,9 @@ public function guessMimeType(string $path): ?string
         'application/x-tzo' => ['tar.lzo', 'tzo'],
         'application/x-ufraw' => ['ufraw'],
         'application/x-ustar' => ['ustar'],
+        'application/x-vdi-disk' => ['vdi'],
+        'application/x-vhd-disk' => ['vhd', 'vpc'],
+        'application/x-vhdx-disk' => ['vhdx'],
         'application/x-virtual-boy-rom' => ['vb'],
         'application/x-virtualbox-hdd' => ['hdd'],
         'application/x-virtualbox-ova' => ['ova'],
@@ -1112,8 +1140,10 @@ public function guessMimeType(string $path): ?string
         'application/x-virtualbox-vbox' => ['vbox'],
         'application/x-virtualbox-vbox-extpack' => ['vbox-extpack'],
         'application/x-virtualbox-vdi' => ['vdi'],
-        'application/x-virtualbox-vhd' => ['vhd'],
+        'application/x-virtualbox-vhd' => ['vhd', 'vpc'],
+        'application/x-virtualbox-vhdx' => ['vhdx'],
         'application/x-virtualbox-vmdk' => ['vmdk'],
+        'application/x-vmdk-disk' => ['vmdk'],
         'application/x-vnd.kde.kexi' => ['kexi'],
         'application/x-wais-source' => ['src'],
         'application/x-wbfs' => ['iso'],
@@ -1146,6 +1176,7 @@ public function guessMimeType(string $path): ?string
         'application/x-zip-compressed-fb2' => ['fb2.zip'],
         'application/x-zmachine' => ['z1', 'z2', 'z3', 'z4', 'z5', 'z6', 'z7', 'z8'],
         'application/x-zoo' => ['zoo'],
+        'application/x-zstd-compressed-tar' => ['tar.zst', 'tzst'],
         'application/xaml+xml' => ['xaml'],
         'application/xcap-att+xml' => ['xav'],
         'application/xcap-caps+xml' => ['xca'],
@@ -1154,14 +1185,14 @@ public function guessMimeType(string $path): ?string
         'application/xcap-error+xml' => ['xer'],
         'application/xcap-ns+xml' => ['xns'],
         'application/xenc+xml' => ['xenc'],
-        'application/xhtml+xml' => ['xhtml', 'xht'],
+        'application/xhtml+xml' => ['xhtml', 'xht', 'html', 'htm'],
         'application/xliff+xml' => ['xlf', 'xliff'],
         'application/xml' => ['xml', 'xsl', 'xsd', 'rng', 'xbl'],
         'application/xml-dtd' => ['dtd'],
         'application/xml-external-parsed-entity' => ['ent'],
         'application/xop+xml' => ['xop'],
         'application/xproc+xml' => ['xpl'],
-        'application/xps' => ['oxps', 'xps'],
+        'application/xps' => ['xps'],
         'application/xslt+xml' => ['xslt', 'xsl'],
         'application/xspf+xml' => ['xspf'],
         'application/xv+xml' => ['mxml', 'xhvml', 'xvml', 'xvm'],
@@ -1169,6 +1200,7 @@ public function guessMimeType(string $path): ?string
         'application/yin+xml' => ['yin'],
         'application/zip' => ['zip'],
         'application/zlib' => ['zz'],
+        'application/zstd' => ['zst'],
         'audio/3gpp' => ['3gpp', '3gp', '3ga'],
         'audio/3gpp-encrypted' => ['3gp', '3gpp', '3ga'],
         'audio/3gpp2' => ['3g2', '3gp2', '3gpp2'],
@@ -1192,7 +1224,7 @@ public function guessMimeType(string $path): ?string
         'audio/mp4' => ['m4a', 'mp4a', 'f4a'],
         'audio/mpeg' => ['mp3', 'mpga', 'mp2', 'mp2a', 'm2a', 'm3a'],
         'audio/mpegurl' => ['m3u', 'm3u8', 'vlc'],
-        'audio/ogg' => ['oga', 'ogg', 'spx', 'opus'],
+        'audio/ogg' => ['ogg', 'oga', 'spx', 'opus'],
         'audio/prs.sid' => ['sid', 'psid'],
         'audio/s3m' => ['s3m'],
         'audio/scpls' => ['pls'],
@@ -1200,7 +1232,7 @@ public function guessMimeType(string $path): ?string
         'audio/tta' => ['tta'],
         'audio/usac' => ['loas', 'xhe'],
         'audio/vnd.audible' => ['aa', 'aax'],
-        'audio/vnd.audible.aax' => ['aa', 'aax'],
+        'audio/vnd.audible.aax' => ['aax'],
         'audio/vnd.dece.audio' => ['uva', 'uvva'],
         'audio/vnd.digital-winds' => ['eol'],
         'audio/vnd.dra' => ['dra'],
@@ -1273,7 +1305,7 @@ public function guessMimeType(string $path): ?string
         'audio/x-scpls' => ['pls'],
         'audio/x-shorten' => ['shn'],
         'audio/x-speex' => ['spx'],
-        'audio/x-speex+ogg' => ['oga', 'ogg'],
+        'audio/x-speex+ogg' => ['oga', 'ogg', 'spx'],
         'audio/x-stm' => ['stm'],
         'audio/x-tta' => ['tta'],
         'audio/x-voc' => ['voc'],
@@ -1297,10 +1329,13 @@ public function guessMimeType(string $path): ?string
         'font/collection' => ['ttc'],
         'font/otf' => ['otf'],
         'font/ttf' => ['ttf'],
-        'font/woff' => ['woff', 'woff2'],
+        'font/woff' => ['woff'],
         'font/woff2' => ['woff2'],
         'image/aces' => ['exr'],
         'image/apng' => ['apng'],
+        'image/astc' => ['astc'],
+        'image/avif' => ['avif', 'avifs'],
+        'image/avif-sequence' => ['avif', 'avifs'],
         'image/bmp' => ['bmp', 'dib'],
         'image/cdr' => ['cdr'],
         'image/cgm' => ['cgm'],
@@ -1336,6 +1371,7 @@ public function guessMimeType(string $path): ?string
         'image/jxsi' => ['jxsi'],
         'image/jxss' => ['jxss'],
         'image/ktx' => ['ktx'],
+        'image/ktx2' => ['ktx2'],
         'image/openraster' => ['ora'],
         'image/pdf' => ['pdf'],
         'image/photoshop' => ['psd'],
@@ -1350,6 +1386,8 @@ public function guessMimeType(string $path): ?string
         'image/svg+xml' => ['svg', 'svgz'],
         'image/svg+xml-compressed' => ['svgz'],
         'image/t38' => ['t38'],
+        'image/targa' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
+        'image/tga' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'image/tiff' => ['tif', 'tiff'],
         'image/tiff-fx' => ['tfx'],
         'image/vnd.adobe.photoshop' => ['psd'],
@@ -1421,6 +1459,7 @@ public function guessMimeType(string $path): ?string
         'image/x-ms-bmp' => ['bmp', 'dib'],
         'image/x-msod' => ['msod'],
         'image/x-nikon-nef' => ['nef'],
+        'image/x-nikon-nrw' => ['nrw'],
         'image/x-olympus-orf' => ['orf'],
         'image/x-panasonic-raw' => ['raw'],
         'image/x-panasonic-raw2' => ['rw2'],
@@ -1445,6 +1484,7 @@ public function guessMimeType(string $path): ?string
         'image/x-sony-sr2' => ['sr2'],
         'image/x-sony-srf' => ['srf'],
         'image/x-sun-raster' => ['sun'],
+        'image/x-targa' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'image/x-tga' => ['tga', 'icb', 'tpic', 'vda', 'vst'],
         'image/x-win-bitmap' => ['cur'],
         'image/x-win-metafile' => ['wmf'],
@@ -1523,9 +1563,12 @@ public function guessMimeType(string $path): ?string
         'text/spreadsheet' => ['sylk', 'slk'],
         'text/stylus' => ['stylus', 'styl'],
         'text/tab-separated-values' => ['tsv'],
+        'text/tcl' => ['tcl', 'tk'],
         'text/troff' => ['t', 'tr', 'roff', 'man', 'me', 'ms'],
         'text/turtle' => ['ttl'],
         'text/uri-list' => ['uri', 'uris', 'urls'],
+        'text/vbs' => ['vbs'],
+        'text/vbscript' => ['vbs'],
         'text/vcard' => ['vcard', 'vcf', 'vct', 'gcrd'],
         'text/vnd.curl' => ['curl'],
         'text/vnd.curl.dcurl' => ['dcurl'],
@@ -1539,6 +1582,7 @@ public function guessMimeType(string $path): ?string
         'text/vnd.in3d.spot' => ['spot'],
         'text/vnd.qt.linguist' => ['ts'],
         'text/vnd.rn-realtext' => ['rt'],
+        'text/vnd.senx.warpscript' => ['mc2'],
         'text/vnd.sun.j2me.app-descriptor' => ['jad'],
         'text/vnd.trolltech.linguist' => ['ts'],
         'text/vnd.wap.wml' => ['wml'],
@@ -1554,10 +1598,12 @@ public function guessMimeType(string $path): ?string
         'text/x-cmake' => ['cmake'],
         'text/x-cobol' => ['cbl', 'cob'],
         'text/x-comma-separated-values' => ['csv'],
+        'text/x-common-lisp' => ['asd', 'fasl', 'lisp', 'ros'],
         'text/x-component' => ['htc'],
         'text/x-csharp' => ['cs'],
         'text/x-csrc' => ['c'],
         'text/x-csv' => ['csv'],
+        'text/x-dart' => ['dart'],
         'text/x-dbus-service' => ['service'],
         'text/x-dcl' => ['dcl'],
         'text/x-diff' => ['diff', 'patch'],
@@ -1574,6 +1620,8 @@ public function guessMimeType(string $path): ?string
         'text/x-gherkin' => ['feature'],
         'text/x-go' => ['go'],
         'text/x-google-video-pointer' => ['gvp'],
+        'text/x-gradle' => ['gradle'],
+        'text/x-groovy' => ['groovy', 'gvy', 'gy', 'gsh'],
         'text/x-handlebars-template' => ['hbs'],
         'text/x-haskell' => ['hs'],
         'text/x-idl' => ['idl'],
@@ -1581,6 +1629,8 @@ public function guessMimeType(string $path): ?string
         'text/x-iptables' => ['iptables'],
         'text/x-java' => ['java'],
         'text/x-java-source' => ['java'],
+        'text/x-kaitai-struct' => ['ksy'],
+        'text/x-kotlin' => ['kt'],
         'text/x-ldif' => ['ldif'],
         'text/x-lilypond' => ['ly'],
         'text/x-literate-haskell' => ['lhs'],
@@ -1619,6 +1669,8 @@ public function guessMimeType(string $path): ?string
         'text/x-qml' => ['qml', 'qmltypes', 'qmlproject'],
         'text/x-reject' => ['rej'],
         'text/x-rpm-spec' => ['spec'],
+        'text/x-rst' => ['rst'],
+        'text/x-sagemath' => ['sage'],
         'text/x-sass' => ['sass'],
         'text/x-scala' => ['scala'],
         'text/x-scheme' => ['scm', 'ss'],
@@ -1679,7 +1731,7 @@ public function guessMimeType(string $path): ?string
         'video/mpeg-system' => ['mpeg', 'mpg', 'mp2', 'mpe', 'vob'],
         'video/msvideo' => ['avi', 'avf', 'divx'],
         'video/ogg' => ['ogv', 'ogg'],
-        'video/quicktime' => ['qt', 'mov', 'moov', 'qtvr'],
+        'video/quicktime' => ['mov', 'qt', 'moov', 'qtvr'],
         'video/vivo' => ['viv', 'vivo'],
         'video/vnd.dece.hd' => ['uvh', 'uvvh'],
         'video/vnd.dece.mobile' => ['uvm', 'uvvm'],
@@ -1691,6 +1743,8 @@ public function guessMimeType(string $path): ?string
         'video/vnd.fvt' => ['fvt'],
         'video/vnd.mpegurl' => ['mxu', 'm4u', 'm1u'],
         'video/vnd.ms-playready.media.pyv' => ['pyv'],
+        'video/vnd.radgamettools.bink' => ['bik', 'bk2'],
+        'video/vnd.radgamettools.smacker' => ['smk'],
         'video/vnd.rn-realvideo' => ['rv', 'rvx'],
         'video/vnd.uvvu.mp4' => ['uvu', 'uvvu'],
         'video/vnd.vivo' => ['viv', 'vivo'],
@@ -1746,7 +1800,8 @@ public function guessMimeType(string $path): ?string
         '1km' => ['application/vnd.1000minds.decision-model+xml'],
         '32x' => ['application/x-genesis-32x-rom'],
         '3dml' => ['text/vnd.in3d.3dml'],
-        '3ds' => ['image/x-3ds'],
+        '3ds' => ['application/x-nintendo-3ds-rom', 'image/x-3ds'],
+        '3dsx' => ['application/x-nintendo-3ds-executable'],
         '3g2' => ['audio/3gpp2', 'video/3gpp2'],
         '3ga' => ['audio/3gpp', 'audio/3gpp-encrypted', 'audio/x-rn-3gpp-amr', 'audio/x-rn-3gpp-amr-encrypted', 'audio/x-rn-3gpp-amr-wb', 'audio/x-rn-3gpp-amr-wb-encrypted', 'video/3gp', 'video/3gpp', 'video/3gpp-encrypted'],
         '3gp' => ['audio/3gpp', 'audio/3gpp-encrypted', 'audio/x-rn-3gpp-amr', 'audio/x-rn-3gpp-amr-encrypted', 'audio/x-rn-3gpp-amr-wb', 'audio/x-rn-3gpp-amr-wb-encrypted', 'video/3gp', 'video/3gpp', 'video/3gpp-encrypted'],
@@ -1755,6 +1810,7 @@ public function guessMimeType(string $path): ?string
         '3gpp2' => ['audio/3gpp2', 'video/3gpp2'],
         '3mf' => ['model/3mf'],
         '7z' => ['application/x-7z-compressed'],
+        '7z.001' => ['application/x-7z-compressed'],
         'BLEND' => ['application/x-blender'],
         'C' => ['text/x-c++src'],
         'PAR2' => ['application/x-par2'],
@@ -1763,7 +1819,7 @@ public function guessMimeType(string $path): ?string
         'a' => ['application/x-archive'],
         'a26' => ['application/x-atari-2600-rom'],
         'a78' => ['application/x-atari-7800-rom'],
-        'aa' => ['audio/vnd.audible', 'audio/vnd.audible.aax', 'audio/x-pn-audibleaudio'],
+        'aa' => ['audio/vnd.audible', 'audio/x-pn-audibleaudio'],
         'aab' => ['application/x-authorware-bin'],
         'aac' => ['audio/aac', 'audio/x-aac', 'audio/x-hx-aac-adts'],
         'aam' => ['application/x-authorware-map'],
@@ -1811,18 +1867,19 @@ public function guessMimeType(string $path): ?string
         'appimage' => ['application/vnd.appimage', 'application/x-iso9660-appimage'],
         'application' => ['application/x-ms-application'],
         'apr' => ['application/vnd.lotus-approach'],
-        'aps' => ['application/postscript'],
         'ar' => ['application/x-archive'],
         'arc' => ['application/x-freearc'],
         'arj' => ['application/x-arj'],
         'arw' => ['image/x-sony-arw'],
         'as' => ['application/x-applix-spreadsheet'],
         'asc' => ['application/pgp', 'application/pgp-encrypted', 'application/pgp-keys', 'application/pgp-signature', 'text/plain'],
+        'asd' => ['text/x-common-lisp'],
         'asf' => ['application/vnd.ms-asf', 'video/x-ms-asf', 'video/x-ms-asf-plugin', 'video/x-ms-wm'],
         'asm' => ['text/x-asm'],
         'aso' => ['application/vnd.accpac.simply.aso'],
         'asp' => ['application/x-asp'],
         'ass' => ['audio/aac', 'audio/x-aac', 'audio/x-hx-aac-adts', 'text/x-ssa'],
+        'astc' => ['image/astc'],
         'asx' => ['application/x-ms-asx', 'audio/x-ms-asx', 'video/x-ms-asf', 'video/x-ms-wax', 'video/x-ms-wmx', 'video/x-ms-wvx'],
         'atc' => ['application/vnd.acucorp'],
         'atom' => ['application/atom+xml'],
@@ -1834,6 +1891,8 @@ public function guessMimeType(string $path): ?string
         'automount' => ['text/x-systemd-unit'],
         'avf' => ['video/avi', 'video/divx', 'video/msvideo', 'video/vnd.divx', 'video/x-avi', 'video/x-msvideo'],
         'avi' => ['video/avi', 'video/divx', 'video/msvideo', 'video/vnd.divx', 'video/x-avi', 'video/x-msvideo'],
+        'avif' => ['image/avif', 'image/avif-sequence'],
+        'avifs' => ['image/avif', 'image/avif-sequence'],
         'aw' => ['application/applixware', 'application/x-applix-word'],
         'awb' => ['audio/amr-wb', 'audio/amr-wb-encrypted'],
         'awk' => ['application/x-awk'],
@@ -1843,6 +1902,7 @@ public function guessMimeType(string $path): ?string
         'azs' => ['application/vnd.airzip.filesecure.azs'],
         'azv' => ['image/vnd.airzip.accelerator.azv'],
         'azw' => ['application/vnd.amazon.ebook'],
+        'azw3' => ['application/vnd.amazon.mobi8-ebook', 'application/x-mobi8-ebook'],
         'bak' => ['application/x-trash'],
         'bat' => ['application/x-msdownload'],
         'bcpio' => ['application/x-bcpio'],
@@ -1853,7 +1913,9 @@ public function guessMimeType(string $path): ?string
         'bed' => ['application/vnd.realvnc.bed'],
         'bh2' => ['application/vnd.fujitsu.oasysprs'],
         'bib' => ['text/x-bibtex'],
-        'bin' => ['application/octet-stream', 'application/x-saturn-rom', 'application/x-sega-cd-rom'],
+        'bik' => ['video/vnd.radgamettools.bink'],
+        'bin' => ['application/octet-stream'],
+        'bk2' => ['video/vnd.radgamettools.bink'],
         'blb' => ['application/x-blorb'],
         'blend' => ['application/x-blender'],
         'blender' => ['application/x-blender'],
@@ -1864,11 +1926,12 @@ public function guessMimeType(string $path): ?string
         'book' => ['application/vnd.framemaker'],
         'box' => ['application/vnd.previewsystems.box'],
         'boz' => ['application/x-bzip2'],
+        'bps' => ['application/x-bps-patch'],
         'bsdiff' => ['application/x-bsdiff'],
         'bsp' => ['model/vnd.valve.source.compiled-map'],
         'btif' => ['image/prs.btif'],
-        'bz' => ['application/x-bzip', 'application/x-bzip2'],
-        'bz2' => ['application/x-bz2', 'application/x-bzip', 'application/x-bzip2'],
+        'bz' => ['application/bzip2', 'application/x-bzip', 'application/x-bzip2'],
+        'bz2' => ['application/x-bz2', 'application/bzip2', 'application/x-bzip', 'application/x-bzip2'],
         'c' => ['text/x-c', 'text/x-csrc'],
         'c++' => ['text/x-c++src'],
         'c11amc' => ['application/vnd.cluetrust.cartomobile-config'],
@@ -1890,6 +1953,7 @@ public function guessMimeType(string $path): ?string
         'cbt' => ['application/x-cbr', 'application/x-cbt'],
         'cbz' => ['application/vnd.comicbook+zip', 'application/x-cbr', 'application/x-cbz'],
         'cc' => ['text/x-c', 'text/x-c++src'],
+        'cci' => ['application/x-nintendo-3ds-rom'],
         'ccmx' => ['application/x-ccmx'],
         'cco' => ['application/x-cocoa'],
         'cct' => ['application/x-director'],
@@ -1897,6 +1961,7 @@ public function guessMimeType(string $path): ?string
         'cdbcmsg' => ['application/vnd.contact.cmsg'],
         'cdf' => ['application/x-netcdf'],
         'cdfx' => ['application/cdfx+xml'],
+        'cdi' => ['application/x-discjuggler-cd-image'],
         'cdkey' => ['application/vnd.mediastation.cdkey'],
         'cdmia' => ['application/cdmi-capability'],
         'cdmic' => ['application/cdmi-container'],
@@ -1913,6 +1978,7 @@ public function guessMimeType(string $path): ?string
         'cgb' => ['application/x-gameboy-color-rom'],
         'cgm' => ['image/cgm'],
         'chat' => ['application/x-chat'],
+        'chd' => ['application/x-mame-chd'],
         'chm' => ['application/vnd.ms-htmlhelp', 'application/x-chm'],
         'chrt' => ['application/vnd.kde.kchart', 'application/x-kchart'],
         'cif' => ['chemical/x-cif'],
@@ -1958,15 +2024,17 @@ public function guessMimeType(string $path): ?string
         'csh' => ['application/x-csh'],
         'csl' => ['application/vnd.citationstyles.style+xml'],
         'csml' => ['chemical/x-csml'],
+        'cso' => ['application/x-compressed-iso'],
         'csp' => ['application/vnd.commonspace'],
         'css' => ['text/css'],
         'cst' => ['application/x-director'],
-        'csv' => ['text/csv', 'text/x-comma-separated-values', 'text/x-csv', 'application/csv'],
+        'csv' => ['text/csv', 'application/csv', 'text/x-comma-separated-values', 'text/x-csv'],
         'csvs' => ['text/csv-schema'],
         'cu' => ['application/cu-seeme'],
         'cue' => ['application/x-cue'],
         'cur' => ['image/x-win-bitmap'],
         'curl' => ['text/vnd.curl'],
+        'cwk' => ['application/x-appleworks-document'],
         'cww' => ['application/prs.cww'],
         'cxt' => ['application/x-director'],
         'cxx' => ['text/x-c', 'text/x-c++src'],
@@ -1974,7 +2042,7 @@ public function guessMimeType(string $path): ?string
         'dae' => ['model/vnd.collada+xml'],
         'daf' => ['application/vnd.mobius.daf'],
         'dar' => ['application/x-dar'],
-        'dart' => ['application/vnd.dart'],
+        'dart' => ['application/vnd.dart', 'text/x-dart'],
         'dataless' => ['application/vnd.fdsn.seed'],
         'davmount' => ['application/davmount+xml'],
         'dbf' => ['application/dbase', 'application/dbf', 'application/x-dbase', 'application/x-dbf'],
@@ -2097,6 +2165,7 @@ public function guessMimeType(string $path): ?string
         'f77' => ['text/x-fortran'],
         'f90' => ['text/x-fortran'],
         'f95' => ['text/x-fortran'],
+        'fasl' => ['text/x-common-lisp'],
         'fb2' => ['application/x-fictionbook', 'application/x-fictionbook+xml'],
         'fb2.zip' => ['application/x-zip-compressed-fb2'],
         'fbs' => ['image/vnd.fastbidsheet'],
@@ -2160,6 +2229,7 @@ public function guessMimeType(string $path): ?string
         'gca' => ['application/x-gca-compressed'],
         'gcode' => ['text/x.gcode'],
         'gcrd' => ['text/directory', 'text/vcard', 'text/x-vcard'],
+        'gdi' => ['application/x-gd-rom-cue'],
         'gdl' => ['model/vnd.gdl'],
         'gdoc' => ['application/vnd.google-apps.document'],
         'ged' => ['application/x-gedcom', 'text/gedcom'],
@@ -2198,13 +2268,16 @@ public function guessMimeType(string $path): ?string
         'gqf' => ['application/vnd.grafeq'],
         'gqs' => ['application/vnd.grafeq'],
         'gra' => ['application/x-graphite'],
+        'gradle' => ['text/x-gradle'],
         'gram' => ['application/srgs'],
         'gramps' => ['application/x-gramps-xml'],
         'gre' => ['application/vnd.geometry-explorer'],
+        'groovy' => ['text/x-groovy'],
         'grv' => ['application/vnd.groove-injector'],
         'grxml' => ['application/srgs+xml'],
         'gs' => ['text/x-genie'],
         'gsf' => ['application/x-font-ghostscript', 'application/x-font-type1'],
+        'gsh' => ['text/x-groovy'],
         'gsheet' => ['application/vnd.google-apps.spreadsheet'],
         'gslides' => ['application/vnd.google-apps.presentation'],
         'gsm' => ['audio/x-gsm'],
@@ -2213,8 +2286,10 @@ public function guessMimeType(string $path): ?string
         'gtw' => ['model/vnd.gtw'],
         'gv' => ['text/vnd.graphviz'],
         'gvp' => ['text/google-video-pointer', 'text/x-google-video-pointer'],
+        'gvy' => ['text/x-groovy'],
         'gxf' => ['application/gxf'],
         'gxt' => ['application/vnd.geonext'],
+        'gy' => ['text/x-groovy'],
         'gz' => ['application/x-gzip', 'application/gzip'],
         'h' => ['text/x-c', 'text/x-chdr'],
         'h++' => ['text/x-c++hdr'],
@@ -2250,8 +2325,8 @@ public function guessMimeType(string $path): ?string
         'hsj2' => ['image/hsj2'],
         'htc' => ['text/x-component'],
         'htke' => ['application/vnd.kenameaapp'],
-        'htm' => ['text/html'],
-        'html' => ['text/html'],
+        'htm' => ['text/html', 'application/xhtml+xml'],
+        'html' => ['text/html', 'application/xhtml+xml'],
         'hvd' => ['application/vnd.yamaha.hv-dic'],
         'hvp' => ['application/vnd.yamaha.hv-voice'],
         'hvs' => ['application/vnd.yamaha.hv-script'],
@@ -2260,7 +2335,7 @@ public function guessMimeType(string $path): ?string
         'hxx' => ['text/x-c++hdr'],
         'i2g' => ['application/vnd.intergeo'],
         'ica' => ['application/x-ica'],
-        'icb' => ['image/x-icb', 'image/x-tga'],
+        'icb' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'icc' => ['application/vnd.iccprofile'],
         'ice' => ['x-conference/x-cooltalk'],
         'icm' => ['application/vnd.iccprofile'],
@@ -2294,11 +2369,12 @@ public function guessMimeType(string $path): ?string
         'iota' => ['application/vnd.astraea-software.iota'],
         'ipfix' => ['application/ipfix'],
         'ipk' => ['application/vnd.shana.informed.package'],
+        'ips' => ['application/x-ips-patch'],
         'iptables' => ['text/x-iptables'],
         'ipynb' => ['application/x-ipynb+json'],
         'irm' => ['application/vnd.ibm.rights-management'],
         'irp' => ['application/vnd.irepository.package+xml'],
-        'iso' => ['application/x-cd-image', 'application/x-gamecube-iso-image', 'application/x-gamecube-rom', 'application/x-iso9660-image', 'application/x-saturn-rom', 'application/x-sega-cd-rom', 'application/x-wbfs', 'application/x-wia', 'application/x-wii-iso-image', 'application/x-wii-rom'],
+        'iso' => ['application/x-cd-image', 'application/x-dreamcast-rom', 'application/x-gamecube-iso-image', 'application/x-gamecube-rom', 'application/x-iso9660-image', 'application/x-saturn-rom', 'application/x-sega-cd-rom', 'application/x-sega-pico-rom', 'application/x-wbfs', 'application/x-wia', 'application/x-wii-iso-image', 'application/x-wii-rom'],
         'iso9660' => ['application/x-cd-image', 'application/x-iso9660-image'],
         'it' => ['audio/x-it'],
         'it87' => ['application/x-it87'],
@@ -2362,9 +2438,10 @@ public function guessMimeType(string $path): ?string
         'kexi' => ['application/x-kexiproject-sqlite', 'application/x-kexiproject-sqlite2', 'application/x-kexiproject-sqlite3', 'application/x-vnd.kde.kexi'],
         'kexic' => ['application/x-kexi-connectiondata'],
         'kexis' => ['application/x-kexiproject-shortcut'],
-        'key' => ['application/vnd.apple.keynote', 'application/x-iwork-keynote-sffkey'],
+        'key' => ['application/vnd.apple.keynote', 'application/pgp-keys', 'application/x-iwork-keynote-sffkey'],
         'keynote' => ['application/vnd.apple.keynote'],
         'kfo' => ['application/vnd.kde.kformula', 'application/x-kformula'],
+        'kfx' => ['application/vnd.amazon.mobi8-ebook', 'application/x-mobi8-ebook'],
         'kia' => ['application/vnd.kidspiration'],
         'kil' => ['application/x-killustrator'],
         'kino' => ['application/smil', 'application/smil+xml'],
@@ -2380,8 +2457,11 @@ public function guessMimeType(string $path): ?string
         'kra' => ['application/x-krita'],
         'ks' => ['application/x-java-keystore'],
         'ksp' => ['application/vnd.kde.kspread', 'application/x-kspread'],
+        'ksy' => ['text/x-kaitai-struct'],
+        'kt' => ['text/x-kotlin'],
         'ktr' => ['application/vnd.kahootz'],
         'ktx' => ['image/ktx'],
+        'ktx2' => ['image/ktx2'],
         'ktz' => ['application/vnd.kahootz'],
         'kud' => ['application/x-kugar'],
         'kwd' => ['application/vnd.kde.kword', 'application/x-kword'],
@@ -2400,6 +2480,7 @@ public function guessMimeType(string $path): ?string
         'lhs' => ['text/x-literate-haskell'],
         'lhz' => ['application/x-lhz'],
         'link66' => ['application/vnd.route66.link66+xml'],
+        'lisp' => ['text/x-common-lisp'],
         'list' => ['text/plain'],
         'list3820' => ['application/vnd.ibm.modcap'],
         'listafp' => ['application/vnd.ibm.modcap'],
@@ -2466,6 +2547,7 @@ public function guessMimeType(string $path): ?string
         'mbk' => ['application/vnd.mobius.mbk'],
         'mbox' => ['application/mbox'],
         'mc1' => ['application/vnd.medcalcdata'],
+        'mc2' => ['text/vnd.senx.warpscript'],
         'mcd' => ['application/vnd.mcd'],
         'mcurl' => ['text/vnd.curl.mcurl'],
         'md' => ['text/markdown', 'text/x-markdown'],
@@ -2603,12 +2685,13 @@ public function guessMimeType(string $path): ?string
         'not' => ['text/x-mup'],
         'npx' => ['image/vnd.net-fpx'],
         'nq' => ['application/n-quads'],
+        'nrw' => ['image/x-nikon-nrw'],
         'nsc' => ['application/x-conference', 'application/x-netshow-channel'],
         'nsf' => ['application/vnd.lotus-notes'],
         'nsv' => ['video/x-nsv'],
         'nt' => ['application/n-triples'],
         'ntf' => ['application/vnd.nitf'],
-        'numbers' => ['application/vnd.apple.numbers'],
+        'numbers' => ['application/vnd.apple.numbers', 'application/x-iwork-numbers-sffnumbers'],
         'nzb' => ['application/x-nzb'],
         'o' => ['application/x-object'],
         'oa2' => ['application/vnd.fujitsu.oasys2'],
@@ -2661,11 +2744,11 @@ public function guessMimeType(string $path): ?string
         'otp' => ['application/vnd.oasis.opendocument.presentation-template'],
         'ots' => ['application/vnd.oasis.opendocument.spreadsheet-template'],
         'ott' => ['application/vnd.oasis.opendocument.text-template'],
-        'ova' => ['application/x-virtualbox-ova'],
+        'ova' => ['application/ovf', 'application/x-virtualbox-ova'],
         'ovf' => ['application/x-virtualbox-ovf'],
         'owl' => ['application/rdf+xml', 'text/rdf'],
         'owx' => ['application/owl+xml'],
-        'oxps' => ['application/oxps', 'application/vnd.ms-xpsdocument', 'application/xps'],
+        'oxps' => ['application/oxps'],
         'oxt' => ['application/vnd.openofficeorg.extension'],
         'p' => ['text/x-pascal'],
         'p10' => ['application/pkcs10'],
@@ -2680,7 +2763,7 @@ public function guessMimeType(string $path): ?string
         'p8e' => ['application/pkcs8-encrypted'],
         'pac' => ['application/x-ns-proxy-autoconfig'],
         'pack' => ['application/x-java-pack200'],
-        'pages' => ['application/vnd.apple.pages'],
+        'pages' => ['application/vnd.apple.pages', 'application/x-iwork-pages-sffpages'],
         'pak' => ['application/x-pak'],
         'par2' => ['application/x-par2'],
         'part' => ['application/x-partial-download'],
@@ -2795,11 +2878,16 @@ public function guessMimeType(string $path): ?string
         'pya' => ['audio/vnd.ms-playready.media.pya'],
         'pyc' => ['application/x-python-bytecode'],
         'pyo' => ['application/x-python-bytecode'],
+        'pys' => ['application/x-pyspread-bz-spreadsheet'],
+        'pysu' => ['application/x-pyspread-spreadsheet'],
         'pyv' => ['video/vnd.ms-playready.media.pyv'],
         'pyx' => ['text/x-python'],
         'qam' => ['application/vnd.epson.quickanime'],
         'qbo' => ['application/vnd.intu.qbo'],
+        'qcow' => ['application/x-qemu-disk'],
+        'qcow2' => ['application/x-qemu-disk'],
         'qd' => ['application/x-fd-file', 'application/x-raw-floppy-disk-image'],
+        'qed' => ['application/x-qed-disk'],
         'qfx' => ['application/vnd.intu.qfx'],
         'qif' => ['application/x-qw', 'image/x-quicktime'],
         'qml' => ['text/x-qml'],
@@ -2860,6 +2948,7 @@ public function guessMimeType(string $path): ?string
         'rng' => ['application/xml', 'text/xml'],
         'roa' => ['application/rpki-roa'],
         'roff' => ['application/x-troff', 'text/troff', 'text/x-troff'],
+        'ros' => ['text/x-common-lisp'],
         'rp' => ['image/vnd.rn-realpix'],
         'rp9' => ['application/vnd.cloanto.rp9'],
         'rpm' => ['application/x-redhat-package-manager', 'application/x-rpm'],
@@ -2871,6 +2960,7 @@ public function guessMimeType(string $path): ?string
         'rsd' => ['application/rsd+xml'],
         'rsheet' => ['application/urc-ressheet+xml'],
         'rss' => ['application/rss+xml', 'text/rss'],
+        'rst' => ['text/x-rst'],
         'rt' => ['text/vnd.rn-realtext'],
         'rtf' => ['application/rtf', 'text/rtf'],
         'rtx' => ['text/richtext'],
@@ -2882,6 +2972,7 @@ public function guessMimeType(string $path): ?string
         's' => ['text/x-asm'],
         's3m' => ['audio/s3m', 'audio/x-s3m'],
         'saf' => ['application/vnd.yamaha.smaf-audio'],
+        'sage' => ['text/x-sagemath'],
         'sam' => ['application/x-amipro'],
         'sami' => ['application/x-sami'],
         'sap' => ['application/x-sap-file', 'application/x-thomson-sap-image'],
@@ -2923,6 +3014,7 @@ public function guessMimeType(string $path): ?string
         'sfv' => ['text/x-sfv'],
         'sg' => ['application/x-sg1000-rom'],
         'sgb' => ['application/x-gameboy-rom'],
+        'sgd' => ['application/x-genesis-rom'],
         'sgf' => ['application/x-go-sgf'],
         'sgi' => ['image/sgi', 'image/x-sgi'],
         'sgl' => ['application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global'],
@@ -2969,6 +3061,7 @@ public function guessMimeType(string $path): ?string
         'smf' => ['application/vnd.stardivision.math'],
         'smi' => ['application/smil', 'application/smil+xml', 'application/x-sami'],
         'smil' => ['application/smil', 'application/smil+xml'],
+        'smk' => ['video/vnd.radgamettools.smacker'],
         'sml' => ['application/smil', 'application/smil+xml'],
         'sms' => ['application/x-sms-rom'],
         'smv' => ['video/x-smv'],
@@ -2987,7 +3080,7 @@ public function guessMimeType(string $path): ?string
         'spot' => ['text/vnd.in3d.spot'],
         'spp' => ['application/scvp-vp-response'],
         'spq' => ['application/scvp-vp-request'],
-        'spx' => ['audio/ogg', 'audio/x-speex'],
+        'spx' => ['application/x-apple-systemprofiler+xml', 'audio/ogg', 'audio/x-speex', 'audio/x-speex+ogg'],
         'sql' => ['application/sql', 'application/x-sql', 'text/x-sql'],
         'sqlite2' => ['application/x-sqlite2'],
         'sqlite3' => ['application/vnd.sqlite3', 'application/x-sqlite3'],
@@ -3061,13 +3154,14 @@ public function guessMimeType(string $path): ?string
         'tar.lzma' => ['application/x-lzma-compressed-tar'],
         'tar.lzo' => ['application/x-tzo'],
         'tar.xz' => ['application/x-xz-compressed-tar'],
+        'tar.zst' => ['application/x-zstd-compressed-tar'],
         'target' => ['text/x-systemd-unit'],
         'taz' => ['application/x-tarz'],
         'tb2' => ['application/x-bzip-compressed-tar'],
         'tbz' => ['application/x-bzip-compressed-tar'],
         'tbz2' => ['application/x-bzip-compressed-tar'],
         'tcap' => ['application/vnd.3gpp2.tcap'],
-        'tcl' => ['application/x-tcl', 'text/x-tcl'],
+        'tcl' => ['application/x-tcl', 'text/tcl', 'text/x-tcl'],
         'teacher' => ['application/vnd.smart.teacher'],
         'tei' => ['application/tei+xml'],
         'teicorpus' => ['application/tei+xml'],
@@ -3078,7 +3172,7 @@ public function guessMimeType(string $path): ?string
         'tfi' => ['application/thraud+xml'],
         'tfm' => ['application/x-tex-tfm'],
         'tfx' => ['image/tiff-fx'],
-        'tga' => ['image/x-icb', 'image/x-tga'],
+        'tga' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'tgz' => ['application/x-compressed-tar'],
         'theme' => ['application/x-theme'],
         'themepack' => ['application/x-windows-themepack'],
@@ -3086,7 +3180,7 @@ public function guessMimeType(string $path): ?string
         'tif' => ['image/tiff'],
         'tiff' => ['image/tiff'],
         'timer' => ['text/x-systemd-unit'],
-        'tk' => ['application/x-tcl', 'text/x-tcl'],
+        'tk' => ['application/x-tcl', 'text/tcl', 'text/x-tcl'],
         'tlrz' => ['application/x-lrzip-compressed-tar'],
         'tlz' => ['application/x-lzma-compressed-tar'],
         'tmo' => ['application/vnd.tmobile-livetv'],
@@ -3095,7 +3189,7 @@ public function guessMimeType(string $path): ?string
         'toc' => ['application/x-cdrdao-toc'],
         'toml' => ['application/toml'],
         'torrent' => ['application/x-bittorrent'],
-        'tpic' => ['image/x-icb', 'image/x-tga'],
+        'tpic' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'tpl' => ['application/vnd.groove-tool-template'],
         'tpt' => ['application/vnd.trid.tpt'],
         'tr' => ['application/x-troff', 'text/troff', 'text/x-troff'],
@@ -3119,6 +3213,7 @@ public function guessMimeType(string $path): ?string
         'txt' => ['text/plain'],
         'txz' => ['application/x-xz-compressed-tar'],
         'tzo' => ['application/x-tzo'],
+        'tzst' => ['application/x-zstd-compressed-tar'],
         'u32' => ['application/x-authorware-bin'],
         'u8dsn' => ['message/global-delivery-status'],
         'u8hdr' => ['message/global-headers'],
@@ -3182,6 +3277,7 @@ public function guessMimeType(string $path): ?string
         'vb' => ['application/x-virtual-boy-rom'],
         'vbox' => ['application/x-virtualbox-vbox'],
         'vbox-extpack' => ['application/x-virtualbox-vbox-extpack'],
+        'vbs' => ['text/vbs', 'text/vbscript'],
         'vcard' => ['text/directory', 'text/vcard', 'text/x-vcard'],
         'vcd' => ['application/x-cdlink'],
         'vcf' => ['text/x-vcard', 'text/directory', 'text/vcard'],
@@ -3189,19 +3285,21 @@ public function guessMimeType(string $path): ?string
         'vcs' => ['application/ics', 'text/calendar', 'text/x-vcalendar'],
         'vct' => ['text/directory', 'text/vcard', 'text/x-vcard'],
         'vcx' => ['application/vnd.vcx'],
-        'vda' => ['image/x-icb', 'image/x-tga'],
-        'vdi' => ['application/x-virtualbox-vdi'],
-        'vhd' => ['application/x-virtualbox-vhd', 'text/x-vhdl'],
+        'vda' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
+        'vdi' => ['application/x-vdi-disk', 'application/x-virtualbox-vdi'],
+        'vhd' => ['application/x-vhd-disk', 'application/x-virtualbox-vhd', 'text/x-vhdl'],
         'vhdl' => ['text/x-vhdl'],
+        'vhdx' => ['application/x-vhdx-disk', 'application/x-virtualbox-vhdx'],
         'vis' => ['application/vnd.visionary'],
         'viv' => ['video/vivo', 'video/vnd.vivo'],
         'vivo' => ['video/vivo', 'video/vnd.vivo'],
         'vlc' => ['application/m3u', 'audio/m3u', 'audio/mpegurl', 'audio/x-m3u', 'audio/x-mp3-playlist', 'audio/x-mpegurl'],
-        'vmdk' => ['application/x-virtualbox-vmdk'],
+        'vmdk' => ['application/x-virtualbox-vmdk', 'application/x-vmdk-disk'],
         'vob' => ['video/mpeg', 'video/mpeg-system', 'video/x-mpeg', 'video/x-mpeg-system', 'video/x-mpeg2', 'video/x-ms-vob'],
         'voc' => ['audio/x-voc'],
         'vor' => ['application/vnd.stardivision.writer', 'application/vnd.stardivision.writer-global'],
         'vox' => ['application/x-authorware-bin'],
+        'vpc' => ['application/x-vhd-disk', 'application/x-virtualbox-vhd'],
         'vrm' => ['model/vrml'],
         'vrml' => ['model/vrml'],
         'vsd' => ['application/vnd.visio'],
@@ -3211,7 +3309,7 @@ public function guessMimeType(string $path): ?string
         'vss' => ['application/vnd.visio'],
         'vssm' => ['application/vnd.ms-visio.stencil.macroenabled.main+xml'],
         'vssx' => ['application/vnd.ms-visio.stencil.main+xml'],
-        'vst' => ['application/vnd.visio', 'image/x-icb', 'image/x-tga'],
+        'vst' => ['application/tga', 'application/vnd.visio', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'vstm' => ['application/vnd.ms-visio.template.macroenabled.main+xml'],
         'vstx' => ['application/vnd.ms-visio.template.main+xml'],
         'vsw' => ['application/vnd.visio'],
@@ -3260,7 +3358,7 @@ public function guessMimeType(string $path): ?string
         'wmx' => ['application/x-ms-asx', 'audio/x-ms-asx', 'video/x-ms-wax', 'video/x-ms-wmx', 'video/x-ms-wvx'],
         'wmz' => ['application/x-ms-wmz', 'application/x-msmetafile'],
         'woff' => ['application/font-woff', 'application/x-font-woff', 'font/woff'],
-        'woff2' => ['font/woff', 'font/woff2'],
+        'woff2' => ['font/woff2'],
         'wp' => ['application/vnd.wordperfect', 'application/wordperfect', 'application/x-wordperfect'],
         'wp4' => ['application/vnd.wordperfect', 'application/wordperfect', 'application/x-wordperfect'],
         'wp5' => ['application/vnd.wordperfect', 'application/wordperfect', 'application/x-wordperfect'],
@@ -3354,7 +3452,7 @@ public function guessMimeType(string $path): ?string
         'xpl' => ['application/xproc+xml'],
         'xpm' => ['image/x-xpixmap', 'image/x-xpm'],
         'xpr' => ['application/vnd.is-xpr'],
-        'xps' => ['application/oxps', 'application/vnd.ms-xpsdocument', 'application/xps'],
+        'xps' => ['application/vnd.ms-xpsdocument', 'application/xps'],
         'xpw' => ['application/vnd.intercon.formnet'],
         'xpx' => ['application/vnd.intercon.formnet'],
         'xsd' => ['application/xml', 'text/xml'],
@@ -3392,6 +3490,7 @@ public function guessMimeType(string $path): ?string
         'zmm' => ['application/vnd.handheld-entertainment+xml'],
         'zoo' => ['application/x-zoo'],
         'zsav' => ['application/x-spss-sav', 'application/x-spss-savefile'],
+        'zst' => ['application/zstd'],
         'zz' => ['application/zlib'],
         '123' => ['application/lotus123', 'application/vnd.lotus-1-2-3', 'application/wk1', 'application/x-123', 'application/x-lotus123', 'zz-application/zz-winassoc-123'],
         '602' => ['application/x-t602'],
diff --git a/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php b/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
index 2a6cf04ce5b6e..d8a73ce5a6ef6 100644
--- a/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
+++ b/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
@@ -19,7 +19,7 @@
     $new[$mimeType] = $mimeTypeInformation['extensions'];
 }
 
-$xml = simplexml_load_string(file_get_contents('https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml'));
+$xml = simplexml_load_string(file_get_contents('https://gitlab.freedesktop.org/xdg/shared-mime-info/-/raw/master/data/freedesktop.org.xml.in'));
 foreach ($xml as $node) {
     $exts = [];
     foreach ($node->glob as $glob) {
@@ -76,75 +76,56 @@
 }
 
 $data = $pre;
-foreach ($map as $mimeType => $exts) {
-    $data .= sprintf("        '%s' => ['%s'],\n", $mimeType, implode("', '", array_unique($exts)));
-}
-$data .= $post;
 
 // reverse map
 // we prefill the extensions with some preferences for content-types
 $exts = [
-    'aif' => ['audio/x-aiff'],
-    'aiff' => ['audio/x-aiff'],
-    'aps' => ['application/postscript'],
-    'avi' => ['video/avi'],
-    'bmp' => ['image/bmp'],
     'bz2' => ['application/x-bz2'],
-    'css' => ['text/css'],
     'csv' => ['text/csv'],
-    'dmg' => ['application/x-apple-diskimage'],
-    'doc' => ['application/msword'],
-    'docx' => ['application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
-    'eml' => ['message/rfc822'],
-    'exe' => ['application/x-ms-dos-executable'],
     'flv' => ['video/x-flv'],
     'gif' => ['image/gif'],
     'gz' => ['application/x-gzip'],
-    'hqx' => ['application/stuffit'],
     'htm' => ['text/html'],
     'html' => ['text/html'],
     'jar' => ['application/x-java-archive'],
-    'jpeg' => ['image/jpeg'],
     'jpg' => ['image/jpeg'],
     'js' => ['text/javascript'],
+    'key' => ['application/vnd.apple.keynote'],
     'm3u' => ['audio/x-mpegurl'],
     'm4a' => ['audio/mp4'],
     'mdb' => ['application/x-msaccess'],
     'mid' => ['audio/midi'],
-    'midi' => ['audio/midi'],
     'mov' => ['video/quicktime'],
     'mp3' => ['audio/mpeg'],
-    'mp4' => ['video/mp4'],
-    'mpeg' => ['video/mpeg'],
-    'mpg' => ['video/mpeg'],
     'ogg' => ['audio/ogg'],
     'pdf' => ['application/pdf'],
     'php' => ['application/x-php'],
-    'php3' => ['application/x-php'],
-    'php4' => ['application/x-php'],
-    'php5' => ['application/x-php'],
-    'png' => ['image/png'],
     'ppt' => ['application/vnd.ms-powerpoint'],
-    'pptx' => ['application/vnd.openxmlformats-officedocument.presentationml.presentation'],
-    'ps' => ['application/postscript'],
     'rar' => ['application/x-rar-compressed'],
-    'rtf' => ['application/rtf'],
-    'sit' => ['application/x-stuffit'],
+    'hqx' => ['application/stuffit'],
+    'sit' => ['application/x-stuffit', 'application/stuffit'],
     'svg' => ['image/svg+xml'],
     'tar' => ['application/x-tar'],
     'tif' => ['image/tiff'],
-    'tiff' => ['image/tiff'],
     'ttf' => ['application/x-font-truetype'],
-    'txt' => ['text/plain'],
     'vcf' => ['text/x-vcard'],
     'wav' => ['audio/wav'],
     'wma' => ['audio/x-ms-wma'],
     'wmv' => ['audio/x-ms-wmv'],
     'xls' => ['application/vnd.ms-excel'],
-    'xlsx' => ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
-    'xml' => ['application/xml'],
     'zip' => ['application/zip'],
 ];
+
+foreach ($map as $mimeType => $extensions) {
+    foreach ($exts as $ext => $types) {
+        if (in_array($mimeType, $types, true)) {
+            array_unshift($extensions, $ext);
+        }
+    }
+    $data .= sprintf("        '%s' => ['%s'],\n", $mimeType, implode("', '", array_unique($extensions)));
+}
+$data .= $post;
+
 foreach ($map as $mimeType => $extensions) {
     foreach ($extensions as $extension) {
         if ('application/octet-stream' === $mimeType && 'bin' !== $extension) {

From a5e8e7d5e0526942b5e7958094c1e6db7e78f9d9 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 3 May 2021 17:52:09 +0200
Subject: [PATCH 29/67] Make Serializable implementation internal and final

---
 src/Symfony/Component/Security/CHANGELOG.md                 | 1 +
 .../Security/Core/Authentication/Token/NullToken.php        | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index dbfcb931aecd3..b143c899f9373 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -34,6 +34,7 @@ The CHANGELOG for version 5.4 and newer can be found in the security sub-package
  * Deprecate using `SessionTokenStorage` outside a request context, it will throw a `SessionNotFoundException` in Symfony 6.0
  * Randomize CSRF tokens to harden BREACH attacks
  * Deprecated voters that do not return a valid decision when calling the `vote` method.
+ * Flag `Serializable` implementation of `NullToken` as `@internal` and `@final`
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
index 5c8a1c24b1e12..4393f0bdbbd7a 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
@@ -103,6 +103,9 @@ public function __unserialize(array $data): void
 
     /**
      * @return string
+     *
+     * @internal in 5.3
+     * @final in 5.3
      */
     public function serialize()
     {
@@ -111,6 +114,9 @@ public function serialize()
 
     /**
      * @return void
+     *
+     * @internal in 5.3
+     * @final in 5.3
      */
     public function unserialize($serialized)
     {

From 31bba079c3b75f0f94060c30c56beb3e77f19726 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 2 May 2021 21:17:36 +0200
Subject: [PATCH 30/67] [Security] Add missing German translations

---
 .../Security/Core/Resources/translations/security.de.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
index c196611b17843..dc7a875e31fb0 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.de.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ungültiger oder abgelaufener Anmelde-Link.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in einer Minute noch einmal.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Zu viele fehlgeschlagene Anmeldeversuche, bitte versuchen Sie es in %minutes% Minuten noch einmal.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 0abfb561b59ba116ac4ee04d7897851a7f222c55 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Tue, 4 May 2021 10:28:08 +0200
Subject: [PATCH 31/67] fix merge

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

diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
index 8164548dacb0d..01aee64948539 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -16,9 +16,9 @@
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 use Symfony\Component\PasswordHasher\PasswordHasherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
-use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
@@ -112,7 +112,7 @@ public function testUpgradeWithoutUpgrader()
 
     public function testUserWithoutPassword()
     {
-        $this->user = new User('test', null);
+        $this->user = new InMemoryUser('test', null);
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 

From 2e4335fc70dc51151374f0b86331723794914a22 Mon Sep 17 00:00:00 2001
From: Noel Light-Hilary <noel@noellh.com>
Date: Tue, 4 May 2021 13:06:07 +0100
Subject: [PATCH 32/67] Expand `LockConflictedException` docs

The goal of this is to reduce the chance of bad assumptions about lock acquisition behaviour. Fixes #40969
---
 .../Component/Lock/Exception/LockConflictedException.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Lock/Exception/LockConflictedException.php b/src/Symfony/Component/Lock/Exception/LockConflictedException.php
index 8fcd6a836d217..d882b8d02956a 100644
--- a/src/Symfony/Component/Lock/Exception/LockConflictedException.php
+++ b/src/Symfony/Component/Lock/Exception/LockConflictedException.php
@@ -11,9 +11,13 @@
 
 namespace Symfony\Component\Lock\Exception;
 
+use Symfony\Component\Lock\Lock;
+
 /**
  * LockConflictedException is thrown when a lock is acquired by someone else.
  *
+ * In non-blocking mode it is caught by {@see Lock::acquire()} and {@see Lock::acquireRead()}.
+ *
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 class LockConflictedException extends \RuntimeException implements ExceptionInterface

From 8c0e8f7d83413028fb63b07e44277cda6b6700cf Mon Sep 17 00:00:00 2001
From: Tomanhez <tomek.sut@gmail.com>
Date: Tue, 4 May 2021 15:54:33 +0200
Subject: [PATCH 33/67] Fix return type on isAllowedProperty method

---
 .../Component/PropertyInfo/Extractor/ReflectionExtractor.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index c1ce405437dd5..78606db626d27 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -592,7 +592,7 @@ private function isAllowedProperty(string $class, string $property): bool
         try {
             $reflectionProperty = new \ReflectionProperty($class, $property);
 
-            return $reflectionProperty->getModifiers() & $this->propertyReflectionFlags;
+            return (bool) ($reflectionProperty->getModifiers() & $this->propertyReflectionFlags);
         } catch (\ReflectionException $e) {
             // Return false if the property doesn't exist
         }

From 076310cfe3637ae0218a2f696386c28f1c880515 Mon Sep 17 00:00:00 2001
From: Martin Hujer <mail@martinhujer.cz>
Date: Mon, 3 May 2021 10:37:16 +0200
Subject: [PATCH 34/67] [Security] Update Czech translations

- closes #41040
- The translations are not perfect for some %minutes% values
   as the pluralization is more complicated in Czech than in English.
- See: https://github.com/symfony/symfony/issues/40863#issuecomment-823928594
---
 .../Security/Core/Resources/translations/security.cs.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
index f953b4162af0d..13ace0de12daa 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.cs.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Neplatný nebo expirovaný odkaz na přihlášení.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minutu.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Příliš mnoho neúspěšných pokusů o přihlášení, zkuste to prosím znovu za %minutes% minut.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 4e6e276d7777541452993fbcf3f3a3b1bcc3b480 Mon Sep 17 00:00:00 2001
From: Hamza Makraz <makraz.hamza@gmail.com>
Date: Tue, 4 May 2021 05:35:10 +0000
Subject: [PATCH 35/67] [Security] Add missing Spanish translations

---
 .../Security/Core/Resources/translations/security.es.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
index b029197b815f2..2aec10587a712 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Enlace de inicio de sesión inválido o expirado.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minuto.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From ebfb0c99443b0d55f2fda07ffdd09d3a960557f1 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 4 May 2021 11:45:47 +0200
Subject: [PATCH 36/67] [Inflector][String] Fixed singularize `edges` > `edge`

---
 src/Symfony/Component/Inflector/Inflector.php | 21 +++++++++++++++++++
 .../Inflector/Tests/InflectorTest.php         |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/src/Symfony/Component/Inflector/Inflector.php b/src/Symfony/Component/Inflector/Inflector.php
index 461c5f6090572..97ae5c9b9d7b6 100644
--- a/src/Symfony/Component/Inflector/Inflector.php
+++ b/src/Symfony/Component/Inflector/Inflector.php
@@ -123,6 +123,9 @@ final class Inflector
         // fees (fee), trees (tree), employees (employee)
         ['see', 3, true, true, 'ee'],
 
+        // edges (edge)
+        ['segd', 4, true, true, 'dge'],
+
         // roses (rose), garages (garage), cassettes (cassette),
         // waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
         // shoes (shoe)
@@ -314,14 +317,32 @@ final class Inflector
      */
     private const UNINFLECTED = [
         '',
+
+        // data
         'atad',
+
+        // deer
         'reed',
+
+        // feedback
         'kcabdeef',
+
+        // fish
         'hsif',
+
+        // info
         'ofni',
+
+        // moose
         'esoom',
+
+        // series
         'seires',
+
+        // sheep
         'peehs',
+
+        // species
         'seiceps',
     ];
 
diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
index 62b3790fd3e33..99527b93c166f 100644
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -66,6 +66,7 @@ public function singularizeProvider()
             ['drivers', 'driver'],
             ['dwarves', ['dwarf', 'dwarve', 'dwarff']],
             ['echoes', ['echo', 'echoe']],
+            ['edges', 'edge'],
             ['elves', ['elf', 'elve', 'elff']],
             ['emphases', ['emphas', 'emphase', 'emphasis']],
             ['employees', 'employee'],
@@ -210,6 +211,7 @@ public function pluralizeProvider()
             ['driver', 'drivers'],
             ['dwarf', ['dwarfs', 'dwarves']],
             ['echo', 'echoes'],
+            ['edge', 'edges'],
             ['elf', ['elfs', 'elves']],
             ['emphasis', 'emphases'],
             ['fax', ['facies', 'faxes']],

From 22292d59d307a6cf85a0c171a6bf6830685454eb Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 4 May 2021 20:20:21 +0200
Subject: [PATCH 37/67] Fix tests

---
 src/Symfony/Component/Inflector/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/composer.json
index 1162fa4167f86..7aa7731d84801 100644
--- a/src/Symfony/Component/Inflector/composer.json
+++ b/src/Symfony/Component/Inflector/composer.json
@@ -25,7 +25,7 @@
     "require": {
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1",
-        "symfony/string": "^5.2.6"
+        "symfony/string": "^5.2.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Inflector\\": "" },

From 99aadb31ff446b8b515014d018fe8b807b2c5059 Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Wed, 5 May 2021 09:40:41 +0200
Subject: [PATCH 38/67] getProtocolVersion may return null

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

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 0d5a1110ad2fc..cf6ebbc0b0903 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1497,7 +1497,7 @@ public function isMethodCacheable()
      * if the proxy is trusted (see "setTrustedProxies()"), otherwise it returns
      * the latter (from the "SERVER_PROTOCOL" server parameter).
      *
-     * @return string
+     * @return string|null
      */
     public function getProtocolVersion()
     {

From 8c61c2273f0cfcd31fa442aa5a93562caa9224a5 Mon Sep 17 00:00:00 2001
From: Marcos Rezende <rezehnde@gmail.com>
Date: Mon, 3 May 2021 08:28:22 +0100
Subject: [PATCH 39/67] [Security] Missing translations pt_BR

---
 .../Core/Resources/translations/security.pt_BR.xlf        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
index 108a1f28b76a5..438ae862b10db 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pt_BR.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Link de login inválido ou expirado.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Muitas tentativas de login inválidas, por favor, tente novamente em um minuto.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Muitas tentativas de login inválidas, por favor, tente novamente em %minutes% minutos.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 4dc5c82fa400be9467586f3b561b1bb16944fce7 Mon Sep 17 00:00:00 2001
From: Mario Ramundo <ramundomario@gmail.com>
Date: Wed, 5 May 2021 22:22:20 +0200
Subject: [PATCH 40/67] [Security] Add missing Italian translations #41051

---
 .../Core/Resources/translations/security.it.xlf        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
index fa72163dee4a6..d9d879944f7ef 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.it.xlf
@@ -64,12 +64,20 @@
             </trans-unit>
             <trans-unit id="17">
                 <source>Too many failed login attempts, please try again later.</source>
-                <target>Troppi tentaivi di login falliti. Riprova tra un po'.</target>
+                <target>Troppi tentativi di login falliti, riprova tra un po'.</target>
             </trans-unit>
             <trans-unit id="18">
                 <source>Invalid or expired login link.</source>
                 <target>Link di login scaduto o non valido.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Troppi tentativi di login falliti, riprova tra %minutes% minuto.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Troppi tentativi di login falliti, riprova tra %minutes% minuti.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 774a1d35da39ac50748d15ef2a630aa967f556ce Mon Sep 17 00:00:00 2001
From: Shiro <shiroryokosha@gmail.com>
Date: Sun, 2 May 2021 23:36:34 +0200
Subject: [PATCH 41/67] [Security] Added missing Polish translations

---
 .../Security/Core/Resources/translations/security.pl.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
index b357cf4a43905..430f9f27805c2 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.pl.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Nieprawidłowy lub wygasły link logowania.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Zbyt wiele nieudanych prób logowania, spróbuj ponownie po upływie %minutes% minut.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Zbyt wiele nieudanych prób logowania, spróbuj ponownie po upływie %minutes% minut.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From d52d0969abfb3a39620ba1218560c9c860c44086 Mon Sep 17 00:00:00 2001
From: Romain Monteil <monteil.romain@gmail.com>
Date: Tue, 24 Nov 2020 11:39:29 +0100
Subject: [PATCH 42/67] [TwigBridge] Add form templates for Bootstrap 5

---
 src/Symfony/Bridge/Twig/CHANGELOG.md          |    3 +-
 .../views/Form/bootstrap_3_layout.html.twig   |    5 +
 .../views/Form/bootstrap_4_layout.html.twig   |    5 +
 .../bootstrap_5_horizontal_layout.html.twig   |  130 ++
 .../views/Form/bootstrap_5_layout.html.twig   |  374 ++++
 .../Form/bootstrap_base_layout.html.twig      |    5 -
 ...AbstractBootstrap5HorizontalLayoutTest.php |  353 ++++
 .../AbstractBootstrap5LayoutTest.php          | 1819 +++++++++++++++++
 ...xtensionBootstrap5HorizontalLayoutTest.php |  113 +
 .../FormExtensionBootstrap5LayoutTest.php     |  165 ++
 10 files changed, 2966 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_horizontal_layout.html.twig
 create mode 100644 src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php

diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
index 200ee29a03ea8..76f0779eea90f 100644
--- a/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -2,10 +2,11 @@ CHANGELOG
 =========
 
 5.3
------
+---
 
 * Add a new `markAsPublic` method on `NotificationEmail` to change the `importance` context option to null after creation
 * Add a new `fragment_uri()` helper to generate the URI of a fragment
+* Add support of Bootstrap 5 for form theming
 
 5.3.0
 -----
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index 9c8a0cc14f38d..7316abf0ddd12 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -54,6 +54,11 @@
     {%- endif -%}
 {%- endblock radio_widget %}
 
+{% block choice_widget_collapsed -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
+    {{- parent() -}}
+{%- endblock choice_widget_collapsed %}
+
 {# Labels #}
 
 {% block form_label -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
index c990d81370f3c..3fbaa052c7154 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -202,6 +202,11 @@
     {%- endif -%}
 {%- endblock radio_widget %}
 
+{% block choice_widget_collapsed -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
+    {{- parent() -}}
+{%- endblock choice_widget_collapsed %}
+
 {% block choice_widget_expanded -%}
     <div {{ block('widget_container_attributes') }}>
         {%- for child in form %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_horizontal_layout.html.twig
new file mode 100644
index 0000000000000..3c24166d48ad0
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_horizontal_layout.html.twig
@@ -0,0 +1,130 @@
+{% use "bootstrap_5_layout.html.twig" %}
+
+{# Labels #}
+
+{% block form_label -%}
+    {%- if label is same as(false) -%}
+        <div class="{{ block('form_label_class') }}"></div>
+    {%- else -%}
+        {%- set row_class = row_class|default(row_attr.class|default('')) -%}
+        {%- if 'form-floating' not in row_class and 'input-group' not in row_class -%}
+            {%- if expanded is not defined or not expanded -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
+            {%- endif -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ block('form_label_class'))|trim}) -%}
+        {%- endif -%}
+        {{- parent() -}}
+    {%- endif -%}
+{%- endblock form_label %}
+
+{% block form_label_class -%}
+    col-sm-2
+{%- endblock form_label_class %}
+
+{# Rows #}
+
+{% block form_row -%}
+    {%- if expanded is defined and expanded -%}
+        {{ block('fieldset_form_row') }}
+    {%- else -%}
+        {%- set widget_attr = {} -%}
+        {%- if help is not empty -%}
+            {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+        {%- endif -%}
+        {%- set row_class = row_class|default(row_attr.class|default('mb-3')) -%}
+        {%- set is_form_floating = is_form_floating|default('form-floating' in row_class) -%}
+        {%- set is_input_group = is_input_group|default('input-group' in row_class) -%}
+        {#- Remove behavior class from the main container -#}
+        {%- set row_class = row_class|replace({'form-floating': '', 'input-group': ''}) -%}
+        <div{% with {attr: row_attr|merge({class: (row_class ~ ' row' ~ ((not compound or force_error|default(false)) and not valid ? ' is-invalid'))|trim})} %}{{ block('attributes') }}{% endwith %}>
+            {%- if is_form_floating or is_input_group -%}
+                <div class="{{ block('form_label_class') }}"></div>
+                <div class="{{ block('form_group_class') }}">
+                    {%- if is_form_floating -%}
+                        <div class="form-floating">
+                            {{- form_widget(form, widget_attr) -}}
+                            {{- form_label(form) -}}
+                        </div>
+                    {%- elseif is_input_group -%}
+                        <div class="input-group">
+                            {{- form_label(form) -}}
+                            {{- form_widget(form, widget_attr) -}}
+                            {#- Hack to properly display help with input group -#}
+                            {{- form_help(form) -}}
+                        </div>
+                    {%- endif -%}
+                    {%- if not is_input_group -%}
+                        {{- form_help(form) -}}
+                    {%- endif -%}
+                    {{- form_errors(form) -}}
+                </div>
+            {%- else -%}
+                {{- form_label(form) -}}
+                <div class="{{ block('form_group_class') }}">
+                    {{- form_widget(form, widget_attr) -}}
+                    {{- form_help(form) -}}
+                    {{- form_errors(form) -}}
+                </div>
+            {%- endif -%}
+        {##}</div>
+    {%- endif -%}
+{%- endblock form_row %}
+
+{% block fieldset_form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
+    <fieldset{% with {attr: row_attr|merge({class: row_attr.class|default('mb-3')|trim})} %}{{ block('attributes') }}{% endwith %}>
+        <div class="row{% if (not compound or force_error|default(false)) and not valid %} is-invalid{% endif %}">
+            {{- form_label(form) -}}
+            <div class="{{ block('form_group_class') }}">
+                {{- form_widget(form, widget_attr) -}}
+                {{- form_help(form) -}}
+                {{- form_errors(form) -}}
+            </div>
+        </div>
+    </fieldset>
+{%- endblock fieldset_form_row %}
+
+{% block submit_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock submit_row %}
+
+{% block reset_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock reset_row %}
+
+{% block button_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock button_row %}
+
+{% block checkbox_row -%}
+    <div{% with {attr: row_attr|merge({class: (row_attr.class|default('mb-3') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>{#--#}
+        <div class="{{ block('form_label_class') }}"></div>{#--#}
+        <div class="{{ block('form_group_class') }}">
+            {{- form_widget(form) -}}
+            {{- form_help(form) -}}
+            {{- form_errors(form) -}}
+        </div>{#--#}
+    </div>
+{%- endblock checkbox_row %}
+
+{% block form_group_class -%}
+    col-sm-10
+{%- endblock form_group_class %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
new file mode 100644
index 0000000000000..eef6f606edc14
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -0,0 +1,374 @@
+{% use "bootstrap_base_layout.html.twig" %}
+
+{# Widgets #}
+
+{% block money_widget -%}
+    {%- set prepend = not (money_pattern starts with '{{') -%}
+    {%- set append = not (money_pattern ends with '}}') -%}
+    {%- if prepend or append -%}
+        <div class="input-group{{ group_class|default('') }}">
+            {%- if prepend -%}
+                <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
+            {%- endif -%}
+            {{- block('form_widget_simple') -}}
+            {%- if append -%}
+                <span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
+            {%- endif -%}
+        </div>
+    {%- else -%}
+        {{- block('form_widget_simple') -}}
+    {%- endif -%}
+{%- endblock money_widget %}
+
+{% block date_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        {%- if datetime is not defined or not datetime -%}
+            <div {{ block('widget_container_attributes') -}}>
+        {%- endif %}
+        {%- if label is not same as(false) -%}
+            <div class="visually-hidden">
+                {{- form_label(form.year) -}}
+                {{- form_label(form.month) -}}
+                {{- form_label(form.day) -}}
+            </div>
+        {%- endif -%}
+        <div class="input-group">
+            {{- date_pattern|replace({
+                '{{ year }}': form_widget(form.year),
+                '{{ month }}': form_widget(form.month),
+                '{{ day }}': form_widget(form.day),
+            })|raw -}}
+        </div>
+        {%- if datetime is not defined or not datetime -%}
+            </div>
+        {%- endif -%}
+    {%- endif -%}
+{%- endblock date_widget %}
+
+{% block time_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        {%- if datetime is not defined or false == datetime -%}
+            <div {{ block('widget_container_attributes') -}}>
+        {%- endif -%}
+        {%- if label is not same as(false) -%}
+            <div class="visually-hidden">
+                {{- form_label(form.hour) -}}
+                {%- if with_minutes -%}{{ form_label(form.minute) }}{%- endif -%}
+                {%- if with_seconds -%}{{ form_label(form.second) }}{%- endif -%}
+            </div>
+        {%- endif -%}
+        {% if with_minutes or with_seconds %}
+            <div class="input-group">
+        {% endif %}
+        {{- form_widget(form.hour) -}}
+        {%- if with_minutes -%}
+            <span class="input-group-text">:</span>
+            {{- form_widget(form.minute) -}}
+        {%- endif -%}
+        {%- if with_seconds -%}
+            <span class="input-group-text">:</span>
+            {{- form_widget(form.second) -}}
+        {%- endif -%}
+        {% if with_minutes or with_seconds %}
+            </div>
+        {% endif %}
+        {%- if datetime is not defined or false == datetime -%}
+            </div>
+        {%- endif -%}
+    {%- endif -%}
+{%- endblock time_widget %}
+
+{% block datetime_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        <div {{ block('widget_container_attributes') }}>
+            {{- form_widget(form.date, { datetime: true } ) -}}
+            {{- form_errors(form.date) -}}
+            {{- form_widget(form.time, { datetime: true } ) -}}
+            {{- form_errors(form.time) -}}
+        </div>
+    {%- endif -%}
+{%- endblock datetime_widget %}
+
+{% block dateinterval_widget -%}
+    {%- if widget == 'single_text' -%}
+        {{- block('form_widget_simple') -}}
+    {%- else -%}
+        {% if not valid %}
+            {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) -%}
+            {% set valid = true %}
+        {% endif %}
+        <div {{ block('widget_container_attributes') }}>
+            {%- if with_years -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.years) }}
+                    {{ form_widget(form.years) }}
+                </div>
+            {%- endif -%}
+            {%- if with_months -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.months) }}
+                    {{ form_widget(form.months) }}
+                </div>
+            {%- endif -%}
+            {%- if with_weeks -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.weeks) }}
+                    {{ form_widget(form.weeks) }}
+                </div>
+            {%- endif -%}
+            {%- if with_days -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.days) }}
+                    {{ form_widget(form.days) }}
+                </div>
+            {%- endif -%}
+            {%- if with_hours -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.hours) }}
+                    {{ form_widget(form.hours) }}
+                </div>
+            {%- endif -%}
+            {%- if with_minutes -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.minutes) }}
+                    {{ form_widget(form.minutes) }}
+                </div>
+            {%- endif -%}
+            {%- if with_seconds -%}
+                <div class="col-auto mb-3">
+                    {{ form_label(form.seconds) }}
+                    {{ form_widget(form.seconds) }}
+                </div>
+            {%- endif -%}
+            {%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
+        </div>
+    {%- endif -%}
+{%- endblock dateinterval_widget %}
+
+{% block percent_widget -%}
+    {%- if symbol -%}
+        <div class="input-group">
+            {{- block('form_widget_simple') -}}
+            <span class="input-group-text">{{ symbol|default('%') }}</span>
+        </div>
+    {%- else -%}
+        {{- block('form_widget_simple') -}}
+    {%- endif -%}
+{%- endblock percent_widget %}
+
+{% block form_widget_simple -%}
+    {%- if type is not defined or type != 'hidden' %}
+        {%- set widget_class = ' form-control' %}
+        {%- if type|default('') == 'color' -%}
+            {%- set widget_class = widget_class ~ ' form-control-color' -%}
+        {%- elseif type|default('') == 'range' -%}
+            {%- set widget_class = ' form-range' -%}
+        {%- endif -%}
+        {%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%}
+    {% endif -%}
+    {%- if type is defined and type in ['range', 'color'] %}
+        {# Attribute "required" is not supported #}
+        {% set required = false %}
+    {% endif -%}
+    {{- parent() -}}
+{%- endblock form_widget_simple %}
+
+{%- block widget_attributes -%}
+    {%- if not valid %}
+        {% set attr = attr|merge({class: (attr.class|default('') ~ ' is-invalid')|trim}) %}
+    {% endif -%}
+    {{ parent() }}
+{%- endblock widget_attributes -%}
+
+{%- block button_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('btn-secondary') ~ ' btn')|trim}) -%}
+    {{- parent() -}}
+{%- endblock button_widget %}
+
+{%- block submit_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('btn-primary'))|trim}) -%}
+    {{- parent() -}}
+{%- endblock submit_widget %}
+
+{%- block checkbox_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
+    {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+    {%- set row_class = 'form-check' -%}
+    {%- if 'checkbox-inline' in parent_label_class %}
+        {% set row_class = row_class ~ ' form-check-inline' %}
+    {% endif -%}
+    {%- if 'checkbox-switch' in parent_label_class %}
+        {% set row_class = row_class ~ ' form-switch' %}
+    {% endif -%}
+    <div class="{{ row_class }}">
+        {{- form_label(form, null, { widget: parent() }) -}}
+    </div>
+{%- endblock checkbox_widget %}
+
+{%- block radio_widget -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
+    {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+    {%- set row_class = 'form-check' -%}
+    {%- if 'radio-inline' in parent_label_class -%}
+        {%- set row_class = row_class ~ ' form-check-inline' -%}
+    {%- endif -%}
+    <div class="{{ row_class }}">
+        {{- form_label(form, null, { widget: parent() }) -}}
+    </div>
+{%- endblock radio_widget %}
+
+{%- block choice_widget_collapsed -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-select')|trim}) -%}
+    {{- parent() -}}
+{%- endblock choice_widget_collapsed -%}
+
+{%- block choice_widget_expanded -%}
+    <div {{ block('widget_container_attributes') }}>
+        {%- for child in form %}
+            {{- form_widget(child, {
+                parent_label_class: label_attr.class|default(''),
+                translation_domain: choice_translation_domain,
+                valid: valid,
+            }) -}}
+        {% endfor -%}
+    </div>
+{%- endblock choice_widget_expanded %}
+
+{# Labels #}
+
+{%- block form_label -%}
+    {% if label is not same as(false) -%}
+        {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
+        {%- if compound is defined and compound -%}
+            {%- set element = 'legend' -%}
+            {%- if 'col-form-label' not in parent_label_class -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label' )|trim}) -%}
+            {%- endif -%}
+        {%- else -%}
+            {%- set row_class = row_class|default(row_attr.class|default('')) -%}
+            {%- set label_attr = label_attr|merge({for: id}) -%}
+            {%- if 'col-form-label' not in parent_label_class -%}
+                {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ('input-group' in row_class ? ' input-group-text' : ' form-label') )|trim}) -%}
+            {%- endif -%}
+        {%- endif -%}
+    {%- endif -%}
+    {{- parent() -}}
+{%- endblock form_label %}
+
+{%- block checkbox_radio_label -%}
+    {#- Do not display the label if widget is not defined in order to prevent double label rendering -#}
+    {%- if widget is defined -%}
+        {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%}
+        {%- if not compound -%}
+            {% set label_attr = label_attr|merge({'for': id}) %}
+        {%- endif -%}
+        {%- if required -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
+        {%- endif -%}
+        {%- if parent_label_class is defined -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ parent_label_class)|replace({'checkbox-inline': '', 'radio-inline': ''})|trim}) -%}
+        {%- endif -%}
+        {%- if label is not same as(false) and label is empty -%}
+            {%- if label_format is not empty -%}
+                {%- set label = label_format|replace({
+                    '%name%': name,
+                    '%id%': id,
+                }) -%}
+            {%- else -%}
+                {%- set label = name|humanize -%}
+            {%- endif -%}
+        {%- endif -%}
+
+        {{ widget|raw }}
+        <label{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
+            {%- if label is not same as(false) -%}
+                {%- if translation_domain is same as(false) -%}
+                    {%- if label_html is same as(false) -%}
+                        {{- label -}}
+                    {%- else -%}
+                        {{- label|raw -}}
+                    {%- endif -%}
+                {%- else -%}
+                    {%- if label_html is same as(false) -%}
+                        {{- label|trans(label_translation_parameters, translation_domain) -}}
+                    {%- else -%}
+                        {{- label|trans(label_translation_parameters, translation_domain)|raw -}}
+                    {%- endif -%}
+                {%- endif -%}
+            {%- endif -%}
+        </label>
+    {%- endif -%}
+{%- endblock checkbox_radio_label %}
+
+{# Rows #}
+
+{%- block form_row -%}
+    {%- if compound is defined and compound -%}
+        {%- set element = 'fieldset' -%}
+    {%- endif -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
+    {%- set row_class = row_class|default(row_attr.class|default('mb-3')|trim) -%}
+    <{{ element|default('div') }}{% with {attr: row_attr|merge({class: row_class})} %}{{ block('attributes') }}{% endwith %}>
+        {%- if 'form-floating' in row_class -%}
+            {{- form_widget(form, widget_attr) -}}
+            {{- form_label(form) -}}
+        {%- else -%}
+            {{- form_label(form) -}}
+            {{- form_widget(form, widget_attr) -}}
+        {%- endif -%}
+        {{- form_help(form) -}}
+        {{- form_errors(form) -}}
+    </{{ element|default('div') }}>
+{%- endblock form_row %}
+
+{%- block button_row -%}
+    <div{% with {attr: row_attr|merge({class: row_attr.class|default('mb-3')|trim})} %}{{ block('attributes') }}{% endwith %}>
+        {{- form_widget(form) -}}
+    </div>
+{%- endblock button_row %}
+
+{# Errors #}
+
+{%- block form_errors -%}
+    {%- if errors|length > 0 -%}
+        {%- for error in errors -%}
+            <div class="invalid-feedback d-block">{{ error.message }}</div>
+        {%- endfor -%}
+    {%- endif %}
+{%- endblock form_errors %}
+
+{# Help #}
+
+{%- block form_help -%}
+    {% set row_class = row_attr.class|default('') %}
+    {% set help_class = ' form-text' %}
+    {% if 'input-group' in row_class %}
+        {#- Hack to properly display help with input group -#}
+        {% set help_class = ' input-group-text' %}
+    {% endif %}
+    {%- if help is not empty -%}
+        {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ help_class ~ ' mb-0')|trim}) -%}
+    {%- endif -%}
+    {{- parent() -}}
+{%- endblock form_help %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
index 1b0092859dbd9..b8cb8c44aa832 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig
@@ -143,11 +143,6 @@
     {%- endif -%}
 {%- endblock dateinterval_widget -%}
 
-{% block choice_widget_collapsed -%}
-    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
-    {{- parent() -}}
-{%- endblock choice_widget_collapsed %}
-
 {% block choice_widget_expanded -%}
     {%- if '-inline' in label_attr.class|default('') -%}
         {%- for child in form %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
new file mode 100644
index 0000000000000..9fe231bfa1198
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
@@ -0,0 +1,353 @@
+<?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\Bridge\Twig\Tests\Extension;
+
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\RadioType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormError;
+
+/**
+ * Abstract class providing test cases for the Bootstrap 5 horizontal Twig form theme.
+ *
+ * @author Romain Monteil <monteil.romain@gmail.com>
+ */
+abstract class AbstractBootstrap5HorizontalLayoutTest extends AbstractBootstrap5LayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3 row"]
+    [
+        ./label
+            [@for="name"]
+            [@class="col-form-label col-sm-2 required"]
+        /following-sibling::div
+            [@class="col-sm-10"]
+            [
+                ./input[@id="name"]
+                /following-sibling::div
+                    [@class="invalid-feedback d-block"]
+                    [.="[trans]Error![/trans]"]
+            ]
+            [count(./div)=1]
+    ]
+'
+        );
+    }
+
+    public function testRowWithCustomClass()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->createView(), [
+            'row_attr' => [
+                'class' => 'mb-5',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-5 row"]
+    [
+        ./label
+            [@for="name"]
+            [@class="col-form-label col-sm-2 required"]
+        /following-sibling::div
+            [@class="col-sm-10"]
+            [
+                ./input[@id="name"]
+                /following-sibling::div
+                    [@class="invalid-feedback d-block"]
+                    [.="[trans]Error![/trans]"]
+            ]
+            [count(./div)=1]
+    ]
+'
+        );
+    }
+
+    public function testLabelOnForm()
+    {
+        $form = $this->factory->createNamed('name', DateType::class);
+        $view = $form->createView();
+        $this->renderWidget($view, ['label' => 'foo']);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+            '/legend
+    [@class="col-form-label col-sm-2 required"]
+    [.="[trans]Name[/trans]"]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="col-form-label col-sm-2 required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+'/label
+    [@for="name"]
+    [@class="my&class col-form-label col-sm-2 required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelHtmlDefaultIsFalse()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => '<b>Bolded label</b>',
+        ]);
+
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class col-form-label col-sm-2 required"][.="[trans]<b>Bolded label</b>[/trans]"]');
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class col-form-label col-sm-2 required"]/b[.="Bolded label"]', 0);
+    }
+
+    public function testLabelHtmlIsTrue()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => '<b>Bolded label</b>',
+            'label_html' => true,
+        ]);
+
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class col-form-label col-sm-2 required"][.="[trans]<b>Bolded label</b>[/trans]"]', 0);
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class col-form-label col-sm-2 required"]/b[.="Bolded label"]');
+    }
+
+    public function testLegendOnExpandedType()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, null, [
+            'label' => 'Custom label',
+            'expanded' => true,
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+        ]);
+        $view = $form->createView();
+        $this->renderWidget($view);
+        $html = $this->renderLabel($view);
+
+        $this->assertMatchesXpath($html,
+'/legend
+    [@class="col-sm-2 col-form-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testCheckboxRow()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class);
+        $view = $form->createView();
+        $html = $this->renderRow($view, ['label' => 'foo']);
+
+        $this->assertMatchesXpath($html, '/div[@class="mb-3 row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
+    }
+
+    public function testCheckboxRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class);
+        $view = $form->createView();
+        $html = $this->renderRow($view, ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="mb-3 row"]
+    [
+        ./div[@class="col-sm-2" or @class="col-sm-10"]
+        /following-sibling::div[@class="col-sm-2" or @class="col-sm-10"]
+        [
+            ./p
+                [@class="form-text mb-0 help-text"]
+                [.="[trans]really helpful text[/trans]"]
+        ]
+    ]
+'
+        );
+    }
+
+    public function testRadioRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', RadioType::class, false);
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="mb-3 row"]
+    [
+        ./div[@class="col-sm-2" or @class="col-sm-10"]
+        /following-sibling::div[@class="col-sm-2" or @class="col-sm-10"]
+        [
+            ./p
+                [@class="form-text mb-0 help-text"]
+                [.="[trans]really helpful text[/trans]"]
+        ]
+    ]
+'
+        );
+    }
+
+    public function testFileWithGroup()
+    {
+        $form = $this->factory->createNamed('name', FileType::class);
+        $html = $this->renderRow($form->createView(), [
+            'id' => 'n/a',
+            'attr' => [
+                'class' => 'my&class',
+            ],
+            'row_attr' => [
+                'class' => 'input-group mb-3',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3 row"]
+    [
+        ./div
+            [@class="col-sm-2"]
+        /following-sibling::div
+            [@class="col-sm-10"]
+            [
+                ./div
+                    [@class="input-group"]
+                    [
+                        ./label
+                            [@class="input-group-text required"]
+                            [.="[trans]Name[/trans]"]
+                        /following-sibling::input
+                            [@type="file"]
+                            [@name="name"]
+                            [@class="my&class form-control"]
+                    ]
+            ]
+    ]
+'
+        );
+    }
+
+    public function testFloatingLabel()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'attr' => [
+                'placeholder' => 'name',
+            ],
+            'row_attr' => [
+                'class' => 'form-floating mb-3',
+            ],
+        ]);
+
+        $html = $this->renderRow($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3 row"]
+    [
+        ./div
+            [@class="col-sm-2"]
+        /following-sibling::div
+            [@class="col-sm-10"]
+            [
+                ./div
+                    [@class="form-floating"]
+                    [
+                        ./input
+                            [@id="name"]
+                            [@placeholder="[trans]name[/trans]"]
+                        /following-sibling::label
+                            [@for="name"]
+                    ]
+            ]
+    ]
+'
+        );
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
new file mode 100644
index 0000000000000..c6b9e3baaab7b
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
@@ -0,0 +1,1819 @@
+<?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\Bridge\Twig\Tests\Extension;
+
+use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\ColorType;
+use Symfony\Component\Form\Extension\Core\Type\CountryType;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\LanguageType;
+use Symfony\Component\Form\Extension\Core\Type\LocaleType;
+use Symfony\Component\Form\Extension\Core\Type\MoneyType;
+use Symfony\Component\Form\Extension\Core\Type\PercentType;
+use Symfony\Component\Form\Extension\Core\Type\RadioType;
+use Symfony\Component\Form\Extension\Core\Type\RangeType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TimeType;
+use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
+use Symfony\Component\Form\Extension\Core\Type\WeekType;
+use Symfony\Component\Form\FormError;
+
+/**
+ * Abstract class providing test cases for the Bootstrap 5 Twig form theme.
+ *
+ * @author Romain Monteil <monteil.romain@gmail.com>
+ */
+abstract class AbstractBootstrap5LayoutTest extends AbstractBootstrap4LayoutTest
+{
+    public function testRow()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3"]
+    [
+        ./label[@for="name"]
+        /following-sibling::input[@id="name"]
+        /following-sibling::div
+            [@class="invalid-feedback d-block"]
+            [.="[trans]Error![/trans]"]
+    ]
+    [count(./div)=1]
+'
+        );
+    }
+
+    public function testRowWithCustomClass()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->createView(), [
+            'row_attr' => [
+                'class' => 'mb-5',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-5"]
+    [
+        ./label[@for="name"]
+        /following-sibling::input[@id="name"]
+        /following-sibling::div
+            [@class="invalid-feedback d-block"]
+            [.="[trans]Error![/trans]"]
+    ]
+    [count(./div)=1]
+'
+        );
+    }
+
+    public function testLabelDoesNotRenderFieldAttributes()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/label
+    [@for="name"]
+    [@class="form-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/label
+    [@for="name"]
+    [@class="my&class form-label required"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $html = $this->renderLabel($form->createView(), 'Custom label', [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/label
+    [@for="name"]
+    [@class="my&class form-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelWithCustomTextAsOptionAndCustomAttributesPassedDirectly()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => 'Custom label',
+        ]);
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/label
+    [@for="name"]
+    [@class="my&class form-label required"]
+    [.="[trans]Custom label[/trans]"]
+'
+        );
+    }
+
+    public function testLabelHtmlDefaultIsFalse()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => '<b>Bolded label</b>',
+        ]);
+
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class form-label required"][.="[trans]<b>Bolded label</b>[/trans]"]');
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class form-label required"]/b[.="Bolded label"]', 0);
+    }
+
+    public function testLabelHtmlIsTrue()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'label' => '<b>Bolded label</b>',
+            'label_html' => true,
+        ]);
+
+        $html = $this->renderLabel($form->createView(), null, [
+            'label_attr' => [
+                'class' => 'my&class',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class form-label required"][.="[trans]<b>Bolded label</b>[/trans]"]', 0);
+        $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class form-label required"]/b[.="Bolded label"]');
+    }
+
+    public function testHelp()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'help' => 'Help text test!',
+        ]);
+        $view = $form->createView();
+        $html = $this->renderHelp($view);
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    [.="[trans]Help text test![/trans]"]
+'
+        );
+    }
+
+    public function testHelpAttr()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'help' => 'Help text test!',
+            'help_attr' => [
+                'class' => 'class-test',
+            ],
+        ]);
+        $view = $form->createView();
+        $html = $this->renderHelp($view);
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="class-test form-text mb-0 help-text"]
+    [.="[trans]Help text test![/trans]"]
+'
+        );
+    }
+
+    public function testHelpHtmlDefaultIsFalse()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'help' => 'Help <b>text</b> test!',
+        ]);
+
+        $view = $form->createView();
+        $html = $this->renderHelp($view);
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    [.="[trans]Help <b>text</b> test![/trans]"]
+'
+        );
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    /b
+    [.="text"]
+', 0
+        );
+    }
+
+    public function testHelpHtmlIsFalse()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'help' => 'Help <b>text</b> test!',
+            'help_html' => false,
+        ]);
+
+        $view = $form->createView();
+        $html = $this->renderHelp($view);
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    [.="[trans]Help <b>text</b> test![/trans]"]
+'
+        );
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    /b
+    [.="text"]
+', 0
+        );
+    }
+
+    public function testHelpHtmlIsTrue()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'help' => 'Help <b>text</b> test!',
+            'help_html' => true,
+        ]);
+        $html = $this->renderHelp($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    [.="[trans]Help <b>text</b> test![/trans]"]
+', 0
+        );
+
+        $this->assertMatchesXpath($html,
+            '/p
+    [@id="name_help"]
+    [@class="form-text mb-0 help-text"]
+    /b
+    [.="text"]
+'
+        );
+    }
+
+    public function testErrors()
+    {
+        $form = $this->factory->createNamed('name', TextType::class);
+        $form->addError(new FormError('[trans]Error 1[/trans]'));
+        $form->addError(new FormError('[trans]Error 2[/trans]'));
+        $html = $this->renderErrors($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="invalid-feedback d-block"]
+    [.="[trans]Error 1[/trans]"]
+    /following-sibling::div
+    [@class="invalid-feedback d-block"]
+    [.="[trans]Error 2[/trans]"]
+'
+        );
+    }
+
+    public function testErrorWithNoLabel()
+    {
+        self::markTestSkipped('Errors are no longer rendered inside label with Bootstrap 5.');
+    }
+
+    public function testSingleChoiceAttributesWithMainAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'attr' => ['class' => 'bar&baz'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'bar&baz']],
+            '/select
+    [@name="name"]
+    [@class="bar&baz form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testCheckboxRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class);
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3"]
+    [
+        ./div[@class="form-check"]
+        [
+            ./input
+                [@type="checkbox"]
+                [@id="name"]
+                [@name="name"]
+                [@required="required"]
+                [@aria-describedby="name_help"]
+                [@class="form-check-input"]
+                [@value="1"]
+            /following-sibling::label
+                [@class="form-check-label required"]
+                [@for="name"]
+                [.="[trans]foo[/trans]"]
+        ]
+        /following-sibling::p
+            [@class="form-text mb-0 help-text"]
+            [.="[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testCheckboxSwitchWithValue()
+    {
+        $form = $this->factory->createNamed('name', CheckboxType::class, false, [
+            'value' => 'foo&bar',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class'], 'label_attr' => ['class' => 'checkbox-switch']],
+            '/div
+    [@class="form-check form-switch"]
+    [
+        ./input[@type="checkbox"][@name="name"][@id="my&id"][@class="my&class form-check-input"][@value="foo&bar"]
+        /following-sibling::label
+            [@class="checkbox-switch form-check-label required"]
+            [.="[trans]Name[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testMultipleChoiceSkipsPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => true,
+            'expanded' => false,
+            'placeholder' => 'Test&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name[]"]
+    [@class="my&class form-select"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoice()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'choice_translation_domain' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPlaceholderWithoutTranslation()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'required' => false,
+            'translation_domain' => false,
+            'placeholder' => 'Placeholder&Not&Translated',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="Placeholder&Not&Translated"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][@class="foo&bar"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferred()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '-- sep --', 'attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=4]
+'
+        );
+    }
+
+    public function testSingleChoiceWithSelectedPreferred()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&a'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '-- sep --', 'attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=4]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferredAndNoSeparator()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => null, 'attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceWithPreferredAndBlankSeparator()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['separator' => '', 'attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=4]
+'
+        );
+    }
+
+    public function testChoiceWithOnlyPreferred()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'preferred_choices' => ['&a', '&b'],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@class="my&class form-select"]
+    [count(./option)=5]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequired()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value=""][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequiredNoneSelected()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, null, [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value=""][.=""]
+        /following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceNonRequiredWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'multiple' => false,
+            'expanded' => false,
+            'required' => false,
+            'placeholder' => 'Select&Anything&Not&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Anything&Not&Me[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceRequiredWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => false,
+            'expanded' => false,
+            'placeholder' => 'Test&Me',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [@required="required"]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Test&Me[/trans]"]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceRequiredWithPlaceholderViaView()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['placeholder' => '', 'attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [@required="required"]
+    [
+        ./option[@value=""][not(@selected)][not(@disabled)][.=""]
+        /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=3]
+'
+        );
+    }
+
+    public function testSingleChoiceGrouped()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
+            'choices' => [
+                'Group&1' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+                'Group&2' => ['Choice&C' => '&c'],
+            ],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [./optgroup[@label="[trans]Group&1[/trans]"]
+        [
+            ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+            /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+        ]
+        [count(./option)=2]
+    ]
+    [./optgroup[@label="[trans]Group&2[/trans]"]
+        [./option[@value="&c"][not(@selected)][.="[trans]Choice&C[/trans]"]]
+        [count(./option)=1]
+    ]
+    [count(./optgroup)=2]
+'
+        );
+    }
+
+    public function testMultipleChoice()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => true,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name[]"]
+    [@class="my&class form-select"]
+    [@required="required"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceAttributes()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'choice_attr' => ['Choice&B' => ['class' => 'foo&bar']],
+            'required' => true,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name[]"]
+    [@class="my&class form-select"]
+    [@required="required"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][@class="foo&bar"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testMultipleChoiceNonRequired()
+    {
+        $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
+            'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
+            'required' => false,
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name[]"]
+    [@class="my&class form-select"]
+    [@multiple="multiple"]
+    [
+        ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
+        /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
+    ]
+    [count(./option)=2]
+'
+        );
+    }
+
+    public function testRadioRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', RadioType::class, false);
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="mb-3"]
+    [
+        ./p
+            [@class="form-text mb-0 help-text"]
+            [.="[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
+    public function testFile()
+    {
+        $form = $this->factory->createNamed('name', FileType::class);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'n/a', 'attr' => ['class' => 'my&class']],
+            '/input
+    [@type="file"]
+    [@name="name"]
+    [@class="my&class form-control"]
+'
+        );
+    }
+
+    public function testFileWithGroup()
+    {
+        $form = $this->factory->createNamed('name', FileType::class);
+        $html = $this->renderRow($form->createView(), [
+            'id' => 'n/a',
+            'attr' => [
+                'class' => 'my&class',
+            ],
+            'row_attr' => [
+                'class' => 'input-group mb-3',
+            ],
+        ]);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="input-group mb-3"]
+    [
+        ./label
+            [@class="input-group-text required"]
+            [.="[trans]Name[/trans]"]
+        /following-sibling::input
+            [@type="file"]
+            [@name="name"]
+            [@class="my&class form-control"]
+    ]
+'
+        );
+    }
+
+    public function testFileWithPlaceholder()
+    {
+        self::markTestSkipped('Placeholder does not apply on input file.');
+    }
+
+    public function testCountry()
+    {
+        $form = $this->factory->createNamed('name', CountryType::class, 'AT');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [./option[@value="AT"][@selected="selected"][.="Austria"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testCountryWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', CountryType::class, 'AT', [
+            'placeholder' => 'Select&Country',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Country[/trans]"]]
+    [./option[@value="AT"][@selected="selected"][.="Austria"]]
+    [count(./option)>201]
+'
+        );
+    }
+
+    public function testDateTime()
+    {
+        $form = $this->factory->createNamed('name', DateTimeType::class, date('Y').'-02-03 04:05:06', [
+            'input' => 'string',
+            'with_seconds' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+
+                ./select
+                    [@id="name_date_month"]
+                    [@class="form-select"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_day"]
+                    [@class="form-select"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_year"]
+                    [@class="form-select"]
+                    [./option[@value="'.date('Y').'"][@selected="selected"]]
+            ]
+       /following-sibling::div
+            [@class="visually-hidden"]
+       /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_time_hour"]
+                    [@class="form-select"]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_time_minute"]
+                    [@class="form-select"]
+                    [./option[@value="5"][@selected="selected"]]
+            ]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', DateTimeType::class, null, [
+            'input' => 'string',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_date_month"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                /following-sibling::select
+                    [@id="name_date_day"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                /following-sibling::select
+                    [@id="name_date_year"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            ]
+        /following-sibling::div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_time_hour"]
+                    [@class="form-select"]
+                    [./option[@value=""][.="[trans]Change&Me[/trans]"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_time_minute"]
+                    [@class="form-select"]
+                    [./option[@value=""][.="[trans]Change&Me[/trans]"]]
+            ]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithHourAndMinute()
+    {
+        $data = ['year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5'];
+
+        $form = $this->factory->createNamed('name', DateTimeType::class, $data, [
+            'input' => 'array',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_date_month"]
+                    [@class="form-select"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_day"]
+                    [@class="form-select"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_year"]
+                    [@class="form-select"]
+                    [./option[@value="'.date('Y').'"][@selected="selected"]]
+            ]
+        /following-sibling::div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_time_hour"]
+                    [@class="form-select"]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_time_minute"]
+                    [@class="form-select"]
+                    [./option[@value="5"][@selected="selected"]]
+            ]
+    ]
+    [count(.//select)=5]
+'
+        );
+    }
+
+    public function testDateTimeWithSeconds()
+    {
+        $form = $this->factory->createNamed('name', DateTimeType::class, date('Y').'-02-03 04:05:06', [
+            'input' => 'string',
+            'with_seconds' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_date_month"]
+                    [@class="form-select"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_day"]
+                    [@class="form-select"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_date_year"]
+                    [@class="form-select"]
+                    [./option[@value="'.date('Y').'"][@selected="selected"]]
+            ]
+        /following-sibling::div
+            [@class="visually-hidden"]
+        /following-sibling::div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_time_hour"]
+                    [@class="form-select"]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_time_minute"]
+                    [@class="form-select"]
+                    [./option[@value="5"][@selected="selected"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_time_second"]
+                    [@class="form-select"]
+                    [./option[@value="6"][@selected="selected"]]
+            ]
+    ]
+    [count(.//select)=6]
+'
+        );
+    }
+
+    public function testDateTimeSingleText()
+    {
+        $form = $this->factory->createNamed('name', DateTimeType::class, '2011-02-03 04:05:06', [
+            'input' => 'string',
+            'date_widget' => 'single_text',
+            'time_widget' => 'single_text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./input
+            [@type="date"]
+            [@id="name_date"]
+            [@name="name[date]"]
+            [@class="form-control"]
+            [@value="2011-02-03"]
+        /following-sibling::input
+            [@type="time"]
+            [@id="name_time"]
+            [@name="name[time]"]
+            [@class="form-control"]
+            [@value="04:05"]
+    ]
+'
+        );
+    }
+
+    public function testDateChoice()
+    {
+        $form = $this->factory->createNamed('name', DateType::class, date('Y').'-02-03', [
+            'input' => 'string',
+            'widget' => 'choice',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_month"]
+                    [@class="form-select"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_day"]
+                    [@class="form-select"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_year"]
+                    [@class="form-select"]
+                    [./option[@value="'.date('Y').'"][@selected="selected"]]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testDateChoiceWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', DateType::class, null, [
+            'input' => 'string',
+            'widget' => 'choice',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_month"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                /following-sibling::select
+                    [@id="name_day"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                /following-sibling::select
+                    [@id="name_year"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testDateChoiceWithPlaceholderOnYear()
+    {
+        $form = $this->factory->createNamed('name', DateType::class, null, [
+            'input' => 'string',
+            'widget' => 'choice',
+            'required' => false,
+            'placeholder' => ['year' => 'Change&Me'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_month"]
+                    [@class="form-select"]
+                    [./option[@value="1"]]
+                /following-sibling::select
+                    [@id="name_day"]
+                    [@class="form-select"]
+                    [./option[@value="1"]]
+                /following-sibling::select
+                    [@id="name_year"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testDateText()
+    {
+        $form = $this->factory->createNamed('name', DateType::class, '2011-02-03', [
+            'input' => 'string',
+            'widget' => 'text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./input
+                    [@id="name_month"]
+                    [@type="text"]
+                    [@class="form-control"]
+                    [@value="2"]
+                /following-sibling::input
+                    [@id="name_day"]
+                    [@type="text"]
+                    [@class="form-control"]
+                    [@value="3"]
+                /following-sibling::input
+                    [@id="name_year"]
+                    [@type="text"]
+                    [@class="form-control"]
+                    [@value="2011"]
+            ]
+            [count(./input)=3]
+    ]
+'
+        );
+    }
+
+    public function testBirthDay()
+    {
+        $form = $this->factory->createNamed('name', BirthdayType::class, '2000-02-03', [
+            'input' => 'string',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_month"]
+                    [@class="form-select"]
+                    [./option[@value="2"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_day"]
+                    [@class="form-select"]
+                    [./option[@value="3"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_year"]
+                    [@class="form-select"]
+                    [./option[@value="2000"][@selected="selected"]]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testBirthDayWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', BirthdayType::class, '1950-01-01', [
+            'input' => 'string',
+            'placeholder' => '',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_month"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+                    [./option[@value="1"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_day"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+                    [./option[@value="1"][@selected="selected"]]
+                /following-sibling::select
+                    [@id="name_year"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
+                    [./option[@value="1950"][@selected="selected"]]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testLanguage()
+    {
+        $form = $this->factory->createNamed('name', LanguageType::class, 'de');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [./option[@value="de"][@selected="selected"][.="German"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testLocale()
+    {
+        $form = $this->factory->createNamed('name', LocaleType::class, 'de_AT');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [./option[@value="de_AT"][@selected="selected"][.="German (Austria)"]]
+    [count(./option)>200]
+'
+        );
+    }
+
+    public function testMoney()
+    {
+        $form = $this->factory->createNamed('name', MoneyType::class, 1234.56, [
+            'currency' => 'EUR',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+            '/div
+    [@class="input-group"]
+    [
+        ./span
+            [@class="input-group-text"]
+            [contains(.., "€")]
+        /following-sibling::input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="1234.56"]
+    ]
+'
+        );
+    }
+
+    public function testPercent()
+    {
+        $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['rounding_mode' => \NumberFormatter::ROUND_CEILING]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+            '/div
+    [@class="input-group"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="10"]
+            /following-sibling::span
+                [@class="input-group-text"]
+                [contains(.., "%")]
+    ]
+'
+        );
+    }
+
+    public function testPercentCustomSymbol()
+    {
+        $form = $this->factory->createNamed('name', PercentType::class, 0.1, ['symbol' => '‱', 'rounding_mode' => \NumberFormatter::ROUND_CEILING]);
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'my&id', 'attr' => ['class' => 'my&class']],
+            '/div
+    [@class="input-group"]
+    [
+        ./input
+            [@id="my&id"]
+            [@type="text"]
+            [@name="name"]
+            [@class="my&class form-control"]
+            [@value="10"]
+            /following-sibling::span
+                [@class="input-group-text"]
+                [contains(.., "‱")]
+    ]
+'
+        );
+    }
+
+    public function testRange()
+    {
+        $form = $this->factory->createNamed('name', RangeType::class, 42, ['attr' => ['min' => 5]]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="range"]
+    [@name="name"]
+    [@value="42"]
+    [@min="5"]
+    [@class="my&class form-range"]
+'
+        );
+    }
+
+    public function testRangeWithMinMaxValues()
+    {
+        $form = $this->factory->createNamed('name', RangeType::class, 42, ['attr' => ['min' => 5, 'max' => 57]]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="range"]
+    [@name="name"]
+    [@value="42"]
+    [@min="5"]
+    [@max="57"]
+    [@class="my&class form-range"]
+'
+        );
+    }
+
+    public function testColor()
+    {
+        $color = '#0000ff';
+        $form = $this->factory->createNamed('name', ColorType::class, $color);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/input
+    [@type="color"]
+    [@name="name"]
+    [@class="my&class form-control form-control-color"]
+    [@value="#0000ff"]
+'
+        );
+    }
+
+    public function testTime()
+    {
+        $form = $this->factory->createNamed('name', TimeType::class, '04:05:06', [
+            'input' => 'string',
+            'with_seconds' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_hour"]
+                    [@class="form-select"]
+                    [not(@size)]
+                    [./option[@value="4"][@selected="selected"]]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_minute"]
+                    [@class="form-select"]
+                    [not(@size)]
+                    [./option[@value="5"][@selected="selected"]]
+            ]
+            [count(./select)=2]
+    ]
+'
+        );
+    }
+
+    public function testTimeWithSeconds()
+    {
+        $form = $this->factory->createNamed('name', TimeType::class, '04:05:06', [
+            'input' => 'string',
+            'with_seconds' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_hour"]
+                    [@class="form-select"]
+                    [not(@size)]
+                    [./option[@value="4"][@selected="selected"]]
+                    [count(./option)>23]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_minute"]
+                    [@class="form-select"]
+                    [not(@size)]
+                    [./option[@value="5"][@selected="selected"]]
+                    [count(./option)>59]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_second"]
+                    [@class="form-select"]
+                    [not(@size)]
+                    [./option[@value="6"][@selected="selected"]]
+                    [count(./option)>59]
+            ]
+            [count(./select)=3]
+    ]
+'
+        );
+    }
+
+    public function testTimeText()
+    {
+        $form = $this->factory->createNamed('name', TimeType::class, '04:05:06', [
+            'input' => 'string',
+            'widget' => 'text',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./input
+                    [@type="text"]
+                    [@id="name_hour"]
+                    [@name="name[hour]"]
+                    [@class="form-control"]
+                    [@value="04"]
+                    [@required="required"]
+                    [not(@size)]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::input
+                    [@type="text"]
+                    [@id="name_minute"]
+                    [@name="name[minute]"]
+                    [@class="form-control"]
+                    [@value="05"]
+                    [@required="required"]
+                    [not(@size)]
+            ]
+            [count(./input)=2]
+    ]
+'
+        );
+    }
+
+    public function testTimeWithPlaceholderGlobal()
+    {
+        $form = $this->factory->createNamed('name', TimeType::class, null, [
+            'input' => 'string',
+            'placeholder' => 'Change&Me',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+        [@class="input-group"]
+        [
+            ./select
+                [@id="name_hour"]
+                [@class="form-select"]
+                [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                [count(./option)>24]
+            /following-sibling::span
+                [@class="input-group-text"]
+            /following-sibling::select
+                [@id="name_minute"]
+                [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                [count(./option)>60]
+        ]
+        [count(./select)=2]
+    ]
+'
+        );
+    }
+
+    public function testTimeWithPlaceholderOnYear()
+    {
+        $form = $this->factory->createNamed('name', TimeType::class, null, [
+            'input' => 'string',
+            'required' => false,
+            'placeholder' => ['hour' => 'Change&Me'],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./div
+            [@class="input-group"]
+            [
+                ./select
+                    [@id="name_hour"]
+                    [@class="form-select"]
+                    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Change&Me[/trans]"]]
+                    [count(./option)>24]
+                /following-sibling::span
+                    [@class="input-group-text"]
+                /following-sibling::select
+                    [@id="name_minute"]
+                    [./option[@value="1"]]
+                    [count(./option)>59]
+            ]
+            [count(./select)=2]
+    ]
+'
+        );
+    }
+
+    public function testTimezone()
+    {
+        $form = $this->factory->createNamed('name', TimezoneType::class, 'Europe/Vienna');
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@name="name"]
+    [@class="my&class form-select"]
+    [not(@required)]
+    [./option[@value="Europe/Vienna"][@selected="selected"][.="Europe / Vienna"]]
+    [count(.//option)>200]
+'
+        );
+    }
+
+    public function testTimezoneWithPlaceholder()
+    {
+        $form = $this->factory->createNamed('name', TimezoneType::class, null, [
+            'placeholder' => 'Select&Timezone',
+            'required' => false,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/select
+    [@class="my&class form-select"]
+    [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
+    [count(.//option)>201]
+'
+        );
+    }
+
+    public function testWeekChoices()
+    {
+        $this->requiresFeatureSet(404);
+
+        $data = ['year' => (int) date('Y'), 'week' => 1];
+
+        $form = $this->factory->createNamed('name', WeekType::class, $data, [
+            'input' => 'array',
+            'widget' => 'choice',
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
+            '/div
+    [@class="my&class"]
+    [
+        ./select
+            [@id="name_year"]
+            [@class="form-select"]
+            [./option[@value="'.$data['year'].'"][@selected="selected"]]
+        /following-sibling::select
+            [@id="name_week"]
+            [@class="form-select"]
+            [./option[@value="'.$data['week'].'"][@selected="selected"]]
+    ]
+    [count(.//select)=2]'
+        );
+    }
+
+    public function testFloatingLabel()
+    {
+        $form = $this->factory->createNamed('name', TextType::class, null, [
+            'attr' => [
+                'placeholder' => 'name',
+            ],
+            'row_attr' => [
+                'class' => 'form-floating mb-3',
+            ],
+        ]);
+
+        $html = $this->renderRow($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="form-floating mb-3"]
+    [
+        ./input
+            [@id="name"]
+            [@placeholder="[trans]name[/trans]"]
+        /following-sibling::label
+            [@for="name"]
+    ]
+'
+        );
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
new file mode 100644
index 0000000000000..042cbf0e40a7e
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
@@ -0,0 +1,113 @@
+<?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\Bridge\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
+/**
+ * Class providing test cases for the Bootstrap 5 horizontal Twig form theme.
+ *
+ * @author Romain Monteil <monteil.romain@gmail.com>
+ */
+class FormExtensionBootstrap5HorizontalLayoutTest extends AbstractBootstrap5HorizontalLayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    protected $testableFeatures = [
+        'choice_attr',
+    ];
+
+    private $renderer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $loader = new FilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_5_horizontal_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(CsrfTokenManagerInterface::class)->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    protected function renderForm(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = []): string
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderHelp(FormView $view): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+    }
+
+    protected function renderErrors(FormView $view): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
new file mode 100644
index 0000000000000..1bf4a315fab0b
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
@@ -0,0 +1,165 @@
+<?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\Bridge\Twig\Tests\Extension;
+
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Extension\TranslationExtension;
+use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\MoneyType;
+use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
+/**
+ * Class providing test cases for the Bootstrap 5 Twig form theme.
+ *
+ * @author Romain Monteil <monteil.romain@gmail.com>
+ */
+class FormExtensionBootstrap5LayoutTest extends AbstractBootstrap5LayoutTest
+{
+    use RuntimeLoaderProvider;
+
+    /**
+     * @var FormRenderer
+     */
+    private $renderer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $loader = new FilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]);
+
+        $environment = new Environment($loader, ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_5_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(CsrfTokenManagerInterface::class)->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+    }
+
+    public function testStartTagHasNoActionAttributeWhenActionIsEmpty()
+    {
+        $form = $this->factory->create(FormType::class, null, [
+            'method' => 'get',
+            'action' => '',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        self::assertSame('<form name="form" method="get">', $html);
+    }
+
+    public function testStartTagHasActionAttributeWhenActionIsZero()
+    {
+        $form = $this->factory->create(FormType::class, null, [
+            'method' => 'get',
+            'action' => '0',
+        ]);
+
+        $html = $this->renderStart($form->createView());
+
+        self::assertSame('<form name="form" method="get" action="0">', $html);
+    }
+
+    public function testMoneyWidgetInIso()
+    {
+        $environment = new Environment(new FilesystemLoader([
+            __DIR__.'/../../Resources/views/Form',
+            __DIR__.'/Fixtures/templates/form',
+        ]), ['strict_variables' => true]);
+        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addExtension(new FormExtension());
+        $environment->setCharset('ISO-8859-1');
+
+        $rendererEngine = new TwigRendererEngine([
+            'bootstrap_5_layout.html.twig',
+            'custom_widgets.html.twig',
+        ], $environment);
+        $this->renderer = new FormRenderer($rendererEngine, $this->getMockBuilder(CsrfTokenManagerInterface::class)->getMock());
+        $this->registerTwigRuntimeLoader($environment, $this->renderer);
+
+        $view = $this->factory
+            ->createNamed('name', MoneyType::class)
+            ->createView();
+
+        self::assertSame(<<<'HTML'
+<div class="input-group"><span class="input-group-text">&euro; </span><input type="text" id="name" name="name" required="required" class="form-control" /></div>
+HTML
+            , trim($this->renderWidget($view)));
+    }
+
+    protected function renderForm(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+    }
+
+    protected function renderLabel(FormView $view, $label = null, array $vars = []): string
+    {
+        if (null !== $label) {
+            $vars += ['label' => $label];
+        }
+
+        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+    }
+
+    protected function renderHelp(FormView $view): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+    }
+
+    protected function renderErrors(FormView $view): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+    }
+
+    protected function renderWidget(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+    }
+
+    protected function renderRow(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+    }
+
+    protected function renderRest(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+    }
+
+    protected function renderStart(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+    }
+
+    protected function renderEnd(FormView $view, array $vars = []): string
+    {
+        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+    }
+
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void
+    {
+        $this->renderer->setTheme($view, $themes, $useDefaultThemes);
+    }
+}

From 18e6e2d1599a2a7b7e24dcec64f0aeee67f235aa Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 6 May 2021 13:08:14 +0200
Subject: [PATCH 43/67] Fix CHANGELOG

---
 src/Symfony/Bridge/Twig/CHANGELOG.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
index 76f0779eea90f..00533c18cd86f 100644
--- a/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -7,11 +7,7 @@ CHANGELOG
 * Add a new `markAsPublic` method on `NotificationEmail` to change the `importance` context option to null after creation
 * Add a new `fragment_uri()` helper to generate the URI of a fragment
 * Add support of Bootstrap 5 for form theming
-
-5.3.0
------
-
-* Added a new `serialize` filter to serialize objects using the Serializer component
+* Add a new `serialize` filter to serialize objects using the Serializer component
 
 5.2.0
 -----

From 26cd193085112cf62cf7ebb0ae8fc5576239b84f Mon Sep 17 00:00:00 2001
From: kshida <34312716+kshida@users.noreply.github.com>
Date: Fri, 7 May 2021 00:23:42 +0900
Subject: [PATCH 44/67] [Security] Added missing Japanese translations

---
 .../Resources/translations/security.ja.xlf    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
index a637c02a8b530..d28315293f14d 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ja.xlf
@@ -63,13 +63,21 @@
                 <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>
+                <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>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>ログイン試行回数が多すぎます。%minutes%分後に再度お試しください。</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>ログイン試行回数が多すぎます。%minutes%分後に再度お試しください。</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From d3807a79b806f280730d565cce24c2e90b2836b6 Mon Sep 17 00:00:00 2001
From: Pavel Kirpitsov <pavel.kirpichyov@gmail.com>
Date: Thu, 29 Apr 2021 20:24:09 +0300
Subject: [PATCH 45/67] [Notifier] Add SlackOptions::threadTs() to send message
 as reply

---
 .../Component/Notifier/Bridge/Slack/CHANGELOG.md       |  1 +
 .../Component/Notifier/Bridge/Slack/SlackOptions.php   | 10 ++++++++++
 .../Notifier/Bridge/Slack/Tests/SlackOptionsTest.php   |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
index 290723a59d6c9..4b370190ce1b9 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Check for maximum number of buttons in Slack action block
  * Add HeaderBlock
  * Slack access tokens needs to start with "xox" (see https://api.slack.com/authentication/token-types)
+ * Add `SlackOptions::threadTs()` to send message as reply
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
index ec5e6a1b2ea3c..4073d480ebe68 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
@@ -181,4 +181,14 @@ public function username(string $username): self
 
         return $this;
     }
+
+    /**
+     * @return $this
+     */
+    public function threadTs(string $threadTs): self
+    {
+        $this->options['thread_ts'] = $threadTs;
+
+        return $this;
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
index 0ed3aae039fbf..d83e974330f87 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
@@ -70,6 +70,7 @@ public function toArraySimpleOptionsProvider(): iterable
         yield [['unfurl_links' => true]];
         yield [['unfurl_media' => true]];
         yield [['username' => 'baz']];
+        yield [['thread_ts' => '1503435956.000247']];
     }
 
     /**
@@ -111,6 +112,7 @@ public function setProvider(): iterable
         yield ['unfurlLinks', 'unfurl_links', true];
         yield ['unfurlMedia', 'unfurl_media', true];
         yield ['username', 'username', 'baz'];
+        yield ['threadTs', 'thread_ts', '1503435956.000247'];
     }
 
     public function testSetBlock()

From 4b0f2997a5ac0aac67beaa47e2bbd9210e70bb5d Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 30 Apr 2021 17:29:27 +0200
Subject: [PATCH 46/67] [VarExporter] Add support of PHP enumerations

---
 src/Symfony/Component/VarExporter/Internal/Exporter.php   | 4 ++--
 .../Component/VarExporter/Tests/Fixtures/FooUnitEnum.php  | 8 ++++++++
 .../Component/VarExporter/Tests/Fixtures/unit-enum.php    | 5 +++++
 .../Component/VarExporter/Tests/VarExporterTest.php       | 5 +++++
 src/Symfony/Component/VarExporter/VarExporter.php         | 2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php
 create mode 100644 src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php

diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
index 74b81d5cf6948..d15126a155e4e 100644
--- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
+++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -62,7 +62,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
                 }
                 goto handle_value;
-            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class) {
+            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class || $value instanceof \UnitEnum) {
                 goto handle_value;
             }
 
@@ -190,7 +190,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
     public static function export($value, $indent = '')
     {
         switch (true) {
-            case \is_int($value) || \is_float($value): return var_export($value, true);
+            case \is_int($value) || \is_float($value) || $value instanceof \UnitEnum: return var_export($value, true);
             case [] === $value: return '[]';
             case false === $value: return 'false';
             case true === $value: return 'true';
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php
new file mode 100644
index 0000000000000..0f569de8328b2
--- /dev/null
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/FooUnitEnum.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures;
+
+enum FooUnitEnum
+{
+    case Bar;
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php
new file mode 100644
index 0000000000000..48ab51dd0141b
--- /dev/null
+++ b/src/Symfony/Component/VarExporter/Tests/Fixtures/unit-enum.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum::Bar,
+];
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
index 305abd1b77293..bd21448d1a3e8 100644
--- a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
+++ b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
 use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
 use Symfony\Component\VarExporter\Internal\Registry;
+use Symfony\Component\VarExporter\Tests\Fixtures\FooUnitEnum;
 use Symfony\Component\VarExporter\VarExporter;
 
 class VarExporterTest extends TestCase
@@ -209,6 +210,10 @@ public function provideExport()
         yield ['private-constructor', PrivateConstructor::create('bar')];
 
         yield ['php74-serializable', new Php74Serializable()];
+
+        if (\PHP_VERSION_ID >= 80100) {
+            yield ['unit-enum', [FooUnitEnum::Bar], true];
+        }
     }
 }
 
diff --git a/src/Symfony/Component/VarExporter/VarExporter.php b/src/Symfony/Component/VarExporter/VarExporter.php
index f1260d152dd87..a5cacb087572f 100644
--- a/src/Symfony/Component/VarExporter/VarExporter.php
+++ b/src/Symfony/Component/VarExporter/VarExporter.php
@@ -43,7 +43,7 @@ public static function export($value, bool &$isStaticValue = null): string
     {
         $isStaticValue = true;
 
-        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value)) {
+        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) || $value instanceof \UnitEnum) {
             return Exporter::export($value);
         }
 

From e596f4da1e559d80aaf4d9d37634e915ddf8dbc8 Mon Sep 17 00:00:00 2001
From: Karoly Gossler <connor@connor.hu>
Date: Thu, 6 May 2021 23:33:47 +0200
Subject: [PATCH 47/67] added missing `

---
 UPGRADE-5.3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md
index e1e910e729423..93f140943929f 100644
--- a/UPGRADE-5.3.md
+++ b/UPGRADE-5.3.md
@@ -14,7 +14,7 @@ Console
 DoctrineBridge
 --------------
 
- * Deprecate `UserLoaderInterface::loadUserByUsername()` in favor of `UserLoaderInterface::loadUserByIdentifier()
+ * Deprecate `UserLoaderInterface::loadUserByUsername()` in favor of `UserLoaderInterface::loadUserByIdentifier()`
  * Remove `UuidV*Generator` classes
 
 DomCrawler

From 12451142576e7c3bd7c97e9ac93bbb1c07b90420 Mon Sep 17 00:00:00 2001
From: Pavel Kirpitsov <pavel.kirpichyov@gmail.com>
Date: Thu, 29 Apr 2021 11:13:57 +0300
Subject: [PATCH 48/67] [Notifier] Fix return SentMessage then Messenger not
 used

---
 src/Symfony/Component/Notifier/Chatter.php    |  4 +-
 .../Component/Notifier/Tests/ChatterTest.php  | 63 +++++++++++++++++++
 .../Component/Notifier/Tests/TexterTest.php   | 62 ++++++++++++++++++
 src/Symfony/Component/Notifier/Texter.php     |  4 +-
 src/Symfony/Component/Notifier/composer.json  |  3 +-
 5 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Tests/ChatterTest.php
 create mode 100644 src/Symfony/Component/Notifier/Tests/TexterTest.php

diff --git a/src/Symfony/Component/Notifier/Chatter.php b/src/Symfony/Component/Notifier/Chatter.php
index 81e3984715144..8db4ae5e49149 100644
--- a/src/Symfony/Component/Notifier/Chatter.php
+++ b/src/Symfony/Component/Notifier/Chatter.php
@@ -51,9 +51,7 @@ public function supports(MessageInterface $message): bool
     public function send(MessageInterface $message): ?SentMessage
     {
         if (null === $this->bus) {
-            $this->transport->send($message);
-
-            return null;
+            return $this->transport->send($message);
         }
 
         if (null !== $this->dispatcher) {
diff --git a/src/Symfony/Component/Notifier/Tests/ChatterTest.php b/src/Symfony/Component/Notifier/Tests/ChatterTest.php
new file mode 100644
index 0000000000000..91b0b435e5d20
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Tests/ChatterTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Symfony\Component\Notifier\Tests;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Notifier\Chatter;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
+use Symfony\Component\Notifier\Transport\TransportInterface;
+
+class ChatterTest extends TestCase
+{
+    /** @var MockObject&TransportInterface */
+    private $transport;
+
+    /** @var MockObject&MessageBusInterface */
+    private $bus;
+
+    protected function setUp(): void
+    {
+        $this->transport = $this->createMock(TransportInterface::class);
+        $this->bus = $this->createMock(MessageBusInterface::class);
+    }
+
+    public function testSendWithoutBus()
+    {
+        $message = new DummyMessage();
+
+        $sentMessage = new SentMessage($message, 'any');
+
+        $this->transport
+            ->expects($this->once())
+            ->method('send')
+            ->with($message)
+            ->willReturn($sentMessage);
+
+        $chatter = new Chatter($this->transport);
+        $this->assertSame($sentMessage, $chatter->send($message));
+        $this->assertSame($message, $sentMessage->getOriginalMessage());
+    }
+
+    public function testSendWithBus()
+    {
+        $message = new DummyMessage();
+
+        $this->transport
+            ->expects($this->never())
+            ->method('send')
+            ->with($message);
+
+        $this->bus
+            ->expects($this->once())
+            ->method('dispatch')
+            ->with($message)
+            ->willReturn(new Envelope(new \stdClass()));
+
+        $chatter = new Chatter($this->transport, $this->bus);
+        $this->assertNull($chatter->send($message));
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Tests/TexterTest.php b/src/Symfony/Component/Notifier/Tests/TexterTest.php
new file mode 100644
index 0000000000000..1d695d65afba9
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Tests/TexterTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Symfony\Component\Notifier\Tests;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
+use Symfony\Component\Notifier\Texter;
+use Symfony\Component\Notifier\Transport\TransportInterface;
+
+class TexterTest extends TestCase
+{
+    /** @var MockObject&TransportInterface */
+    private $transport;
+
+    /** @var MockObject&MessageBusInterface */
+    private $bus;
+
+    protected function setUp(): void
+    {
+        $this->transport = $this->createMock(TransportInterface::class);
+        $this->bus = $this->createMock(MessageBusInterface::class);
+    }
+
+    public function testSendWithoutBus()
+    {
+        $message = new DummyMessage();
+        $sentMessage = new SentMessage($message, 'any');
+
+        $this->transport
+            ->expects($this->once())
+            ->method('send')
+            ->with($message)
+            ->willReturn($sentMessage);
+
+        $texter = new Texter($this->transport);
+        $this->assertSame($sentMessage, $texter->send($message));
+        $this->assertSame($message, $sentMessage->getOriginalMessage());
+    }
+
+    public function testSendWithBus()
+    {
+        $message = new DummyMessage();
+
+        $this->transport
+            ->expects($this->never())
+            ->method('send')
+            ->with($message);
+
+        $this->bus
+            ->expects($this->once())
+            ->method('dispatch')
+            ->with($message)
+            ->willReturn(new Envelope(new \stdClass()));
+
+        $texter = new Texter($this->transport, $this->bus);
+        $this->assertNull($texter->send($message));
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php
index 4414b248d8f89..190feec88fb1f 100644
--- a/src/Symfony/Component/Notifier/Texter.php
+++ b/src/Symfony/Component/Notifier/Texter.php
@@ -51,9 +51,7 @@ public function supports(MessageInterface $message): bool
     public function send(MessageInterface $message): ?SentMessage
     {
         if (null === $this->bus) {
-            $this->transport->send($message);
-
-            return null;
+            return $this->transport->send($message);
         }
 
         if (null !== $this->dispatcher) {
diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json
index 02178970b0afd..3e04a0479a6bc 100644
--- a/src/Symfony/Component/Notifier/composer.json
+++ b/src/Symfony/Component/Notifier/composer.json
@@ -22,7 +22,8 @@
     },
     "require-dev": {
         "symfony/event-dispatcher-contracts": "^2",
-        "symfony/http-client-contracts": "^2"
+        "symfony/http-client-contracts": "^2",
+        "symfony/messenger": "^4.4 || ^5.0"
     },
     "conflict": {
         "symfony/http-kernel": "<4.4",

From 965c6e4a2d2f81380526234a7212ced1d37ef1da Mon Sep 17 00:00:00 2001
From: Roman Martinuk <romanmartinuk@gmail.com>
Date: Tue, 4 May 2021 19:51:26 +0300
Subject: [PATCH 49/67] [Security] Update Russian translations

---
 .../Security/Core/Resources/translations/security.ru.xlf  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
index 461623148c1ac..4a3124f262126 100644
--- a/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
+++ b/src/Symfony/Component/Security/Core/Resources/translations/security.ru.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ссылка для входа недействительна или просрочена.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>Слишком много неудачных попыток входа в систему, повторите попытку через %minutes% минуту.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>Слишком много неудачных попыток входа в систему, повторите попытку через %minutes% мин.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 841d85a7ce573d2d45e0d445fdd55102ce6236aa Mon Sep 17 00:00:00 2001
From: Nicolas Assing <nicolas.assing@gmail.com>
Date: Tue, 4 May 2021 01:51:27 +0200
Subject: [PATCH 50/67] Check redis extension version

---
 src/Symfony/Component/Cache/Traits/RedisTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 6f22f33de5e05..7aaca38292006 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -188,7 +188,7 @@ public static function createConnection($dsn, array $options = [])
                 }
 
                 try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ['stream' => $params['ssl'] ?? null]);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();
@@ -251,7 +251,7 @@ public static function createConnection($dsn, array $options = [])
                 }
 
                 try {
-                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', $params['ssl'] ?? null);
+                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);
                 } catch (\RedisClusterException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }

From 4ad12320cdb87510bbfd27f0ff98e497312a9d3e Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 27 Apr 2021 13:21:00 +0100
Subject: [PATCH 51/67] [PhpUnitBridge] Fix tests with
 `@doesNotPerformAssertions` annotations

---
 .../Legacy/SymfonyTestsListenerTrait.php      |  7 ++-
 .../Tests/FailTests/NoAssertionsTestRisky.php | 44 +++++++++++++++++++
 .../Bridge/PhpUnit/Tests/expectrisky.phpt     | 22 ++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 44723f06ec937..5ad695c81058f 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -239,7 +239,7 @@ public function startTest($test)
                 }
 
                 if ($this->checkNumAssertions) {
-                    $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything() && !$test->doesNotPerformAssertions();
+                    $this->checkNumAssertions = $test->getTestResultObject()->isStrictAboutTestsThatDoNotTestAnything();
                 }
 
                 $test->getTestResultObject()->beStrictAboutTestsThatDoNotTestAnything(false);
@@ -268,7 +268,10 @@ public function endTest($test, $time)
         $groups = Test::getGroups($className, $test->getName(false));
 
         if ($this->checkNumAssertions) {
-            if (!self::$expectedDeprecations && !$test->getNumAssertions() && $test->getTestResultObject()->noneSkipped()) {
+            $assertions = \count(self::$expectedDeprecations) + $test->getNumAssertions();
+            if ($test->doesNotPerformAssertions() && $assertions > 0) {
+                $test->getTestResultObject()->addFailure($test, new RiskyTestError(sprintf('This test is annotated with "@doesNotPerformAssertions", but performed %s assertions', $assertions)), $time);
+            } elseif ($assertions === 0 && $test->getTestResultObject()->noneSkipped()) {
                 $test->getTestResultObject()->addFailure($test, new RiskyTestError('This test did not perform any assertions'), $time);
             }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php b/src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php
new file mode 100644
index 0000000000000..4a22baf125a7f
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php
@@ -0,0 +1,44 @@
+<?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\Bridge\PhpUnit\Tests\FailTests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
+/**
+ * This class is deliberately suffixed with *TestRisky.php so that it is ignored
+ * by PHPUnit. This test is designed to fail. See ../expectrisky.phpt.
+ */
+final class NoAssertionsTestRisky extends TestCase
+{
+    use ExpectDeprecationTrait;
+
+    /**
+     * Do not remove this test in the next major version.
+     *
+     * @group legacy
+     */
+    public function testOne()
+    {
+        $this->expectNotToPerformAssertions();
+        $this->expectDeprecation('foo');
+        @trigger_error('foo', \E_USER_DEPRECATED);
+    }
+
+    /**
+     * Do not remove this test in the next major version.
+     */
+    public function testTwo()
+    {
+        $this->expectNotToPerformAssertions();
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt b/src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt
new file mode 100644
index 0000000000000..9efbb98e072a5
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/expectrisky.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test NoAssertionsTestRisky risky test
+--FILE--
+<?php
+$test =  realpath(__DIR__.'/FailTests/NoAssertionsTestRisky.php');
+passthru('php '.getenv('SYMFONY_SIMPLE_PHPUNIT_BIN_DIR').'/simple-phpunit.php --fail-on-risky --colors=never '.$test);
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+%ATesting Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky
+R.                                                                  2 / 2 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 risky test:
+
+1) Symfony\Bridge\PhpUnit\Tests\FailTests\NoAssertionsTestRisky::testOne
+This test is annotated with "@doesNotPerformAssertions", but performed 1 assertions
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 2, Assertions: 1, Risky: 1.

From 165434cd15e055e0280ba92074221ce6d4e2b0da Mon Sep 17 00:00:00 2001
From: Markkus Millend <markkusmillend@icloud.com>
Date: Thu, 6 May 2021 18:32:57 +0300
Subject: [PATCH 52/67] Include .asice extension in mime types update script

---
 src/Symfony/Component/Mime/MimeTypes.php      | 22 +++++++++++--
 .../Mime/Resources/bin/update_mime_types.php  | 33 ++++++++++---------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
index acd3dc3ead8a9..a6018e4f4e7df 100644
--- a/src/Symfony/Component/Mime/MimeTypes.php
+++ b/src/Symfony/Component/Mime/MimeTypes.php
@@ -342,7 +342,9 @@ public function guessMimeType(string $path): ?string
         'application/toml' => ['toml'],
         'application/trig' => ['trig'],
         'application/ttml+xml' => ['ttml'],
+        'application/ubjson' => ['ubj'],
         'application/urc-ressheet+xml' => ['rsheet'],
+        'application/urc-targetdesc+xml' => ['td'],
         'application/vnd.1000minds.decision-model+xml' => ['1km'],
         'application/vnd.3gpp.pic-bw-large' => ['plb'],
         'application/vnd.3gpp.pic-bw-small' => ['psb'],
@@ -414,6 +416,7 @@ public function guessMimeType(string $path): ?string
         'application/vnd.curl.pcurl' => ['pcurl'],
         'application/vnd.dart' => ['dart'],
         'application/vnd.data-vision.rdz' => ['rdz'],
+        'application/vnd.dbf' => ['dbf'],
         'application/vnd.debian.binary-package' => ['deb', 'udeb'],
         'application/vnd.dece.data' => ['uvf', 'uvvf', 'uvd', 'uvvd'],
         'application/vnd.dece.ttml+xml' => ['uvt', 'uvvt'],
@@ -437,6 +440,7 @@ public function guessMimeType(string $path): ?string
         'application/vnd.epson.salt' => ['slt'],
         'application/vnd.epson.ssf' => ['ssf'],
         'application/vnd.eszigno3+xml' => ['es3', 'et3'],
+        'application/vnd.etsi.asic-e+zip' => ['asice'],
         'application/vnd.ezpix-album' => ['ez2'],
         'application/vnd.ezpix-package' => ['ez3'],
         'application/vnd.fdf' => ['fdf'],
@@ -804,6 +808,7 @@ public function guessMimeType(string $path): ?string
         'application/x-blorb' => ['blb', 'blorb'],
         'application/x-bps-patch' => ['bps'],
         'application/x-bsdiff' => ['bsdiff'],
+        'application/x-bz2' => ['bz2'],
         'application/x-bzdvi' => ['dvi.bz2'],
         'application/x-bzip' => ['bz', 'bz2'],
         'application/x-bzip-compressed-tar' => ['tar.bz2', 'tar.bz', 'tbz2', 'tbz', 'tb2'],
@@ -875,6 +880,7 @@ public function guessMimeType(string $path): ?string
         'application/x-font-pcf' => ['pcf', 'pcf.Z', 'pcf.gz'],
         'application/x-font-snf' => ['snf'],
         'application/x-font-speedo' => ['spd'],
+        'application/x-font-truetype' => ['ttf'],
         'application/x-font-ttf' => ['ttf'],
         'application/x-font-ttx' => ['ttx'],
         'application/x-font-type1' => ['pfa', 'pfb', 'pfm', 'afm', 'gsf'],
@@ -1193,7 +1199,7 @@ public function guessMimeType(string $path): ?string
         'application/xop+xml' => ['xop'],
         'application/xproc+xml' => ['xpl'],
         'application/xps' => ['xps'],
-        'application/xslt+xml' => ['xslt', 'xsl'],
+        'application/xslt+xml' => ['xsl', 'xslt'],
         'application/xspf+xml' => ['xspf'],
         'application/xv+xml' => ['mxml', 'xhvml', 'xvml', 'xvm'],
         'application/yang' => ['yang'],
@@ -1287,6 +1293,7 @@ public function guessMimeType(string $path): ?string
         'audio/x-ms-asx' => ['asx', 'wax', 'wvx', 'wmx'],
         'audio/x-ms-wax' => ['wax'],
         'audio/x-ms-wma' => ['wma'],
+        'audio/x-ms-wmv' => ['wmv'],
         'audio/x-musepack' => ['mpc', 'mpp', 'mp+'],
         'audio/x-ogg' => ['oga', 'ogg', 'opus'],
         'audio/x-oggflac' => ['oga', 'ogg'],
@@ -1408,6 +1415,7 @@ public function guessMimeType(string $path): ?string
         'image/vnd.ms-modi' => ['mdi'],
         'image/vnd.ms-photo' => ['wdp'],
         'image/vnd.net-fpx' => ['npx'],
+        'image/vnd.pco.b16' => ['b16'],
         'image/vnd.rn-realpix' => ['rp'],
         'image/vnd.tencent.tap' => ['tap'],
         'image/vnd.valve.source.texture' => ['vtf'],
@@ -1519,6 +1527,7 @@ public function guessMimeType(string $path): ?string
         'model/vnd.opengex' => ['ogex'],
         'model/vnd.parasolid.transmit.binary' => ['x_b'],
         'model/vnd.parasolid.transmit.text' => ['x_t'],
+        'model/vnd.sap.vds' => ['vds'],
         'model/vnd.usdz+zip' => ['usdz'],
         'model/vnd.valve.source.compiled-map' => ['bsp'],
         'model/vnd.vtu' => ['vtu'],
@@ -1560,6 +1569,7 @@ public function guessMimeType(string $path): ?string
         'text/sgml' => ['sgml', 'sgm'],
         'text/shex' => ['shex'],
         'text/slim' => ['slim', 'slm'],
+        'text/spdx' => ['spdx'],
         'text/spreadsheet' => ['sylk', 'slk'],
         'text/stylus' => ['stylus', 'styl'],
         'text/tab-separated-values' => ['tsv'],
@@ -1721,6 +1731,7 @@ public function guessMimeType(string $path): ?string
         'video/h261' => ['h261'],
         'video/h263' => ['h263'],
         'video/h264' => ['h264'],
+        'video/iso.segment' => ['m4s'],
         'video/jpeg' => ['jpgv'],
         'video/jpm' => ['jpm', 'jpgm'],
         'video/mj2' => ['mj2', 'mjp2'],
@@ -1875,6 +1886,7 @@ public function guessMimeType(string $path): ?string
         'asc' => ['application/pgp', 'application/pgp-encrypted', 'application/pgp-keys', 'application/pgp-signature', 'text/plain'],
         'asd' => ['text/x-common-lisp'],
         'asf' => ['application/vnd.ms-asf', 'video/x-ms-asf', 'video/x-ms-asf-plugin', 'video/x-ms-wm'],
+        'asice' => ['application/vnd.etsi.asic-e+zip'],
         'asm' => ['text/x-asm'],
         'aso' => ['application/vnd.accpac.simply.aso'],
         'asp' => ['application/x-asp'],
@@ -1903,6 +1915,7 @@ public function guessMimeType(string $path): ?string
         'azv' => ['image/vnd.airzip.accelerator.azv'],
         'azw' => ['application/vnd.amazon.ebook'],
         'azw3' => ['application/vnd.amazon.mobi8-ebook', 'application/x-mobi8-ebook'],
+        'b16' => ['image/vnd.pco.b16'],
         'bak' => ['application/x-trash'],
         'bat' => ['application/x-msdownload'],
         'bcpio' => ['application/x-bcpio'],
@@ -2045,7 +2058,7 @@ public function guessMimeType(string $path): ?string
         'dart' => ['application/vnd.dart', 'text/x-dart'],
         'dataless' => ['application/vnd.fdsn.seed'],
         'davmount' => ['application/davmount+xml'],
-        'dbf' => ['application/dbase', 'application/dbf', 'application/x-dbase', 'application/x-dbf'],
+        'dbf' => ['application/dbase', 'application/dbf', 'application/vnd.dbf', 'application/x-dbase', 'application/x-dbf'],
         'dbk' => ['application/docbook+xml', 'application/vnd.oasis.docbook+xml', 'application/x-docbook+xml'],
         'dc' => ['application/x-dc-rom'],
         'dcl' => ['text/x-dcl'],
@@ -2528,6 +2541,7 @@ public function guessMimeType(string $path): ?string
         'm4b' => ['audio/x-m4b'],
         'm4p' => ['application/mp4'],
         'm4r' => ['audio/x-m4r'],
+        'm4s' => ['video/iso.segment'],
         'm4u' => ['video/vnd.mpegurl', 'video/x-mpegurl'],
         'm4v' => ['video/mp4', 'video/mp4v-es', 'video/x-m4v'],
         'm7' => ['application/x-thomson-cartridge-memo7'],
@@ -3073,6 +3087,7 @@ public function guessMimeType(string $path): ?string
         'socket' => ['text/x-systemd-unit'],
         'spc' => ['application/x-pkcs7-certificates'],
         'spd' => ['application/x-font-speedo'],
+        'spdx' => ['text/spdx'],
         'spec' => ['text/x-rpm-spec'],
         'spf' => ['application/vnd.yamaha.smaf-phrase'],
         'spl' => ['application/futuresplash', 'application/vnd.adobe.flash.movie', 'application/x-futuresplash', 'application/x-shockwave-flash'],
@@ -3162,6 +3177,7 @@ public function guessMimeType(string $path): ?string
         'tbz2' => ['application/x-bzip-compressed-tar'],
         'tcap' => ['application/vnd.3gpp2.tcap'],
         'tcl' => ['application/x-tcl', 'text/tcl', 'text/x-tcl'],
+        'td' => ['application/urc-targetdesc+xml'],
         'teacher' => ['application/vnd.smart.teacher'],
         'tei' => ['application/tei+xml'],
         'teicorpus' => ['application/tei+xml'],
@@ -3219,6 +3235,7 @@ public function guessMimeType(string $path): ?string
         'u8hdr' => ['message/global-headers'],
         'u8mdn' => ['message/global-disposition-notification'],
         'u8msg' => ['message/global'],
+        'ubj' => ['application/ubjson'],
         'udeb' => ['application/vnd.debian.binary-package', 'application/x-deb', 'application/x-debian-package'],
         'ufd' => ['application/vnd.ufdl'],
         'ufdl' => ['application/vnd.ufdl'],
@@ -3287,6 +3304,7 @@ public function guessMimeType(string $path): ?string
         'vcx' => ['application/vnd.vcx'],
         'vda' => ['application/tga', 'application/x-targa', 'application/x-tga', 'image/targa', 'image/tga', 'image/x-icb', 'image/x-targa', 'image/x-tga'],
         'vdi' => ['application/x-vdi-disk', 'application/x-virtualbox-vdi'],
+        'vds' => ['model/vnd.sap.vds'],
         'vhd' => ['application/x-vhd-disk', 'application/x-virtualbox-vhd', 'text/x-vhdl'],
         'vhdl' => ['text/x-vhdl'],
         'vhdx' => ['application/x-vhdx-disk', 'application/x-virtualbox-vhdx'],
diff --git a/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php b/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
index d8a73ce5a6ef6..61a28fbf847e9 100644
--- a/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
+++ b/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
@@ -10,7 +10,7 @@
  */
 
 // load new map
-$data = json_decode(file_get_contents('https://cdn.jsdelivr.net/gh/jshttp/mime-db@v1.44.0/db.json'), true);
+$data = json_decode(file_get_contents('https://cdn.jsdelivr.net/gh/jshttp/mime-db@v1.47.0/db.json'), true);
 $new = [];
 foreach ($data as $mimeType => $mimeTypeInformation) {
     if (!array_key_exists('extensions', $mimeTypeInformation)) {
@@ -60,28 +60,15 @@
     $current[$matches[1]] = explode("', '", $matches[2]);
 }
 
-// we merge the 2 maps (we never remove old mime types)
-$map = array_replace_recursive($current, $new);
-ksort($map);
-
-// force an extension to be in the first position on the map
-$forceExtensionInFirstPositionByMimeType = [
-    'application/vnd.apple.keynote' => 'key',
-    'audio/mpeg' => 'mp3',
-    'text/markdown' => 'md',
-    'text/x-markdown' => 'md',
-];
-foreach ($forceExtensionInFirstPositionByMimeType as $mimeType => $extensionToRemove) {
-    $map[$mimeType] = array_unique(array_merge([$extensionToRemove], $map[$mimeType]));
-}
-
 $data = $pre;
 
 // reverse map
 // we prefill the extensions with some preferences for content-types
 $exts = [
+    'asice' => ['application/vnd.etsi.asic-e+zip'],
     'bz2' => ['application/x-bz2'],
     'csv' => ['text/csv'],
+    'ecma' => ['application/ecmascript'],
     'flv' => ['video/x-flv'],
     'gif' => ['image/gif'],
     'gz' => ['application/x-gzip'],
@@ -90,9 +77,11 @@
     'jar' => ['application/x-java-archive'],
     'jpg' => ['image/jpeg'],
     'js' => ['text/javascript'],
+    'keynote' => ['application/vnd.apple.keynote'],
     'key' => ['application/vnd.apple.keynote'],
     'm3u' => ['audio/x-mpegurl'],
     'm4a' => ['audio/mp4'],
+    'md' => ['text/markdown', 'text/x-markdown'],
     'mdb' => ['application/x-msaccess'],
     'mid' => ['audio/midi'],
     'mov' => ['video/quicktime'],
@@ -116,6 +105,18 @@
     'zip' => ['application/zip'],
 ];
 
+// we merge the 2 maps (we never remove old mime types)
+$map = array_replace_recursive($current, $new);
+
+foreach ($exts as $ext => $types) {
+    foreach ($types as $mt) {
+        if (!isset($map[$mt])) {
+            $map += [$mt => [$ext]];
+        }
+    }
+}
+ksort($map);
+
 foreach ($map as $mimeType => $extensions) {
     foreach ($exts as $ext => $types) {
         if (in_array($mimeType, $types, true)) {

From bbadfb34cc50f60cace6d4390613ed8d01fc1c13 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <soullivaneuh@gmail.com>
Date: Mon, 19 Apr 2021 18:20:38 +0200
Subject: [PATCH 53/67] [PropertyInfo] fix attribute namespace with recursive
 traits

---
 .../Extractor/PhpDocExtractor.php             | 28 ++++------
 .../Tests/Extractor/PhpDocExtractorTest.php   |  6 ++
 .../Tests/Fixtures/DummyTraitExternal.php     | 56 +++++++++++++++++++
 .../Tests/Fixtures/TraitUsage/DummyTrait.php  |  3 +
 4 files changed, 77 insertions(+), 16 deletions(-)
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyTraitExternal.php

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index d85132692af87..2f36a017c5c0a 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -220,17 +220,15 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB
             return null;
         }
 
-        try {
-            $reflector = $reflectionProperty->getDeclaringClass();
-
-            foreach ($reflector->getTraits() as $trait) {
-                if ($trait->hasProperty($property)) {
-                    $reflector = $trait;
+        $reflector = $reflectionProperty->getDeclaringClass();
 
-                    break;
-                }
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return $this->getDocBlockFromProperty($trait->getName(), $property);
             }
+        }
 
+        try {
             return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflector));
         } catch (\InvalidArgumentException $e) {
             return null;
@@ -268,17 +266,15 @@ private function getDocBlockFromMethod(string $class, string $ucFirstProperty, i
             return null;
         }
 
-        try {
-            $reflector = $reflectionMethod->getDeclaringClass();
-
-            foreach ($reflector->getTraits() as $trait) {
-                if ($trait->hasMethod($methodName)) {
-                    $reflector = $trait;
+        $reflector = $reflectionMethod->getDeclaringClass();
 
-                    break;
-                }
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasMethod($methodName)) {
+                return $this->getDocBlockFromMethod($trait->getName(), $ucFirstProperty, $type);
             }
+        }
 
+        try {
             return [$this->docBlockFactory->create($reflectionMethod, $this->createFromReflector($reflector)), $prefix];
         } catch (\InvalidArgumentException $e) {
             return null;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
index 9adfa6783a2c4..4a141642d0009 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -292,6 +292,9 @@ public function propertiesDefinedByTraitsProvider(): array
             ['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)],
+            ['propertyInExternalTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
+            ['propertyInExternalTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+            ['propertyInExternalTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
         ];
     }
 
@@ -309,6 +312,9 @@ public function methodsDefinedByTraitsProvider(): array
             ['methodInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
             ['methodInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
             ['methodInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+            ['methodInExternalTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
+            ['methodInExternalTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+            ['methodInExternalTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyTraitExternal.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyTraitExternal.php
new file mode 100644
index 0000000000000..cdd2c720cdad6
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyTraitExternal.php
@@ -0,0 +1,56 @@
+<?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;
+
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
+
+trait DummyTraitExternal
+{
+    /**
+     * @var string
+     */
+    private $propertyInExternalTraitPrimitiveType;
+
+    /**
+     * @var Dummy
+     */
+    private $propertyInExternalTraitObjectSameNamespace;
+
+    /**
+     * @var DummyUsedInTrait
+     */
+    private $propertyInExternalTraitObjectDifferentNamespace;
+
+    /**
+     * @return string
+     */
+    public function getMethodInExternalTraitPrimitiveType()
+    {
+        return 'value';
+    }
+
+    /**
+     * @return Dummy
+     */
+    public function getMethodInExternalTraitObjectSameNamespace()
+    {
+        return new Dummy();
+    }
+
+    /**
+     * @return DummyUsedInTrait
+     */
+    public function getMethodInExternalTraitObjectDifferentNamespace()
+    {
+        return new DummyUsedInTrait();
+    }
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
index 0599d979c2951..ed0f1e5ae5f98 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyTrait.php
@@ -12,9 +12,12 @@
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage;
 
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\DummyTraitExternal;
 
 trait DummyTrait
 {
+    use DummyTraitExternal;
+
     /**
      * @var string
      */

From d5fce4c77903aa843fb3dac6956853555a979319 Mon Sep 17 00:00:00 2001
From: Maxim Dovydenok <dovydenok.maxim@gmail.com>
Date: Sat, 3 Apr 2021 16:47:18 +0300
Subject: [PATCH 54/67] [PropertyInfo] Make ReflectionExtractor correctly
 extract nullability

---
 .../Extractor/ReflectionExtractor.php         | 48 ++++++++++++-------
 .../Extractor/ReflectionExtractorTest.php     |  1 +
 .../Tests/Fixtures/Php74Dummy.php             |  1 +
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index c0f59cea9acf3..ebe9d070322e0 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -154,20 +154,8 @@ public function getTypes($class, $property, array $context = []): ?array
             return $fromConstructor;
         }
 
-        if ($fromDefaultValue = $this->extractFromDefaultValue($class, $property)) {
-            return $fromDefaultValue;
-        }
-
-        if (\PHP_VERSION_ID >= 70400) {
-            try {
-                $reflectionProperty = new \ReflectionProperty($class, $property);
-                $type = $reflectionProperty->getType();
-                if (null !== $type && $types = $this->extractFromReflectionType($type, $reflectionProperty->getDeclaringClass())) {
-                    return $types;
-                }
-            } catch (\ReflectionException $e) {
-                // noop
-            }
+        if ($fromPropertyDeclaration = $this->extractFromPropertyDeclaration($class, $property)) {
+            return $fromPropertyDeclaration;
         }
 
         return null;
@@ -312,10 +300,19 @@ private function extractFromConstructor(string $class, string $property): ?array
         return null;
     }
 
-    private function extractFromDefaultValue(string $class, string $property): ?array
+    private function extractFromPropertyDeclaration(string $class, string $property): ?array
     {
         try {
             $reflectionClass = new \ReflectionClass($class);
+
+            if (\PHP_VERSION_ID >= 70400) {
+                $reflectionProperty = $reflectionClass->getProperty($property);
+                $reflectionPropertyType = $reflectionProperty->getType();
+
+                if (null !== $reflectionPropertyType && $types = $this->extractFromReflectionType($reflectionPropertyType, $reflectionProperty->getDeclaringClass())) {
+                    return $types;
+                }
+            }
         } catch (\ReflectionException $e) {
             return null;
         }
@@ -328,7 +325,7 @@ private function extractFromDefaultValue(string $class, string $property): ?arra
 
         $type = \gettype($defaultValue);
 
-        return [new Type(static::MAP_TYPES[$type] ?? $type)];
+        return [new Type(static::MAP_TYPES[$type] ?? $type, $this->isNullableProperty($class, $property))];
     }
 
     private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionClass $declaringClass): array
@@ -368,6 +365,25 @@ private function resolveTypeName(string $name, \ReflectionClass $declaringClass)
         return $name;
     }
 
+    private function isNullableProperty(string $class, string $property): bool
+    {
+        try {
+            $reflectionProperty = new \ReflectionProperty($class, $property);
+
+            if (\PHP_VERSION_ID >= 70400) {
+                $reflectionPropertyType = $reflectionProperty->getType();
+
+                return null !== $reflectionPropertyType && $reflectionPropertyType->allowsNull();
+            }
+
+            return false;
+        } catch (\ReflectionException $e) {
+            // Return false if the property doesn't exist
+        }
+
+        return false;
+    }
+
     private function isAllowedProperty(string $class, string $property): bool
     {
         try {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 18f8d4d018f02..60b4efdbcf815 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -414,5 +414,6 @@ public function testTypedProperties()
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))], $this->extractor->getTypes(Php74Dummy::class, 'stringCollection'));
+        $this->assertEquals([new Type(Type::BUILTIN_TYPE_INT, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableWithDefault'));
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
index ffc4f4cd37621..405043252a7de 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php74Dummy.php
@@ -20,6 +20,7 @@ class Php74Dummy
     private ?bool $nullableBoolProp;
     /** @var string[] */
     private array $stringCollection;
+    private ?int $nullableWithDefault = 1;
 
     public function addStringCollection(string $string): void
     {

From dc50aa3b55b5504f55a8faf8ccd115561cb14315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 23 Apr 2021 00:49:37 +0200
Subject: [PATCH 55/67] [Config][DependencyInjection] Uniformize trailing slash
 handling

---
 .../Component/Config/Loader/FileLoader.php    |  4 +--
 .../Fixtures/ExcludeTrailingSlash/bar.txt     |  0
 .../ExcludeTrailingSlash/exclude/baz.txt      |  0
 .../Fixtures/ExcludeTrailingSlash/foo.txt     |  0
 .../Config/Tests/Loader/FileLoaderTest.php    | 22 ++++++++++++++
 .../Tests/Resource/GlobResourceTest.php       |  1 +
 .../DependencyInjection/Loader/FileLoader.php |  4 +--
 .../Tests/Loader/FileLoaderTest.php           | 29 +++++++++++++++++++
 8 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/bar.txt
 create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/exclude/baz.txt
 create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/foo.txt

diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index b7c2491b5b023..5ead5961f6ab3 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -82,8 +82,8 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             $excluded = [];
             foreach ((array) $exclude as $pattern) {
                 foreach ($this->glob($pattern, true, $_, false, true) as $path => $info) {
-                    // normalize Windows slashes
-                    $excluded[str_replace('\\', '/', $path)] = true;
+                    // normalize Windows slashes and remove trailing slashes
+                    $excluded[rtrim(str_replace('\\', '/', $path), '/')] = true;
                 }
             }
 
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/bar.txt b/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/bar.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/exclude/baz.txt b/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/exclude/baz.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/foo.txt b/src/Symfony/Component/Config/Tests/Fixtures/ExcludeTrailingSlash/foo.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
index 5fc8ce0a829d0..023bbe0f31ea6 100644
--- a/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
@@ -127,6 +127,28 @@ public function testImportWithExclude()
         $this->assertCount(2, $loadedFiles);
         $this->assertNotContains('ExcludeFile.txt', $loadedFiles);
     }
+
+    /**
+     * @dataProvider excludeTrailingSlashConsistencyProvider
+     */
+    public function testExcludeTrailingSlashConsistency(string $exclude)
+    {
+        $loader = new TestFileLoader(new FileLocator(__DIR__.'/../Fixtures'));
+        $loadedFiles = $loader->import('ExcludeTrailingSlash/*', null, false, null, $exclude);
+        $this->assertCount(2, $loadedFiles);
+        $this->assertNotContains('baz.txt', $loadedFiles);
+    }
+
+    public function excludeTrailingSlashConsistencyProvider(): iterable
+    {
+        yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/'];
+        yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo'];
+        yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/*'];
+        yield [__DIR__.'/../Fixtures/*/ExcludeToo'];
+        yield [__DIR__.'/../Fixtures/*/ExcludeToo/'];
+        yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/*'];
+        yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/AnotheExcludedFile.txt'];
+    }
 }
 
 class TestFileLoader extends FileLoader
diff --git a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
index 7958332cb0d3b..fd317eb55c067 100644
--- a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
@@ -177,6 +177,7 @@ public function testBraceFallback()
 
         $expected = [
             $dir.'/Exclude/ExcludeToo/AnotheExcludedFile.txt',
+            $dir.'/ExcludeTrailingSlash/exclude/baz.txt',
             $dir.'/foo.xml',
         ];
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index 4b8a5f48c795d..e01db7eea6cea 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -166,8 +166,8 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
                     $excludePrefix = $resource->getPrefix();
                 }
 
-                // normalize Windows slashes
-                $excludePaths[str_replace('\\', '/', $path)] = true;
+                // normalize Windows slashes and remove trailing slashes
+                $excludePaths[rtrim(str_replace('\\', '/', $path), '/')] = true;
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 8362402ce954d..794753da2158e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -239,6 +239,35 @@ public function testRegisterClassesWithIncompatibleExclude()
             'yaml/*'
         );
     }
+
+    /**
+     * @dataProvider excludeTrailingSlashConsistencyProvider
+     */
+    public function testExcludeTrailingSlashConsistency(string $exclude)
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+        $loader->registerClasses(
+            new Definition(),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+            'Prototype/*',
+            $exclude
+        );
+
+        $this->assertTrue($container->has(Foo::class));
+        $this->assertFalse($container->has(DeeperBaz::class));
+    }
+
+    public function excludeTrailingSlashConsistencyProvider(): iterable
+    {
+        yield ['Prototype/OtherDir/AnotherSub/'];
+        yield ['Prototype/OtherDir/AnotherSub'];
+        yield ['Prototype/OtherDir/AnotherSub/*'];
+        yield ['Prototype/*/AnotherSub'];
+        yield ['Prototype/*/AnotherSub/'];
+        yield ['Prototype/*/AnotherSub/*'];
+        yield ['Prototype/OtherDir/AnotherSub/DeeperBaz.php'];
+    }
 }
 
 class TestFileLoader extends FileLoader

From c5a4f7d8f90256ae9ad06bb0b6321ab3e782a9ea Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 7 May 2021 13:59:03 +0200
Subject: [PATCH 56/67] Remove code that deals with legacy behavior of
 PHP_Incomplete_Class

---
 .../Component/ErrorHandler/Exception/FlattenException.php       | 1 -
 src/Symfony/Component/VarDumper/Cloner/VarCloner.php            | 1 -
 src/Symfony/Component/VarExporter/Internal/Exporter.php         | 2 +-
 src/Symfony/Component/VarExporter/VarExporter.php               | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
index 817c48d823357..4ba3d9440328d 100644
--- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
+++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -359,7 +359,6 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0): arra
                 return ['array', '*SKIPPED over 10000 entries*'];
             }
             if ($value instanceof \__PHP_Incomplete_Class) {
-                // is_object() returns false on PHP<=7.1
                 $result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
             } elseif (\is_object($value)) {
                 $result[$key] = ['object', \get_class($value)];
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
index c1e67bb2bfebc..90d5ac9bcb8da 100644
--- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -166,7 +166,6 @@ protected function doClone($var)
                         break;
 
                     case \is_object($v):
-                    case $v instanceof \__PHP_Incomplete_Class:
                         if (empty($objRefs[$h = spl_object_id($v)])) {
                             $stub = new Stub();
                             $stub->type = Stub::TYPE_OBJECT;
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
index a65cea82ccb60..12a0de44e1914 100644
--- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
+++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -60,7 +60,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
                 }
                 goto handle_value;
-            } elseif (!\is_object($value) && !$value instanceof \__PHP_Incomplete_Class || $value instanceof \UnitEnum) {
+            } elseif (!\is_object($value) || $value instanceof \UnitEnum) {
                 goto handle_value;
             }
 
diff --git a/src/Symfony/Component/VarExporter/VarExporter.php b/src/Symfony/Component/VarExporter/VarExporter.php
index 6df7a02c6eb1d..8bf6f7be7c83f 100644
--- a/src/Symfony/Component/VarExporter/VarExporter.php
+++ b/src/Symfony/Component/VarExporter/VarExporter.php
@@ -44,7 +44,7 @@ public static function export($value, bool &$isStaticValue = null, array &$found
     {
         $isStaticValue = true;
 
-        if (!\is_object($value) && !(\is_array($value) && $value) && !$value instanceof \__PHP_Incomplete_Class && !\is_resource($value) || $value instanceof \UnitEnum) {
+        if (!\is_object($value) && !(\is_array($value) && $value) && !\is_resource($value) || $value instanceof \UnitEnum) {
             return Exporter::export($value);
         }
 

From c2873aaf0eb0ce698758a32986fc24edcbdd6db0 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Sat, 10 Apr 2021 15:32:48 +0200
Subject: [PATCH 57/67] [Form] Add TranslatableMessage support to choice_label
 option of ChoiceType

---
 .../Factory/DefaultChoiceListFactory.php      | 10 +++++++++-
 .../Form/ChoiceList/View/ChoiceView.php       | 10 ++++++----
 .../Factory/DefaultChoiceListFactoryTest.php  | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index 83a12339de26e..b45c6f9feefd8 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Translation\TranslatableMessage;
 
 /**
  * Default implementation of {@link ChoiceListFactoryInterface}.
@@ -177,7 +178,14 @@ private static function addChoiceView($choice, string $value, $label, array $key
             // If "choice_label" is set to false and "expanded" is true, the value false
             // should be passed on to the "label" option of the checkboxes/radio buttons
             $dynamicLabel = $label($choice, $key, $value);
-            $label = false === $dynamicLabel ? false : (string) $dynamicLabel;
+
+            if (false === $dynamicLabel) {
+                $label = false;
+            } elseif ($dynamicLabel instanceof TranslatableMessage) {
+                $label = $dynamicLabel;
+            } else {
+                $label = (string) $dynamicLabel;
+            }
         }
 
         $view = new ChoiceView(
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
index 2b5636b17eb1d..5a36824ea72f9 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Form\ChoiceList\View;
 
+use Symfony\Component\Translation\TranslatableMessage;
+
 /**
  * Represents a choice in templates.
  *
@@ -30,10 +32,10 @@ class ChoiceView
     /**
      * Creates a new choice view.
      *
-     * @param mixed        $data  The original choice
-     * @param string       $value The view representation of the choice
-     * @param string|false $label The label displayed to humans; pass false to discard the label
-     * @param array        $attr  Additional attributes for the HTML tag
+     * @param mixed                            $data  The original choice
+     * @param string                           $value The view representation of the choice
+     * @param string|TranslatableMessage|false $label The label displayed to humans; pass false to discard the label
+     * @param array                            $attr  Additional attributes for the HTML tag
      */
     public function __construct($data, string $value, $label, array $attr = [])
     {
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
index ae968393edbbe..e7a021a25efea 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class DefaultChoiceListFactoryTest extends TestCase
 {
@@ -754,6 +755,24 @@ function ($object, $key, $value) {
         $this->assertFlatViewWithAttr($view);
     }
 
+    /**
+     * @requires function Symfony\Component\Translation\TranslatableMessage::__construct
+     */
+    public function testPassTranslatableMessageAsLabelDoesntCastItToString()
+    {
+        $view = $this->factory->createView(
+            $this->list,
+            [$this->obj1],
+            static function ($choice, $key, $value) {
+                return new TranslatableMessage('my_message', ['param1' => 'value1']);
+            }
+        );
+
+        $this->assertInstanceOf(TranslatableMessage::class, $view->choices[0]->label);
+        $this->assertEquals('my_message', $view->choices[0]->label->getMessage());
+        $this->assertArrayHasKey('param1', $view->choices[0]->label->getParameters());
+    }
+
     private function assertScalarListWithChoiceValues(ChoiceListInterface $list)
     {
         $this->assertSame(['a', 'b', 'c', 'd'], $list->getValues());

From 89474823428854ba6e9e4b0df406a62b6d10f5b9 Mon Sep 17 00:00:00 2001
From: Evgenij Efimov <edefimov.it@gmail.com>
Date: Thu, 22 Apr 2021 10:54:23 +0300
Subject: [PATCH 58/67] [SecurityBundle] Allow ips parameter in access_control
 accept comma-separated string

---
 .../DependencyInjection/SecurityExtension.php | 21 ++++++++++-
 .../SecurityExtensionTest.php                 | 37 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 0b1be065df09a..b59ac7b66d098 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -872,7 +872,7 @@ private function createRequestMatcher(ContainerBuilder $container, string $path
             foreach ($ips as $ip) {
                 $container->resolveEnvPlaceholders($ip, null, $usedEnvs);
 
-                if (!$usedEnvs && !$this->isValidIp($ip)) {
+                if (!$usedEnvs && !$this->isValidIps($ip)) {
                     throw new \LogicException(sprintf('The given value "%s" in the "security.access_control" config option is not a valid IP address.', $ip));
                 }
 
@@ -930,6 +930,25 @@ public function getConfiguration(array $config, ContainerBuilder $container)
         return new MainConfiguration($this->factories, $this->userProviderFactories);
     }
 
+    private function isValidIps($ips): bool
+    {
+        $ipsList = array_reduce((array) $ips, static function (array $ips, string $ip) {
+            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
+        }, []);
+
+        if (!$ipsList) {
+            return false;
+        }
+
+        foreach ($ipsList as $cidr) {
+            if (!$this->isValidIp($cidr)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     private function isValidIp(string $cidr): bool
     {
         $cidrParts = explode('/', $cidr);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index 79f5d60f09080..b64220ececbbd 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -388,6 +388,33 @@ public function testRememberMeCookieInheritFrameworkSessionCookie($config, $same
         $this->assertEquals($secure, $definition->getArgument(3)['secure']);
     }
 
+    /**
+     * @dataProvider acceptableIpsProvider
+     */
+    public function testAcceptableAccessControlIps($ips)
+    {
+        $container = $this->getRawContainer();
+
+        $container->loadFromExtension('security', [
+            'providers' => [
+                'default' => ['id' => 'foo'],
+            ],
+            'firewalls' => [
+                'some_firewall' => [
+                    'pattern' => '/.*',
+                    'http_basic' => [],
+                ],
+            ],
+            'access_control' => [
+                ['ips' => $ips, 'path' => '/somewhere', 'roles' => 'IS_AUTHENTICATED_FULLY'],
+            ],
+        ]);
+
+        $container->compile();
+
+        $this->assertTrue(true, 'Ip addresses is successfully consumed: '.(\is_string($ips) ? $ips : json_encode($ips)));
+    }
+
     public function sessionConfigurationProvider()
     {
         return [
@@ -408,6 +435,16 @@ public function sessionConfigurationProvider()
         ];
     }
 
+    public function acceptableIpsProvider(): iterable
+    {
+        yield [['127.0.0.1']];
+        yield ['127.0.0.1'];
+        yield ['127.0.0.1, 127.0.0.2'];
+        yield ['127.0.0.1/8, 127.0.0.2/16'];
+        yield [['127.0.0.1/8, 127.0.0.2/16']];
+        yield [['127.0.0.1/8', '127.0.0.2/16']];
+    }
+
     public function testSwitchUserWithSeveralDefinedProvidersButNoFirewallRootProviderConfigured()
     {
         $container = $this->getRawContainer();

From be68682fd176124372f135578dfd1f68813ddd64 Mon Sep 17 00:00:00 2001
From: Marek Zajac <orkans@gmail.com>
Date: Wed, 5 May 2021 17:24:58 +0200
Subject: [PATCH 59/67] [Console] Fix Windows code page support

---
 .../Console/Helper/QuestionHelper.php         | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 72880f6a69cca..92a4c7d0fb525 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -110,11 +110,6 @@ private function doAsk(OutputInterface $output, Question $question)
         $inputStream = $this->inputStream ?: \STDIN;
         $autocomplete = $question->getAutocompleterCallback();
 
-        if (\function_exists('sapi_windows_cp_set')) {
-            // Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
-            @sapi_windows_cp_set(1252);
-        }
-
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
             $ret = false;
             if ($question->isHidden()) {
@@ -514,7 +509,10 @@ private function isInteractiveInput($inputStream): bool
     private function readInput($inputStream, Question $question)
     {
         if (!$question->isMultiline()) {
-            return fgets($inputStream, 4096);
+            $cp = $this->setIOCodepage();
+            $ret = fgets($inputStream, 4096);
+
+            return $this->resetIOCodepage($cp, $ret);
         }
 
         $multiLineStreamReader = $this->cloneInputStream($inputStream);
@@ -523,6 +521,7 @@ private function readInput($inputStream, Question $question)
         }
 
         $ret = '';
+        $cp = $this->setIOCodepage();
         while (false !== ($char = fgetc($multiLineStreamReader))) {
             if (\PHP_EOL === "{$ret}{$char}") {
                 break;
@@ -530,7 +529,37 @@ private function readInput($inputStream, Question $question)
             $ret .= $char;
         }
 
-        return $ret;
+        return $this->resetIOCodepage($cp, $ret);
+    }
+
+    /**
+     * Set console I/O to the host code page.
+     *
+     * @return int Previous code page in IBM/EBCDIC format
+     */
+    private function setIOCodepage(): int
+    {
+        if (\function_exists('sapi_windows_cp_set')) {
+            $cp = sapi_windows_cp_get();
+            sapi_windows_cp_set(sapi_windows_cp_get('oem'));
+
+            return $cp;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Set console I/O to the specified code page and convert the user input.
+     */
+    private function resetIOCodepage(int $cp, string $input): string
+    {
+        if (\function_exists('sapi_windows_cp_set') && 0 < $cp) {
+            sapi_windows_cp_set($cp);
+            $input = sapi_windows_cp_conv(sapi_windows_cp_get('oem'), $cp, $input);
+        }
+
+        return $input;
     }
 
     /**

From f1b9684ebd6d1fd2c96005a2ad4c5827c063f56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= <joachim@loevgaard.dk>
Date: Wed, 5 May 2021 21:20:49 +0200
Subject: [PATCH 60/67] [WebProfilerBundle] Add simple backoff strategy on 404

---
 .../Resources/views/Profiler/base_js.html.twig            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 5f623a406bfcb..03d0e42daac19 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -37,10 +37,12 @@
             };
         }
 
-        var request = function(url, onSuccess, onError, payload, options) {
+        var request = function(url, onSuccess, onError, payload, options, tries) {
             var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
             options = options || {};
             options.maxTries = options.maxTries || 0;
+            tries = tries || 1;
+            var delay = Math.pow(2, tries - 1) * 1000;
             xhr.open(options.method || 'GET', url, true);
             xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
             xhr.onreadystatechange = function(state) {
@@ -51,8 +53,8 @@
                 if (xhr.status == 404 && options.maxTries > 1) {
                     setTimeout(function(){
                         options.maxTries--;
-                        request(url, onSuccess, onError, payload, options);
-                    }, 1000);
+                        request(url, onSuccess, onError, payload, options, tries + 1);
+                    }, delay);
 
                     return null;
                 }

From 3bac7fef074aea1e4a2815f64e622c826e7fa34b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 7 May 2021 16:48:34 +0200
Subject: [PATCH 61/67] [Console] hotfix

---
 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 92a4c7d0fb525..a28fa4ee08920 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -512,7 +512,7 @@ private function readInput($inputStream, Question $question)
             $cp = $this->setIOCodepage();
             $ret = fgets($inputStream, 4096);
 
-            return $this->resetIOCodepage($cp, $ret);
+            return false !== $ret ? $this->resetIOCodepage($cp, $ret) : false;
         }
 
         $multiLineStreamReader = $this->cloneInputStream($inputStream);

From 463b2db51b9f471bbd1a0ec893314421f37e7b5b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 7 May 2021 20:11:34 +0200
Subject: [PATCH 62/67] [Runtime] dont display the shebang on the CLI

---
 .../Runtime/Internal/autoload_runtime.template       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Runtime/Internal/autoload_runtime.template b/src/Symfony/Component/Runtime/Internal/autoload_runtime.template
index e6acb1eed6a16..71ecd06d99b3d 100644
--- a/src/Symfony/Component/Runtime/Internal/autoload_runtime.template
+++ b/src/Symfony/Component/Runtime/Internal/autoload_runtime.template
@@ -6,8 +6,16 @@ if (true === (require_once __DIR__.'/autoload.php') || empty($_SERVER['SCRIPT_FI
     return;
 }
 
-if (!is_object($app = require $_SERVER['SCRIPT_FILENAME'])) {
-    throw new \TypeError(sprintf('Invalid return value: callable object expected, "%s" returned from "%s".', get_debug_type($app), $_SERVER['SCRIPT_FILENAME']));
+if (PHP_VERSION_ID < 80000 && in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
+    ob_start();
+    $app = require $_SERVER['SCRIPT_FILENAME'];
+    ob_end_clean();
+} else {
+    $app = require $_SERVER['SCRIPT_FILENAME'];
+}
+
+if (!is_object($app)) {
+    throw new TypeError(sprintf('Invalid return value: callable object expected, "%s" returned from "%s".', get_debug_type($app), $_SERVER['SCRIPT_FILENAME']));
 }
 
 $runtime = $_SERVER['APP_RUNTIME'] ?? %runtime_class%;

From 40041db7cbc34046b070042f4c5feb64acbb4915 Mon Sep 17 00:00:00 2001
From: Mathieu Santostefano <msantostefano@jolicode.com>
Date: Wed, 5 May 2021 19:27:23 +0200
Subject: [PATCH 63/67] Refactored LocoProviderTest

---
 .../Translation/Bridge/Loco/LocoProvider.php  | 168 +++---
 .../Bridge/Loco/Tests/LocoProviderTest.php    | 506 +++++++++---------
 2 files changed, 365 insertions(+), 309 deletions(-)

diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
index 1b3419b0aaae8..ea4232c4ee75a 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -59,19 +59,13 @@ public function write(TranslatorBagInterface $translatorBag): void
             $catalogue = $translatorBag->getCatalogues()[0];
         }
 
-        // Create keys on Loco
         foreach ($catalogue->all() as $domain => $messages) {
-            $ids = [];
-            foreach ($messages as $id => $message) {
-                $ids[] = $id;
-                $this->createAsset($id);
-            }
-            if ($ids) {
-                $this->tagsAssets($ids, $domain);
+            $createdIds = $this->createAssets(array_keys($messages));
+            if ($createdIds) {
+                $this->tagsAssets($createdIds, $domain);
             }
         }
 
-        // Push translations in all locales and tag them with domain
         foreach ($translatorBag->getCatalogues() as $catalogue) {
             $locale = $catalogue->getLocale();
 
@@ -79,10 +73,9 @@ public function write(TranslatorBagInterface $translatorBag): void
                 $this->createLocale($locale);
             }
 
-            foreach ($catalogue->all() as $messages) {
-                foreach ($messages as $id => $message) {
-                    $this->translateAsset($id, $message, $locale);
-                }
+            foreach ($catalogue->all() as $domain => $messages) {
+                $ids = $this->getAssetsIds($domain);
+                $this->translateAssets(array_combine($ids, array_values($messages)), $locale);
             }
         }
     }
@@ -91,24 +84,40 @@ public function read(array $domains, array $locales): TranslatorBag
     {
         $domains = $domains ?: ['*'];
         $translatorBag = new TranslatorBag();
+        $responses = [];
 
         foreach ($locales as $locale) {
             foreach ($domains as $domain) {
-                $response = $this->client->request('GET', sprintf('export/locale/%s.xlf?filter=%s&status=translated', $locale, $domain));
+                $responses[] = [
+                    'response' => $this->client->request('GET', sprintf('export/locale/%s.xlf', rawurlencode($locale)), [
+                        'query' => [
+                            'filter' => $domain,
+                            'status' => 'translated',
+                        ],
+                    ]),
+                    'locale' => $locale,
+                    'domain' => $domain,
+                ];
+            }
+        }
 
-                if (404 === $response->getStatusCode()) {
-                    $this->logger->error(sprintf('Locale "%s" for domain "%s" does not exist in Loco.', $locale, $domain));
-                    continue;
-                }
+        foreach ($responses as $response) {
+            $locale = $response['locale'];
+            $domain = $response['domain'];
+            $response = $response['response'];
 
-                $responseContent = $response->getContent(false);
+            if (404 === $response->getStatusCode()) {
+                $this->logger->warning(sprintf('Locale "%s" for domain "%s" does not exist in Loco.', $locale, $domain));
+                continue;
+            }
 
-                if (200 !== $response->getStatusCode()) {
-                    throw new ProviderException('Unable to read the Loco response: '.$responseContent, $response);
-                }
+            $responseContent = $response->getContent(false);
 
-                $translatorBag->addCatalogue($this->loader->load($responseContent, $locale, $domain));
+            if (200 !== $response->getStatusCode()) {
+                throw new ProviderException('Unable to read the Loco response: '.$responseContent, $response);
             }
+
+            $translatorBag->addCatalogue($this->loader->load($responseContent, $locale, $domain));
         }
 
         return $translatorBag;
@@ -116,67 +125,101 @@ public function read(array $domains, array $locales): TranslatorBag
 
     public function delete(TranslatorBagInterface $translatorBag): void
     {
-        $deletedIds = [];
+        $catalogue = $translatorBag->getCatalogue($this->defaultLocale);
 
-        foreach ($translatorBag->getCatalogues() as $catalogue) {
-            foreach ($catalogue->all() as $messages) {
-                foreach ($messages as $id => $message) {
-                    if (\in_array($id, $deletedIds, true)) {
-                        continue;
-                    }
-
-                    $this->deleteAsset($id);
-                    $deletedIds[] = $id;
-                }
+        if (!$catalogue) {
+            $catalogue = $translatorBag->getCatalogues()[0];
+        }
+
+        $responses = [];
+
+        foreach (array_keys($catalogue->all()) as $domain) {
+            foreach ($this->getAssetsIds($domain) as $id) {
+                $responses[$id] = $this->client->request('DELETE', sprintf('assets/%s.json', $id));
+            }
+        }
+
+        foreach ($responses as $key => $response) {
+            if (403 === $response->getStatusCode()) {
+                $this->logger->error('The API key used does not have sufficient permissions to delete assets.');
+            }
+
+            if (200 !== $response->getStatusCode() && 404 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to delete translation key "%s" to Loco: "%s".', $key, $response->getContent(false)));
             }
         }
     }
 
-    private function createAsset(string $id): void
+    /**
+     * Returns array of internal Loco's unique ids.
+     */
+    private function getAssetsIds(string $domain): array
     {
-        $response = $this->client->request('POST', 'assets', [
-            'body' => [
-                'name' => $id,
-                'id' => $id,
-                'type' => 'text',
-                'default' => 'untranslated',
-            ],
-        ]);
+        $response = $this->client->request('GET', 'assets', ['query' => ['filter' => $domain]]);
 
-        if (409 === $response->getStatusCode()) {
-            $this->logger->info(sprintf('Translation key "%s" already exists in Loco.', $id), [
-                'id' => $id,
+        if (200 !== $response->getStatusCode()) {
+            $this->logger->error(sprintf('Unable to get assets from Loco: "%s".', $response->getContent(false)));
+        }
+
+        return array_map(function ($asset) {
+            return $asset['id'];
+        }, $response->toArray(false));
+    }
+
+    private function createAssets(array $keys): array
+    {
+        $responses = $createdIds = [];
+
+        foreach ($keys as $key) {
+            $responses[$key] = $this->client->request('POST', 'assets', [
+                'body' => [
+                    'text' => $key,
+                    'type' => 'text',
+                    'default' => 'untranslated',
+                ],
             ]);
-        } elseif (201 !== $response->getStatusCode()) {
-            $this->logger->error(sprintf('Unable to add new translation key "%s" to Loco: (status code: "%s") "%s".', $id, $response->getStatusCode(), $response->getContent(false)));
         }
+
+        foreach ($responses as $key => $response) {
+            if (201 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to add new translation key "%s" to Loco: (status code: "%s") "%s".', $key, $response->getStatusCode(), $response->getContent(false)));
+            } else {
+                $createdIds[] = $response->toArray(false)['id'];
+            }
+        }
+
+        return $createdIds;
     }
 
-    private function translateAsset(string $id, string $message, string $locale): void
+    private function translateAssets(array $translations, string $locale): void
     {
-        $response = $this->client->request('POST', sprintf('translations/%s/%s', $id, $locale), [
-            'body' => $message,
-        ]);
+        $responses = [];
 
-        if (200 !== $response->getStatusCode()) {
-            $this->logger->error(sprintf('Unable to add translation message "%s" (for key: "%s" in locale "%s") to Loco: "%s".', $message, $id, $locale, $response->getContent(false)));
+        foreach ($translations as $id => $message) {
+            $responses[$id] = $this->client->request('POST', sprintf('translations/%s/%s', $id, $locale), [
+                'body' => $message,
+            ]);
+        }
+
+        foreach ($responses as $id => $response) {
+            if (200 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to add translation for key "%s" in locale "%s" to Loco: "%s".', $id, $locale, $response->getContent(false)));
+            }
         }
     }
 
     private function tagsAssets(array $ids, string $tag): void
     {
-        $idsAsString = implode(',', array_unique($ids));
-
         if (!\in_array($tag, $this->getTags(), true)) {
             $this->createTag($tag);
         }
 
         $response = $this->client->request('POST', sprintf('tags/%s.json', $tag), [
-            'body' => $idsAsString,
+            'body' => implode(',', $ids),
         ]);
 
         if (200 !== $response->getStatusCode()) {
-            $this->logger->error(sprintf('Unable to add tag "%s" on translation keys "%s" to Loco: "%s".', $tag, $idsAsString, $response->getContent(false)));
+            $this->logger->error(sprintf('Unable to tag assets with "%s" on Loco: "%s".', $tag, $response->getContent(false)));
         }
     }
 
@@ -233,13 +276,4 @@ private function getLocales(): array
             return $carry;
         }, []);
     }
-
-    private function deleteAsset(string $id): void
-    {
-        $response = $this->client->request('DELETE', sprintf('assets/%s.json', $id));
-
-        if (200 !== $response->getStatusCode()) {
-            $this->logger->error(sprintf('Unable to delete translation key "%s" to Loco: "%s".', $id, $response->getContent(false)));
-        }
-    }
 }
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
index 6dc474d637a74..3d3dd8af985ca 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
@@ -4,6 +4,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\Translation\Bridge\Loco\LocoProvider;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Loader\LoaderInterface;
@@ -22,195 +23,201 @@ public function createProvider(HttpClientInterface $client, LoaderInterface $loa
         return new LocoProvider($client, $loader, $logger, $defaultLocale, $endpoint);
     }
 
-    public function testCompleteWriteProcess()
+    public function toStringProvider(): iterable
     {
-        $createAssetResponse = $this->createMock(ResponseInterface::class);
-        $createAssetResponse->expects($this->exactly(4))
-            ->method('getStatusCode')
-            ->willReturn(201);
-
-        $getLocalesResponse = $this->createMock(ResponseInterface::class);
-        $getLocalesResponse->expects($this->exactly(4))
-            ->method('getStatusCode')
-            ->willReturn(200);
-        $getLocalesResponse->expects($this->exactly(2))
-            ->method('getContent')
-            ->with(false)
-            ->willReturn('[{"code":"en"}]');
-
-        $createLocaleResponse = $this->createMock(ResponseInterface::class);
-        $createLocaleResponse->expects($this->exactly(2))
-            ->method('getStatusCode')
-            ->willReturn(201);
-
-        $translateAssetResponse = $this->createMock(ResponseInterface::class);
-        $translateAssetResponse->expects($this->exactly(8))
-            ->method('getStatusCode')
-            ->willReturn(200);
-
-        $getTagsEmptyResponse = $this->createMock(ResponseInterface::class);
-        $getTagsEmptyResponse->expects($this->exactly(2))
-            ->method('getStatusCode')
-            ->willReturn(200);
-        $getTagsEmptyResponse->expects($this->once())
-            ->method('getContent')
-            ->with(false)
-            ->willReturn('[]');
-
-        $getTagsNotEmptyResponse = $this->createMock(ResponseInterface::class);
-        $getTagsNotEmptyResponse->expects($this->exactly(2))
-            ->method('getStatusCode')
-            ->willReturn(200);
-        $getTagsNotEmptyResponse->expects($this->once())
-            ->method('getContent')
-            ->with(false)
-            ->willReturn('["messages"]');
-
-        $createTagResponse = $this->createMock(ResponseInterface::class);
-        $createTagResponse->expects($this->exactly(4))
-            ->method('getStatusCode')
-            ->willReturn(201);
-
-        $tagAssetResponse = $this->createMock(ResponseInterface::class);
-        $tagAssetResponse->expects($this->exactly(4))
-            ->method('getStatusCode')
-            ->willReturn(200);
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://localise.biz/api/',
+                'headers' => [
+                    'Authorization' => 'Loco API_KEY',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/'),
+            'loco://localise.biz/api/',
+        ];
+
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://example.com',
+                'headers' => [
+                    'Authorization' => 'Loco API_KEY',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'example.com'),
+            'loco://example.com',
+        ];
 
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://example.com:99',
+                'headers' => [
+                    'Authorization' => 'Loco API_KEY',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'example.com:99'),
+            'loco://example.com:99',
+        ];
+    }
+
+    public function testCompleteWriteProcess()
+    {
         $expectedAuthHeader = 'Authorization: Loco API_KEY';
 
         $responses = [
-            'createAsset1' => function (string $method, string $url, array $options = []) use ($createAssetResponse, $expectedAuthHeader): ResponseInterface {
+            'createAsset1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
                 $expectedBody = http_build_query([
-                    'name' => 'a',
-                    'id' => 'a',
+                    'text' => 'a',
                     'type' => 'text',
                     'default' => 'untranslated',
                 ]);
 
-                $this->assertEquals('POST', $method);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals($expectedBody, $options['body']);
+                $this->assertSame('POST', $method);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame($expectedBody, $options['body']);
 
-                return $createAssetResponse;
+                return new MockResponse('{"id": "1337"}', ['http_code' => 201]);
             },
-            'getTags1' => function (string $method, string $url, array $options = []) use ($getTagsEmptyResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('GET', $method);
-                $this->assertEquals('https://localise.biz/api/tags.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+            'getTags1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/tags.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $getTagsEmptyResponse;
+                return new MockResponse('[]');
             },
-            'createTag1' => function (string $method, string $url, array $options = []) use ($createTagResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/tags.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals(http_build_query(['name' => 'messages']), $options['body']);
+            'createTag1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/tags.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame(http_build_query(['name' => 'messages']), $options['body']);
 
-                return $createTagResponse;
+                return new MockResponse('', ['http_code' => 201]);
             },
-            'tagAsset1' => function (string $method, string $url, array $options = []) use ($tagAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/tags/messages.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('a', $options['body']);
+            'tagAsset1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/tags/messages.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('1337', $options['body']);
 
-                return $tagAssetResponse;
+                return new MockResponse();
             },
-            'createAsset2' => function (string $method, string $url, array $options = []) use ($createAssetResponse, $expectedAuthHeader): ResponseInterface {
+            'createAsset2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
                 $expectedBody = http_build_query([
-                    'name' => 'post.num_comments',
-                    'id' => 'post.num_comments',
+                    'text' => 'post.num_comments',
                     'type' => 'text',
                     'default' => 'untranslated',
                 ]);
 
-                $this->assertEquals('POST', $method);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals($expectedBody, $options['body']);
+                $this->assertSame('POST', $method);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame($expectedBody, $options['body']);
 
-                return $createAssetResponse;
+                return new MockResponse('{"id": "1234"}', ['http_code' => 201]);
             },
-            'getTags2' => function (string $method, string $url, array $options = []) use ($getTagsNotEmptyResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('GET', $method);
-                $this->assertEquals('https://localise.biz/api/tags.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+            'getTags2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/tags.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $getTagsNotEmptyResponse;
+                return new MockResponse('["messages"]');
             },
-            'createTag2' => function (string $method, string $url, array $options = []) use ($createTagResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/tags.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals(http_build_query(['name' => 'validators']), $options['body']);
+            'createTag2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/tags.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame(http_build_query(['name' => 'validators']), $options['body']);
 
-                return $createTagResponse;
+                return new MockResponse('', ['http_code' => 201]);
             },
-            'tagAsset2' => function (string $method, string $url, array $options = []) use ($tagAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/tags/validators.json', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('post.num_comments', $options['body']);
+            'tagAsset2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/tags/validators.json', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('1234', $options['body']);
 
-                return $tagAssetResponse;
+                return new MockResponse();
             },
+            'getLocales1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/locales', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-            'getLocales1' => function (string $method, string $url, array $options = []) use ($getLocalesResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('GET', $method);
-                $this->assertEquals('https://localise.biz/api/locales', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-
-                return $getLocalesResponse;
+                return new MockResponse('[{"code":"en"}]');
             },
+            'getAssetsIds1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/assets?filter=messages', $url);
+                $this->assertSame(['filter' => 'messages'], $options['query']);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-            'translateAsset1' => function (string $method, string $url, array $options = []) use ($translateAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/translations/a/en', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('trans_en_a', $options['body']);
+                return new MockResponse('[{"id":"1337"}]');
+            },
+            'translateAsset1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/translations/1337/en', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('trans_en_a', $options['body']);
 
-                return $translateAssetResponse;
+                return new MockResponse();
             },
-            'translateAsset2' => function (string $method, string $url, array $options = []) use ($translateAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/translations/post.num_comments/en', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('{count, plural, one {# comment} other {# comments}}', $options['body']);
+            'getAssetsIds2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/assets?filter=validators', $url);
+                $this->assertSame(['filter' => 'validators'], $options['query']);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $translateAssetResponse;
+                return new MockResponse('[{"id":"1234"}]');
             },
+            'translateAsset2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/translations/1234/en', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('{count, plural, one {# comment} other {# comments}}', $options['body']);
 
-            'getLocales2' => function (string $method, string $url, array $options = []) use ($getLocalesResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('GET', $method);
-                $this->assertEquals('https://localise.biz/api/locales', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                return new MockResponse();
+            },
+            'getLocales2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/locales', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $getLocalesResponse;
+                return new MockResponse('[{"code":"en"}]');
             },
+            'createLocale1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/locales', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('code=fr', $options['body']);
 
-            'createLocale1' => function (string $method, string $url, array $options = []) use ($createLocaleResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/locales', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('code=fr', $options['body']);
+                return new MockResponse('', ['http_code' => 201]);
+            },
+            'getAssetsIds3' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/assets?filter=messages', $url);
+                $this->assertSame(['filter' => 'messages'], $options['query']);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $createLocaleResponse;
+                return new MockResponse('[{"id":"1337"}]');
             },
+            'translateAsset3' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/translations/1337/fr', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('trans_fr_a', $options['body']);
 
-            'translateAsset3' => function (string $method, string $url, array $options = []) use ($translateAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/translations/a/fr', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('trans_fr_a', $options['body']);
+                return new MockResponse();
+            },
+            'getAssetsIds4' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://localise.biz/api/assets?filter=validators', $url);
+                $this->assertSame(['filter' => 'validators'], $options['query']);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
 
-                return $translateAssetResponse;
+                return new MockResponse('[{"id":"1234"}]');
             },
-            'translateAsset4' => function (string $method, string $url, array $options = []) use ($translateAssetResponse, $expectedAuthHeader): ResponseInterface {
-                $this->assertEquals('POST', $method);
-                $this->assertEquals('https://localise.biz/api/translations/post.num_comments/fr', $url);
-                $this->assertEquals($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
-                $this->assertEquals('{count, plural, one {# commentaire} other {# commentaires}}', $options['body']);
+            'translateAsset4' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://localise.biz/api/translations/1234/fr', $url);
+                $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]);
+                $this->assertSame('{count, plural, one {# commentaire} other {# commentaires}}', $options['body']);
 
-                return $translateAssetResponse;
+                return new MockResponse();
             },
         ];
 
@@ -226,106 +233,126 @@ public function testCompleteWriteProcess()
 
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
-            'headers' => [
-                'Authorization' => 'Loco API_KEY',
-            ],
+            'headers' => ['Authorization' => 'Loco API_KEY'],
         ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
+
         $provider->write($translatorBag);
     }
 
     /**
-     * @dataProvider getLocoResponsesForOneLocaleAndOneDomain
+     * @dataProvider getResponsesForOneLocaleAndOneDomain
      */
     public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
     {
-        $response = $this->createMock(ResponseInterface::class);
-        $response->expects($this->once())
-            ->method('getContent')
-            ->willReturn($responseContent);
-        $response->expects($this->exactly(2))
-            ->method('getStatusCode')
-            ->willReturn(200);
-
         $loader = $this->getLoader();
         $loader->expects($this->once())
             ->method('load')
-            ->willReturn($expectedTranslatorBag->getCatalogue($locale));
+            ->willReturn((new XliffFileLoader())->load($responseContent, $locale, $domain));
 
-        $locoProvider = $this->createProvider((new MockHttpClient($response))->withOptions([
+        $provider = $this->createProvider((new MockHttpClient(new MockResponse($responseContent)))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => [
                 'Authorization' => 'Loco API_KEY',
             ],
         ]), $loader, $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
-        $translatorBag = $locoProvider->read([$domain], [$locale]);
+        $translatorBag = $provider->read([$domain], [$locale]);
+        // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
+        foreach ($translatorBag->getCatalogues() as $catalogue) {
+            $catalogue->deleteMetadata('', '');
+        }
 
         $this->assertEquals($expectedTranslatorBag->getCatalogues(), $translatorBag->getCatalogues());
     }
 
     /**
-     * @dataProvider getLocoResponsesForManyLocalesAndManyDomains
+     * @dataProvider getResponsesForManyLocalesAndManyDomains
      */
-    public function testReadForManyLocalesAndManyDomains(array $locales, array $domains, array $responseContents, array $expectedTranslatorBags)
+    public function testReadForManyLocalesAndManyDomains(array $locales, array $domains, array $responseContents, TranslatorBag $expectedTranslatorBag)
     {
+        $responses = [];
+        $consecutiveLoadArguments = [];
+        $consecutiveLoadReturns = [];
+
         foreach ($locales as $locale) {
             foreach ($domains as $domain) {
-                $response = $this->createMock(ResponseInterface::class);
-                $response->expects($this->once())
-                    ->method('getContent')
-                    ->willReturn($responseContents[$domain][$locale]);
-                $response->expects($this->exactly(2))
-                    ->method('getStatusCode')
-                    ->willReturn(200);
-
-                $locoProvider = new LocoProvider((new MockHttpClient($response))->withOptions([
-                    'base_uri' => 'https://localise.biz/api/',
-                    'headers' => [
-                        'Authorization' => 'Loco API_KEY',
-                    ],
-                ]), new XliffFileLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
-                $translatorBag = $locoProvider->read([$domain], [$locale]);
-                // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
-                $translatorBag->getCatalogue($locale)->deleteMetadata('foo', '');
-
-                $this->assertEquals($expectedTranslatorBags[$domain]->getCatalogue($locale), $translatorBag->getCatalogue($locale));
+                $responses[] = new MockResponse($responseContents[$locale][$domain]);
+                $consecutiveLoadArguments[] = [$responseContents[$locale][$domain], $locale, $domain];
+                $consecutiveLoadReturns[] = (new XliffFileLoader())->load($responseContents[$locale][$domain], $locale, $domain);
             }
         }
+
+        $loader = $this->getLoader();
+        $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
+            ->method('load')
+            ->withConsecutive(...$consecutiveLoadArguments)
+            ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns);
+
+        $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://localise.biz/api/',
+            'headers' => [
+                'Authorization' => 'Loco API_KEY',
+            ],
+        ]), $loader, $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
+        $translatorBag = $provider->read($domains, $locales);
+        // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
+        foreach ($translatorBag->getCatalogues() as $catalogue) {
+            $catalogue->deleteMetadata('', '');
+        }
+
+        $this->assertEquals($expectedTranslatorBag->getCatalogues(), $translatorBag->getCatalogues());
     }
 
-    public function toStringProvider(): iterable
+    public function testDeleteProcess()
     {
-        yield [
-            new LocoProvider($this->getClient()->withOptions([
-                'base_uri' => 'https://localise.biz/api/',
-                'headers' => [
-                    'Authorization' => 'Loco API_KEY',
-                ],
-            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/'),
-            'loco://localise.biz/api/',
-        ];
-
-        yield [
-            new LocoProvider($this->getClient()->withOptions([
-                'base_uri' => 'https://example.com',
-                'headers' => [
-                    'Authorization' => 'Loco API_KEY',
-                ],
-            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'example.com'),
-            'loco://example.com',
-        ];
+        $translatorBag = new TranslatorBag();
+        $translatorBag->addCatalogue(new MessageCatalogue('en', [
+            'messages' => ['a' => 'trans_en_a'],
+            'validators' => ['post.num_comments' => '{count, plural, one {# comment} other {# comments}}'],
+        ]));
+        $translatorBag->addCatalogue(new MessageCatalogue('fr', [
+            'messages' => ['a' => 'trans_fr_a'],
+            'validators' => ['post.num_comments' => '{count, plural, one {# commentaire} other {# commentaires}}'],
+        ]));
 
-        yield [
-            new LocoProvider($this->getClient()->withOptions([
-                'base_uri' => 'https://example.com:99',
-                'headers' => [
-                    'Authorization' => 'Loco API_KEY',
-                ],
-            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'example.com:99'),
-            'loco://example.com:99',
-        ];
+        $provider = $this->createProvider(
+            new MockHttpClient([
+                function (string $method, string $url, array $options = []): ResponseInterface {
+                    $this->assertSame('GET', $method);
+                    $this->assertSame('https://localise.biz/api/assets?filter=messages', $url);
+                    $this->assertSame(['filter' => 'messages'], $options['query']);
+
+                    return new MockResponse('[{"id":"1337"}]');
+                },
+                function (string $method, string $url): MockResponse {
+                    $this->assertSame('DELETE', $method);
+                    $this->assertSame('https://localise.biz/api/assets/1337.json', $url);
+
+                    return new MockResponse();
+                },
+                function (string $method, string $url, array $options = []): ResponseInterface {
+                    $this->assertSame('GET', $method);
+                    $this->assertSame('https://localise.biz/api/assets?filter=validators', $url);
+                    $this->assertSame(['filter' => 'validators'], $options['query']);
+
+                    return new MockResponse('[{"id":"1234"}]');
+                },
+                function (string $method, string $url): MockResponse {
+                    $this->assertSame('DELETE', $method);
+                    $this->assertSame('https://localise.biz/api/assets/1234.json', $url);
+
+                    return new MockResponse();
+                },
+            ], 'https://localise.biz/api/'),
+            $this->getLoader(),
+            $this->getLogger(),
+            $this->getDefaultLocale(),
+            'localise.biz/api/'
+        );
+
+        $provider->delete($translatorBag);
     }
 
-    public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
+    public function getResponsesForOneLocaleAndOneDomain(): \Generator
     {
         $arrayLoader = new ArrayLoader();
 
@@ -333,7 +360,7 @@ public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
         $expectedTranslatorBagEn->addCatalogue($arrayLoader->load([
             'index.hello' => 'Hello',
             'index.greetings' => 'Welcome, {firstname}!',
-        ], 'en', 'messages'));
+        ], 'en'));
 
         yield ['en', 'messages', <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
@@ -363,7 +390,7 @@ public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
         $expectedTranslatorBagFr->addCatalogue($arrayLoader->load([
             'index.hello' => 'Bonjour',
             'index.greetings' => 'Bienvenue, {firstname} !',
-        ], 'fr', 'messages'));
+        ], 'fr'));
 
         yield ['fr', 'messages', <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
@@ -390,26 +417,24 @@ public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
         ];
     }
 
-    public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
+    public function getResponsesForManyLocalesAndManyDomains(): \Generator
     {
         $arrayLoader = new ArrayLoader();
 
-        $expectedTranslatorBagMessages = new TranslatorBag();
-        $expectedTranslatorBagMessages->addCatalogue($arrayLoader->load([
+        $expectedTranslatorBag = new TranslatorBag();
+        $expectedTranslatorBag->addCatalogue($arrayLoader->load([
             'index.hello' => 'Hello',
             'index.greetings' => 'Welcome, {firstname}!',
-        ], 'en', 'messages'));
-        $expectedTranslatorBagMessages->addCatalogue($arrayLoader->load([
+        ], 'en'));
+        $expectedTranslatorBag->addCatalogue($arrayLoader->load([
             'index.hello' => 'Bonjour',
             'index.greetings' => 'Bienvenue, {firstname} !',
-        ], 'fr', 'messages'));
-
-        $expectedTranslatorBagValidators = new TranslatorBag();
-        $expectedTranslatorBagValidators->addCatalogue($arrayLoader->load([
+        ], 'fr'));
+        $expectedTranslatorBag->addCatalogue($arrayLoader->load([
             'firstname.error' => 'Firstname must contains only letters.',
             'lastname.error' => 'Lastname must contains only letters.',
         ], 'en', 'validators'));
-        $expectedTranslatorBagValidators->addCatalogue($arrayLoader->load([
+        $expectedTranslatorBag->addCatalogue($arrayLoader->load([
             'firstname.error' => 'Le prénom ne peut contenir que des lettres.',
             'lastname.error' => 'Le nom de famille ne peut contenir que des lettres.',
         ], 'fr', 'validators'));
@@ -418,8 +443,8 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
             ['en', 'fr'],
             ['messages', 'validators'],
             [
-                'messages' => [
-                    'en' => <<<'XLIFF'
+                'en' => [
+                    'messages' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
@@ -440,7 +465,7 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
 </xliff>
 XLIFF
                     ,
-                    'fr' => <<<'XLIFF'
+                    'validators' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
@@ -448,13 +473,13 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
       <tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
     </header>
     <body>
-      <trans-unit id="loco:5fd89b853ee27904dd6c5f67" resname="index.hello" datatype="plaintext">
-        <source>index.hello</source>
-        <target state="translated">Bonjour</target>
+      <trans-unit id="loco:5fd89b853ee27904dd6c5f68" resname="firstname.error" datatype="plaintext">
+        <source>firstname.error</source>
+        <target state="translated">Firstname must contains only letters.</target>
       </trans-unit>
-      <trans-unit id="loco:5fd89b8542e5aa5cc27457e2" resname="index.greetings" datatype="plaintext" extradata="loco:format=icu">
-        <source>index.greetings</source>
-        <target state="translated">Bienvenue, {firstname} !</target>
+      <trans-unit id="loco:5fd89b8542e5aa5cc27457e3" resname="lastname.error" datatype="plaintext" extradata="loco:format=icu">
+        <source>lastname.error</source>
+        <target state="translated">Lastname must contains only letters.</target>
       </trans-unit>
     </body>
   </file>
@@ -462,8 +487,8 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
 XLIFF
                     ,
                 ],
-                'validators' => [
-                    'en' => <<<'XLIFF'
+                'fr' => [
+                    'messages' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
@@ -471,20 +496,20 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
       <tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
     </header>
     <body>
-      <trans-unit id="loco:5fd89b853ee27904dd6c5f68" resname="firstname.error" datatype="plaintext">
-        <source>firstname.error</source>
-        <target state="translated">Firstname must contains only letters.</target>
+      <trans-unit id="loco:5fd89b853ee27904dd6c5f67" resname="index.hello" datatype="plaintext">
+        <source>index.hello</source>
+        <target state="translated">Bonjour</target>
       </trans-unit>
-      <trans-unit id="loco:5fd89b8542e5aa5cc27457e3" resname="lastname.error" datatype="plaintext" extradata="loco:format=icu">
-        <source>lastname.error</source>
-        <target state="translated">Lastname must contains only letters.</target>
+      <trans-unit id="loco:5fd89b8542e5aa5cc27457e2" resname="index.greetings" datatype="plaintext" extradata="loco:format=icu">
+        <source>index.greetings</source>
+        <target state="translated">Bienvenue, {firstname} !</target>
       </trans-unit>
     </body>
   </file>
 </xliff>
 XLIFF
                     ,
-                    'fr' => <<<'XLIFF'
+                    'validators' => <<<'XLIFF'
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
@@ -505,12 +530,9 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
 </xliff>
 XLIFF
                     ,
+                ],
             ],
-            ],
-            [
-                'messages' => $expectedTranslatorBagMessages,
-                'validators' => $expectedTranslatorBagValidators,
-            ],
+            $expectedTranslatorBag,
         ];
     }
 }

From 19e5650c252c81c90cb869d3952b14732f1156a8 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Sat, 8 May 2021 01:41:33 +0200
Subject: [PATCH 64/67] Fix duplicated legacy test

---
 .../Serializer/Tests/Annotation/SerializedNameTest.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/SerializedNameTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/SerializedNameTest.php
index 2cc0500887614..8ea70a67444a1 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/SerializedNameTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/SerializedNameTest.php
@@ -54,7 +54,7 @@ public function testNotAStringSerializedNameParameter($value)
 
     public function testSerializedNameParameters()
     {
-        $maxDepth = new SerializedName(['value' => 'foo']);
+        $maxDepth = new SerializedName('foo');
         $this->assertEquals('foo', $maxDepth->getSerializedName());
     }
 

From d7fda16262435406ec815856163a972235a83ec9 Mon Sep 17 00:00:00 2001
From: Andrii Bodnar <andrii.bodnar@crowdin.com>
Date: Sun, 25 Apr 2021 16:47:06 +0300
Subject: [PATCH 65/67] [Translation] Added Crowdin Translation Provider

---
 .../FrameworkExtension.php                    |   2 +
 .../config/translation_providers.php          |  11 +
 .../Translation/Bridge/Crowdin/.gitattributes |   4 +
 .../Translation/Bridge/Crowdin/.gitignore     |   3 +
 .../Translation/Bridge/Crowdin/CHANGELOG.md   |   7 +
 .../Bridge/Crowdin/CrowdinProvider.php        | 395 ++++++++++++
 .../Bridge/Crowdin/CrowdinProviderFactory.php |  96 +++
 .../Translation/Bridge/Crowdin/LICENSE        |  19 +
 .../Translation/Bridge/Crowdin/README.md      |  29 +
 .../Tests/CrowdinProviderFactoryTest.php      |  44 ++
 .../Crowdin/Tests/CrowdinProviderTest.php     | 585 ++++++++++++++++++
 .../Translation/Bridge/Crowdin/composer.json  |  37 ++
 .../Bridge/Crowdin/phpunit.xml.dist           |  31 +
 .../Exception/UnsupportedSchemeException.php  |   4 +
 14 files changed, 1267 insertions(+)
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/.gitattributes
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/.gitignore
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/LICENSE
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/README.md
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderFactoryTest.php
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/composer.json
 create mode 100644 src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index a9b1698ce0637..f86c8db11c079 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -169,6 +169,7 @@
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\String\LazyString;
 use Symfony\Component\String\Slugger\SluggerInterface;
+use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
 use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
 use Symfony\Component\Translation\PseudoLocalizationTranslator;
@@ -1354,6 +1355,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         }
 
         $classToServices = [
+            CrowdinProviderFactory::class => 'translation.provider_factory.crowdin',
             LocoProviderFactory::class => 'translation.provider_factory.loco',
         ];
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php
index 365898ef9c50b..5c55e91a21d1d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
 use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
 use Symfony\Component\Translation\Provider\NullProviderFactory;
 use Symfony\Component\Translation\Provider\TranslationProviderCollection;
@@ -33,6 +34,16 @@
         ->set('translation.provider_factory.null', NullProviderFactory::class)
             ->tag('translation.provider_factory')
 
+        ->set('translation.provider_factory.crowdin', CrowdinProviderFactory::class)
+            ->args([
+                service('http_client'),
+                service('logger'),
+                param('kernel.default_locale'),
+                service('translation.loader.xliff'),
+                service('translation.dumper.xliff'),
+            ])
+            ->tag('translation.provider_factory')
+
         ->set('translation.provider_factory.loco', LocoProviderFactory::class)
             ->args([
                 service('http_client'),
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/.gitattributes b/src/Symfony/Component/Translation/Bridge/Crowdin/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/.gitignore b/src/Symfony/Component/Translation/Bridge/Crowdin/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CHANGELOG.md b/src/Symfony/Component/Translation/Bridge/Crowdin/CHANGELOG.md
new file mode 100644
index 0000000000000..bf27ce9c5e42c
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+5.3
+---
+
+* Create the bridge
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
new file mode 100644
index 0000000000000..4ec1f5c10307b
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
@@ -0,0 +1,395 @@
+<?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\Translation\Bridge\Crowdin;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Translation\Dumper\XliffFileDumper;
+use Symfony\Component\Translation\Exception\ProviderException;
+use Symfony\Component\Translation\Loader\LoaderInterface;
+use Symfony\Component\Translation\Provider\ProviderInterface;
+use Symfony\Component\Translation\TranslatorBag;
+use Symfony\Component\Translation\TranslatorBagInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * @author Andrii Bodnar <andrii.bodnar@crowdin.com>
+ *
+ * In Crowdin:
+ *  * Filenames refer to Symfony's translation domains;
+ *  * Identifiers refer to Symfony's translation keys;
+ *  * Translations refer to Symfony's translated messages
+ *
+ * @experimental in 5.3
+ */
+final class CrowdinProvider implements ProviderInterface
+{
+    private $client;
+    private $loader;
+    private $logger;
+    private $xliffFileDumper;
+    private $defaultLocale;
+    private $endpoint;
+    private $projectId;
+    private $filesDownloader;
+
+    public function __construct(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, XliffFileDumper $xliffFileDumper, string $defaultLocale, string $endpoint, int $projectId, HttpClientInterface $filesDownloader)
+    {
+        $this->client = $client;
+        $this->loader = $loader;
+        $this->logger = $logger;
+        $this->xliffFileDumper = $xliffFileDumper;
+        $this->defaultLocale = $defaultLocale;
+        $this->endpoint = $endpoint;
+        $this->projectId = $projectId;
+        $this->filesDownloader = $filesDownloader;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('crowdin://%s', $this->endpoint);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write(TranslatorBagInterface $translatorBag): void
+    {
+        $fileList = $this->getFileList();
+
+        $responses = [];
+
+        foreach ($translatorBag->getCatalogues() as $catalogue) {
+            foreach ($catalogue->getDomains() as $domain) {
+                if (0 === \count($catalogue->all($domain))) {
+                    continue;
+                }
+
+                $content = $this->xliffFileDumper->formatCatalogue($catalogue, $domain, ['default_locale' => $this->defaultLocale]);
+
+                $fileId = $this->getFileIdByDomain($fileList, $domain);
+
+                if ($catalogue->getLocale() === $this->defaultLocale) {
+                    if (!$fileId) {
+                        $file = $this->addFile($domain, $content);
+                    } else {
+                        $file = $this->updateFile($fileId, $domain, $content);
+                    }
+
+                    if (!$file) {
+                        continue;
+                    }
+
+                    $fileList[$file['name']] = $file['id'];
+                } else {
+                    if (!$fileId) {
+                        continue;
+                    }
+
+                    $responses[] = $this->uploadTranslations($fileId, $domain, $content, $catalogue->getLocale());
+                }
+            }
+        }
+
+        foreach ($responses as $response) {
+            if (200 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to upload translations to Crowdin. Message: "%s".', $response->getContent(false)));
+            }
+        }
+    }
+
+    public function read(array $domains, array $locales): TranslatorBag
+    {
+        $fileList = $this->getFileList();
+
+        $translatorBag = new TranslatorBag();
+        $responses = [];
+
+        foreach ($domains as $domain) {
+            $fileId = $this->getFileIdByDomain($fileList, $domain);
+
+            if (!$fileId) {
+                continue;
+            }
+
+            foreach ($locales as $locale) {
+                if ($locale !== $this->defaultLocale) {
+                    $response = $this->exportProjectTranslations($locale, $fileId);
+                } else {
+                    $response = $this->downloadSourceFile($fileId);
+                }
+
+                $responses[] = [
+                    'response' => $response,
+                    'locale' => $locale,
+                    'domain' => $domain,
+                ];
+            }
+        }
+
+        foreach ($responses as $responseData) {
+            /** @var ResponseInterface $response */
+            $response = $responseData['response'];
+
+            if (204 === $response->getStatusCode()) {
+                $this->logger->error(sprintf('No content in exported file. Message: "%s".', $response->getContent(false)));
+
+                continue;
+            }
+
+            if (200 !== $response->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to export file. Message: "%s".', $response->getContent(false)));
+
+                continue;
+            }
+
+            $exportResponse = $this->filesDownloader->request('GET', $response->toArray()['data']['url']);
+
+            if (200 !== $exportResponse->getStatusCode()) {
+                $this->logger->error(sprintf('Unable to download file content. Message: "%s".', $response->getContent(false)));
+
+                continue;
+            }
+
+            $translatorBag->addCatalogue($this->loader->load($exportResponse->getContent(), $responseData['locale'], $responseData['domain']));
+        }
+
+        return $translatorBag;
+    }
+
+    public function delete(TranslatorBagInterface $translatorBag): void
+    {
+        $fileList = $this->getFileList();
+        $responses = [];
+
+        $defaultCatalogue = $translatorBag->getCatalogue($this->defaultLocale);
+
+        if (!$defaultCatalogue) {
+            $defaultCatalogue = $translatorBag->getCatalogues()[0];
+        }
+
+        foreach ($defaultCatalogue->all() as $domain => $messages) {
+            $fileId = $this->getFileIdByDomain($fileList, $domain);
+
+            if (!$fileId) {
+                continue;
+            }
+
+            $stringsMap = $this->mapStrings($fileId);
+
+            foreach ($messages as $id => $message) {
+                if (!\array_key_exists($id, $stringsMap)) {
+                    continue;
+                }
+
+                $responses[] = $this->deleteString($stringsMap[$id]);
+            }
+        }
+
+        foreach ($responses as $response) {
+            if (404 === $response->getStatusCode()) {
+                continue;
+            }
+
+            if (204 !== $response->getStatusCode()) {
+                $this->logger->warning(sprintf('Unable to delete string in project %d. Message: "%s".', $this->projectId, $response->getContent(false)));
+            }
+        }
+    }
+
+    private function getFileIdByDomain(array $filesMap, string $domain): ?int
+    {
+        return $filesMap[sprintf('%s.%s', $domain, 'xlf')] ?? null;
+    }
+
+    private function mapStrings(int $fileId): array
+    {
+        $result = [];
+
+        $limit = 500;
+        $offset = 0;
+
+        do {
+            $strings = $this->listStrings($fileId, $limit, $offset);
+
+            foreach ($strings as $string) {
+                $result[$string['data']['text']] = $string['data']['id'];
+            }
+
+            $offset += $limit;
+        } while (\count($strings) > 0);
+
+        return $result;
+    }
+
+    private function addFile(string $domain, string $content): ?array
+    {
+        $storageId = $this->addStorage($domain, $content);
+
+        /**
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.files.getMany (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.files.getMany (Crowdin Enterprise API)
+         */
+        $response = $this->client->request('POST', sprintf('projects/%s/files', $this->projectId), [
+            'json' => [
+                'storageId' => $storageId,
+                'name' => sprintf('%s.%s', $domain, 'xlf'),
+            ],
+        ]);
+
+        if (201 !== $response->getStatusCode()) {
+            $this->logger->error(sprintf('Unable to create a File in Crowdin for domain "%s". Message: "%s".', $domain, $response->getContent(false)));
+
+            return null;
+        }
+
+        return $response->toArray()['data'];
+    }
+
+    private function updateFile(int $fileId, string $domain, string $content): ?array
+    {
+        $storageId = $this->addStorage($domain, $content);
+
+        /**
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.files.put (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.files.put (Crowdin Enterprise API)
+         */
+        $response = $this->client->request('PUT', sprintf('projects/%s/files/%d', $this->projectId, $fileId), [
+            'json' => [
+                'storageId' => $storageId,
+            ],
+        ]);
+
+        if (200 !== $response->getStatusCode()) {
+            $this->logger->error(sprintf('Unable to update file in Crowdin for file ID "%d" and domain "%s". Message: "%s".', $fileId, $domain, $response->getContent(false)));
+
+            return null;
+        }
+
+        return $response->toArray()['data'];
+    }
+
+    private function uploadTranslations(int $fileId, string $domain, string $content, string $locale): ResponseInterface
+    {
+        $storageId = $this->addStorage($domain, $content);
+
+        /*
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.translations.postOnLanguage (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.translations.postOnLanguage (Crowdin Enterprise API)
+         */
+        return $this->client->request('POST', sprintf('projects/%s/translations/%s', $this->projectId, $locale), [
+            'json' => [
+                'storageId' => $storageId,
+                'fileId' => $fileId,
+            ],
+        ]);
+    }
+
+    private function exportProjectTranslations(string $languageId, int $fileId): ResponseInterface
+    {
+        /*
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.translations.exports.post (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.translations.exports.post (Crowdin Enterprise API)
+         */
+        return $this->client->request('POST', sprintf('projects/%d/translations/exports', $this->projectId), [
+            'json' => [
+                'targetLanguageId' => $languageId,
+                'fileIds' => [$fileId],
+            ],
+        ]);
+    }
+
+    private function downloadSourceFile(int $fileId): ResponseInterface
+    {
+        /*
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.files.download.get (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.files.download.get (Crowdin Enterprise API)
+         */
+        return $this->client->request('GET', sprintf('projects/%d/files/%d/download', $this->projectId, $fileId));
+    }
+
+    private function listStrings(int $fileId, int $limit, int $offset): array
+    {
+        /**
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.strings.getMany (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.strings.getMany (Crowdin Enterprise API)
+         */
+        $response = $this->client->request('GET', sprintf('projects/%d/strings', $this->projectId), [
+            'query' => [
+                'fileId' => $fileId,
+                'limit' => $limit,
+                'offset' => $offset,
+            ],
+        ]);
+
+        if (200 !== $response->getStatusCode()) {
+            $this->logger->error(sprintf('Unable to list strings for file %d in project %d. Message: "%s".', $fileId, $this->projectId, $response->getContent()));
+
+            return [];
+        }
+
+        return $response->toArray()['data'];
+    }
+
+    private function deleteString(int $stringId): ResponseInterface
+    {
+        /*
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.strings.delete (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.strings.delete (Crowdin Enterprise API)
+         */
+        return $this->client->request('DELETE', sprintf('projects/%d/strings/%d', $this->projectId, $stringId));
+    }
+
+    private function addStorage(string $domain, string $content): int
+    {
+        /**
+         * @see https://support.crowdin.com/api/v2/#operation/api.storages.post (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.storages.post (Crowdin Enterprise API)
+         */
+        $response = $this->client->request('POST', 'storages', [
+            'headers' => [
+                'Crowdin-API-FileName' => urlencode(sprintf('%s.%s', $domain, 'xlf')),
+                'Content-Type' => 'application/octet-stream',
+            ],
+            'body' => $content,
+        ]);
+
+        if (201 !== $response->getStatusCode()) {
+            throw new ProviderException(sprintf('Unable to add a Storage in Crowdin for domain "%s".', $domain), $response);
+        }
+
+        return $response->toArray()['data']['id'];
+    }
+
+    private function getFileList(): array
+    {
+        $result = [];
+
+        /**
+         * @see https://support.crowdin.com/api/v2/#operation/api.projects.files.getMany (Crowdin API)
+         * @see https://support.crowdin.com/enterprise/api/#operation/api.projects.files.getMany (Crowdin Enterprise API)
+         */
+        $response = $this->client->request('GET', sprintf('projects/%d/files', $this->projectId));
+
+        if (200 !== $response->getStatusCode()) {
+            throw new ProviderException('Unable to list Crowdin files.', $response);
+        }
+
+        $fileList = $response->toArray()['data'];
+
+        foreach ($fileList as $file) {
+            $result[$file['data']['name']] = $file['data']['id'];
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php
new file mode 100644
index 0000000000000..c33e36f5e2b93
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php
@@ -0,0 +1,96 @@
+<?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\Translation\Bridge\Crowdin;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Translation\Dumper\XliffFileDumper;
+use Symfony\Component\Translation\Exception\UnsupportedSchemeException;
+use Symfony\Component\Translation\Loader\LoaderInterface;
+use Symfony\Component\Translation\Provider\AbstractProviderFactory;
+use Symfony\Component\Translation\Provider\Dsn;
+use Symfony\Component\Translation\Provider\ProviderInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Andrii Bodnar <andrii.bodnar@crowdin.com>
+ *
+ * @experimental in 5.3
+ */
+final class CrowdinProviderFactory extends AbstractProviderFactory
+{
+    private const HOST = 'api.crowdin.com/api/v2/';
+    private const DSN_OPTION_DOMAIN = 'domain';
+
+    /** @var LoaderInterface */
+    private $loader;
+
+    /** @var HttpClientInterface */
+    private $client;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var string */
+    private $defaultLocale;
+
+    /** @var XliffFileDumper */
+    private $xliffFileDumper;
+
+    public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader, XliffFileDumper $xliffFileDumper)
+    {
+        $this->client = $client;
+        $this->logger = $logger;
+        $this->defaultLocale = $defaultLocale;
+        $this->loader = $loader;
+        $this->xliffFileDumper = $xliffFileDumper;
+    }
+
+    /**
+     * @return CrowdinProvider
+     */
+    public function create(Dsn $dsn): ProviderInterface
+    {
+        if ('crowdin' !== $dsn->getScheme()) {
+            throw new UnsupportedSchemeException($dsn, 'crowdin', $this->getSupportedSchemes());
+        }
+
+        $host = 'default' === $dsn->getHost() ? $this->getHost($dsn) : $dsn->getHost();
+        $endpoint = sprintf('%s%s', $host, $dsn->getPort() ? ':'.$dsn->getPort() : '');
+
+        $filesDownloader = $this->client;
+
+        $client = $this->client->withOptions([
+            'base_uri' => 'https://'.$endpoint,
+            'headers' => [
+                'Authorization' => 'Bearer '.$this->getPassword($dsn),
+            ],
+        ]);
+
+        return new CrowdinProvider($client, $this->loader, $this->logger, $this->xliffFileDumper, $this->defaultLocale, $endpoint, (int) $this->getUser($dsn), $filesDownloader);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['crowdin'];
+    }
+
+    protected function getHost(Dsn $dsn): string
+    {
+        $organizationDomain = $dsn->getOption(self::DSN_OPTION_DOMAIN);
+
+        if ($organizationDomain) {
+            return sprintf('%s.%s', $organizationDomain, self::HOST);
+        } else {
+            return self::HOST;
+        }
+    }
+}
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/LICENSE b/src/Symfony/Component/Translation/Bridge/Crowdin/LICENSE
new file mode 100644
index 0000000000000..efb17f98e7dd3
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2021 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/README.md b/src/Symfony/Component/Translation/Bridge/Crowdin/README.md
new file mode 100644
index 0000000000000..b55477506d4a8
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/README.md
@@ -0,0 +1,29 @@
+Crowdin Translation Provider
+============================
+
+Provides Crowdin integration for Symfony Translation.
+
+DSN example
+-----------
+
+```
+// .env file
+CROWDIN_DSN=crowdin://PROJECT_ID:API_TOKEN@default?domain=ORGANIZATION_DOMAIN
+```
+
+where:
+- `PROJECT_ID` is your Crowdin Project ID
+- `API_KEY` is your Personal Access API Token
+- `ORGANIZATION_DOMAIN` is your Crowdin Enterprise Organization domain (required only for Crowdin Enterprise usage)
+
+[Generate Personal Access Token on Crowdin](https://support.crowdin.com/account-settings/#api)
+
+[Generate Personal Access Token on Crowdin Enterprise](https://support.crowdin.com/enterprise/personal-access-tokens/)
+
+Resources
+---------
+
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderFactoryTest.php b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderFactoryTest.php
new file mode 100644
index 0000000000000..4cfa0c40c90e4
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderFactoryTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Symfony\Component\Translation\Bridge\Crowdin\Tests;
+
+use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
+use Symfony\Component\Translation\Provider\ProviderFactoryInterface;
+use Symfony\Component\Translation\Test\ProviderFactoryTestCase;
+
+class CrowdinProviderFactoryTest extends ProviderFactoryTestCase
+{
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'crowdin://PROJECT_ID:API_TOKEN@default'];
+        yield [false, 'somethingElse://PROJECT_ID:API_TOKEN@default'];
+    }
+
+    public function createProvider(): iterable
+    {
+        yield [
+            'crowdin://api.crowdin.com/api/v2/',
+            'crowdin://PROJECT_ID:API_TOKEN@default',
+        ];
+
+        yield [
+            'crowdin://ORGANIZATION_DOMAIN.api.crowdin.com/api/v2/',
+            'crowdin://PROJECT_ID:API_TOKEN@default?domain=ORGANIZATION_DOMAIN',
+        ];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://API_TOKEN@default'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield ['crowdin://default'];
+    }
+
+    public function createFactory(): ProviderFactoryInterface
+    {
+        return new CrowdinProviderFactory($this->getClient(), $this->getLogger(), $this->getDefaultLocale(), $this->getLoader(), $this->getXliffFileDumper());
+    }
+}
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
new file mode 100644
index 0000000000000..f83820dc63b4b
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
@@ -0,0 +1,585 @@
+<?php
+
+namespace Symfony\Component\Translation\Bridge\Crowdin\Tests;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProvider;
+use Symfony\Component\Translation\Dumper\XliffFileDumper;
+use Symfony\Component\Translation\Loader\ArrayLoader;
+use Symfony\Component\Translation\Loader\LoaderInterface;
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Provider\ProviderInterface;
+use Symfony\Component\Translation\Test\ProviderTestCase;
+use Symfony\Component\Translation\TranslatorBag;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class CrowdinProviderTest extends ProviderTestCase
+{
+    private const PROJECT_ID = 1;
+
+    public function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface
+    {
+        return new CrowdinProvider($client, $loader, $logger, $this->getXliffFileDumper(), $defaultLocale, $endpoint, self::PROJECT_ID, new MockHttpClient());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://api.crowdin.com/api/v2/',
+                'headers' => [
+                    'Authorization' => 'Bearer API_TOKEN',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/'),
+            'crowdin://api.crowdin.com/api/v2/',
+        ];
+
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://domain.api.crowdin.com/api/v2/',
+                'headers' => [
+                    'Authorization' => 'Bearer API_TOKEN',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'domain.api.crowdin.com/api/v2/'),
+            'crowdin://domain.api.crowdin.com/api/v2/',
+        ];
+
+        yield [
+            $this->createProvider($this->getClient()->withOptions([
+                'base_uri' => 'https://api.crowdin.com/api/v2/:99',
+                'headers' => [
+                    'Authorization' => 'Bearer API_TOKEN',
+                ],
+            ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/:99'),
+            'crowdin://api.crowdin.com/api/v2/:99',
+        ];
+    }
+
+    public function testCompleteWriteProcessAddFiles()
+    {
+        $this->xliffFileDumper = new XliffFileDumper();
+
+        $expectedMessagesFileContent = <<<'XLIFF'
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="ypeBEso" resname="a">
+        <source>a</source>
+        <target>trans_en_a</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+
+XLIFF;
+
+        $expectedValidatorsFileContent = <<<'XLIFF'
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="is7pld7" resname="post.num_comments">
+        <source>post.num_comments</source>
+        <target>{count, plural, one {# comment} other {# comments}}</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+
+XLIFF;
+
+        $responses = [
+            'listFiles' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+                $this->assertSame('Authorization: Bearer API_TOKEN', $options['normalized_headers']['authorization'][0]);
+
+                return new MockResponse(json_encode(['data' => []]));
+            },
+            'addStorage' => function (string $method, string $url, array $options = []) use ($expectedMessagesFileContent): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
+                $this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
+                $this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
+                $this->assertSame($expectedMessagesFileContent, $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
+            },
+            'addFile' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+                $this->assertSame('{"storageId":19,"name":"messages.xlf"}', $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 199, 'name' => 'messages.xlf']]));
+            },
+            'addStorage2' => function (string $method, string $url, array $options = []) use ($expectedValidatorsFileContent): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
+                $this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
+                $this->assertSame('Crowdin-API-FileName: validators.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
+                $this->assertSame($expectedValidatorsFileContent, $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
+            },
+            'addFile2' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+                $this->assertSame('{"storageId":19,"name":"validators.xlf"}', $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 200, 'name' => 'validators.xlf']]));
+            },
+        ];
+
+        $translatorBag = new TranslatorBag();
+        $translatorBag->addCatalogue(new MessageCatalogue('en', [
+            'messages' => ['a' => 'trans_en_a'],
+            'validators' => ['post.num_comments' => '{count, plural, one {# comment} other {# comments}}'],
+        ]));
+
+        $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/');
+
+        $provider->write($translatorBag);
+    }
+
+    public function testCompleteWriteProcessUpdateFiles()
+    {
+        $this->xliffFileDumper = new XliffFileDumper();
+
+        $expectedMessagesFileContent = <<<'XLIFF'
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="ypeBEso" resname="a">
+        <source>a</source>
+        <target>trans_en_a</target>
+      </trans-unit>
+      <trans-unit id="PiPoFgA" resname="b">
+        <source>b</source>
+        <target>trans_en_b</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+
+XLIFF;
+
+        $responses = [
+            'listFiles' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => [
+                            'id' => 12,
+                            'name' => 'messages.xlf',
+                        ]],
+                    ],
+                ]));
+            },
+            'addStorage' => function (string $method, string $url, array $options = []) use ($expectedMessagesFileContent): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
+                $this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
+                $this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
+                $this->assertSame($expectedMessagesFileContent, $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
+            },
+            'UpdateFile' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('PUT', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files/12', $url);
+                $this->assertSame('{"storageId":19}', $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 199, 'name' => 'messages.xlf']]));
+            },
+        ];
+
+        $translatorBag = new TranslatorBag();
+        $translatorBag->addCatalogue(new MessageCatalogue('en', [
+            'messages' => ['a' => 'trans_en_a', 'b' => 'trans_en_b'],
+        ]));
+
+        $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/');
+
+        $provider->write($translatorBag);
+    }
+
+    public function testCompleteWriteProcessAddFileAndUploadTranslations()
+    {
+        $this->xliffFileDumper = new XliffFileDumper();
+
+        $expectedMessagesFileContent = <<<'XLIFF'
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="ypeBEso" resname="a">
+        <source>a</source>
+        <target>trans_en_a</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+
+XLIFF;
+
+        $expectedMessagesTranslationsContent = <<<'XLIFF'
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="fr" datatype="plaintext" original="file.ext">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="ypeBEso" resname="a">
+        <source>a</source>
+        <target>trans_fr_a</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+
+XLIFF;
+
+        $responses = [
+            'listFiles' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => [
+                            'id' => 12,
+                            'name' => 'messages.xlf',
+                        ]],
+                    ],
+                ]));
+            },
+            'addStorage' => function (string $method, string $url, array $options = []) use ($expectedMessagesFileContent): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
+                $this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
+                $this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
+                $this->assertSame($expectedMessagesFileContent, $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
+            },
+            'updateFile' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('PUT', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files/12', $url);
+                $this->assertSame('{"storageId":19}', $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 12, 'name' => 'messages.xlf']]));
+            },
+            'addStorage2' => function (string $method, string $url, array $options = []) use ($expectedMessagesTranslationsContent): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
+                $this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
+                $this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
+                $this->assertSame($expectedMessagesTranslationsContent, $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
+            },
+            'UploadTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/fr', $url);
+                $this->assertSame('{"storageId":19,"fileId":12}', $options['body']);
+
+                return new MockResponse();
+            },
+        ];
+
+        $translatorBag = new TranslatorBag();
+        $translatorBag->addCatalogue(new MessageCatalogue('en', [
+            'messages' => ['a' => 'trans_en_a'],
+        ]));
+        $translatorBag->addCatalogue(new MessageCatalogue('fr', [
+            'messages' => ['a' => 'trans_fr_a'],
+        ]));
+
+        $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/');
+
+        $provider->write($translatorBag);
+    }
+
+    /**
+     * @dataProvider getResponsesForOneLocaleAndOneDomain
+     */
+    public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
+    {
+        $responses = [
+            'listFiles' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => [
+                            'id' => 12,
+                            'name' => 'messages.xlf',
+                        ]],
+                    ],
+                ]));
+            },
+            'exportProjectTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/exports', $url);
+                $this->assertSame('{"targetLanguageId":"fr","fileIds":[12]}', $options['body']);
+
+                return new MockResponse(json_encode(['data' => ['url' => 'https://file.url']]));
+            },
+        ];
+
+        $filesDownloaderResponses = [
+            'downloadFile' => function (string $method, string $url) use ($responseContent): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://file.url/', $url);
+
+                return new MockResponse($responseContent);
+            },
+        ];
+
+        $loader = $this->getLoader();
+        $loader->expects($this->once())
+            ->method('load')
+            ->willReturn($expectedTranslatorBag->getCatalogue($locale));
+
+        $crowdinProvider = new CrowdinProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getXliffFileDumper(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2', self::PROJECT_ID, new MockHttpClient($filesDownloaderResponses));
+
+        $translatorBag = $crowdinProvider->read([$domain], [$locale]);
+
+        $this->assertEquals($expectedTranslatorBag->getCatalogues(), $translatorBag->getCatalogues());
+    }
+
+    public function getResponsesForOneLocaleAndOneDomain(): \Generator
+    {
+        $arrayLoader = new ArrayLoader();
+
+        $expectedTranslatorBagFr = new TranslatorBag();
+        $expectedTranslatorBagFr->addCatalogue($arrayLoader->load([
+            'index.hello' => 'Bonjour',
+            'index.greetings' => 'Bienvenue, {firstname} !',
+        ], 'fr', 'messages'));
+
+        yield ['fr', 'messages', <<<'XLIFF'
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="fr" datatype="database" tool-id="crowdin">
+    <header>
+      <tool tool-id="crowdin" tool-name="Crowdin" tool-version="1.0.25 20201211-1" tool-company="Crowdin"/>
+    </header>
+    <body>
+      <trans-unit id="crowdin:5fd89b853ee27904dd6c5f67" resname="index.hello" datatype="plaintext">
+        <source>index.hello</source>
+        <target state="translated">Bonjour</target>
+      </trans-unit>
+      <trans-unit id="crowdin:5fd89b8542e5aa5cc27457e2" resname="index.greetings" datatype="plaintext" extradata="crowdin:format=icu">
+        <source>index.greetings</source>
+        <target state="translated">Bienvenue, {firstname} !</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+XLIFF
+            ,
+            $expectedTranslatorBagFr,
+        ];
+    }
+
+    /**
+     * @dataProvider getResponsesForDefaultLocaleAndOneDomain
+     */
+    public function testReadForDefaultLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
+    {
+        $responses = [
+            'listFiles' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => [
+                            'id' => 12,
+                            'name' => 'messages.xlf',
+                        ]],
+                    ],
+                ]));
+            },
+            'downloadSource' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files/12/download', $url);
+
+                return new MockResponse(json_encode(['data' => ['url' => 'https://file.url']]));
+            },
+        ];
+
+        $filesDownloaderResponses = [
+            'downloadFile' => function (string $method, string $url) use ($responseContent): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://file.url/', $url);
+
+                return new MockResponse($responseContent);
+            },
+        ];
+
+        $loader = $this->getLoader();
+        $loader->expects($this->once())
+            ->method('load')
+            ->willReturn($expectedTranslatorBag->getCatalogue($locale));
+
+        $crowdinProvider = new CrowdinProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getXliffFileDumper(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2', self::PROJECT_ID, new MockHttpClient($filesDownloaderResponses));
+
+        $translatorBag = $crowdinProvider->read([$domain], [$locale]);
+
+        $this->assertEquals($expectedTranslatorBag->getCatalogues(), $translatorBag->getCatalogues());
+    }
+
+    public function getResponsesForDefaultLocaleAndOneDomain(): \Generator
+    {
+        $arrayLoader = new ArrayLoader();
+
+        $expectedTranslatorBagEn = new TranslatorBag();
+        $expectedTranslatorBagEn->addCatalogue($arrayLoader->load([
+            'index.hello' => 'Hello',
+            'index.greetings' => 'Welcome, {firstname} !',
+        ], 'en', 'messages'));
+
+        yield ['en', 'messages', <<<'XLIFF'
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="fr" datatype="plaintext" tool-id="crowdin">
+    <header>
+      <tool tool-id="symfony" tool-name="Symfony"/>
+    </header>
+    <body>
+      <trans-unit id="crowdin:5fd89b853ee27904dd6c5f67" resname="index.hello" datatype="plaintext">
+        <source>index.hello</source>
+        <target state="translated">Hello</target>
+      </trans-unit>
+      <trans-unit id="crowdin:5fd89b8542e5aa5cc27457e2" resname="index.greetings" datatype="plaintext" extradata="crowdin:format=icu">
+        <source>index.greetings</source>
+        <target state="translated">Welcome, {firstname} !</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
+XLIFF
+            ,
+            $expectedTranslatorBagEn,
+        ];
+    }
+
+    public function testDelete()
+    {
+        $responses = [
+            'listFiles' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/files', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => [
+                            'id' => 12,
+                            'name' => 'messages.xlf',
+                        ]],
+                    ],
+                ]));
+            },
+            'listStrings1' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/strings?fileId=12&limit=500&offset=0', $url);
+
+                return new MockResponse(json_encode([
+                    'data' => [
+                        ['data' => ['id' => 1, 'text' => 'en a']],
+                        ['data' => ['id' => 2, 'text' => 'en b']],
+                    ],
+                ]));
+            },
+            'listStrings2' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/strings?fileId=12&limit=500&offset=500', $url);
+
+                $response = $this->createMock(ResponseInterface::class);
+                $response->expects($this->any())
+                    ->method('getContent')
+                    ->with(false)
+                    ->willReturn(json_encode(['data' => []]));
+
+                return $response;
+            },
+            'deleteString1' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('DELETE', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/strings/1', $url);
+
+                return new MockResponse('', ['http_code' => 204]);
+            },
+            'deleteString2' => function (string $method, string $url): ResponseInterface {
+                $this->assertSame('DELETE', $method);
+                $this->assertSame('https://api.crowdin.com/api/v2/projects/1/strings/2', $url);
+
+                return new MockResponse('', ['http_code' => 204]);
+            },
+        ];
+
+        $translatorBag = new TranslatorBag();
+        $translatorBag->addCatalogue(new MessageCatalogue('en', [
+            'messages' => [
+                'en a' => 'en a',
+                'en b' => 'en b',
+            ],
+        ]));
+
+        $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
+            'base_uri' => 'https://api.crowdin.com/api/v2/',
+            'headers' => [
+                'Authorization' => 'Bearer API_TOKEN',
+            ],
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/');
+
+        $provider->delete($translatorBag);
+    }
+}
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json b/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json
new file mode 100644
index 0000000000000..03ab95ef040b5
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/composer.json
@@ -0,0 +1,37 @@
+{
+    "name": "symfony/crowdin-translation-provider",
+    "type": "symfony-bridge",
+    "description": "Symfony Crowdin Translation Provider Bridge",
+    "keywords": ["crowdin", "translation", "provider"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Andrii Bodnar",
+            "homepage": "https://github.com/andrii-bodnar"
+        },
+        {
+            "name": "Mathieu Santostefano",
+            "homepage": "https://github.com/welcomattic"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.2.5",
+        "symfony/http-client": "^5.3",
+        "symfony/translation": "^5.3"
+    },
+    "require-dev": {
+        "symfony/config": "^4.4|^5.2"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Translation\\Bridge\\Crowdin\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist b/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist
new file mode 100644
index 0000000000000..b0a89cd69f655
--- /dev/null
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Crowdin Translation Provider Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
index 1ee9b55e83c1a..6f38f37cf3364 100644
--- a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
@@ -17,6 +17,10 @@
 class UnsupportedSchemeException extends LogicException
 {
     private const SCHEME_TO_PACKAGE_MAP = [
+        'crowdin' => [
+            'class' => Bridge\Crowdin\CrowdinProviderFactory::class,
+            'package' => 'symfony/crowdin-translation-provider',
+        ],
         'loco' => [
             'class' => Bridge\Loco\LocoProviderFactory::class,
             'package' => 'symfony/loco-translation-provider',

From 33304cc411d078b71ad7de49bcaaf6854a296211 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 9 May 2021 18:06:12 +0200
Subject: [PATCH 66/67] Update CHANGELOG for 5.3.0-BETA3

---
 CHANGELOG-5.3.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG-5.3.md b/CHANGELOG-5.3.md
index 4e3b81d8fa6e1..6926054183633 100644
--- a/CHANGELOG-5.3.md
+++ b/CHANGELOG-5.3.md
@@ -7,6 +7,35 @@ in 5.3 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/v5.3.0...v5.3.1
 
+* 5.3.0-BETA3 (2021-05-09)
+
+ * feature #40947 [Translation] Added Crowdin Translation Provider (andrii-bodnar)
+ * bug #41132 [Runtime] don't display the shebang on the CLI (nicolas-grekas)
+ * bug #41113 [Console] Fix Windows code page support (orkan)
+ * bug #40902 [Security] Allow ips parameter in access_control to accept comma-separated string (edefimov)
+ * bug #40980 [TwigBridge] Fix HTML for translatable custom-file label in Bootstrap 4 theme (acran)
+ * bug #40955 [Notifier] [Bridge] Fix missed messageId for SendMessage object in slack notifier (WaylandAce)
+ * bug #40943 [PropertyInfo] PhpDocExtractor: Handle "true" and "false" property types (Maciej Zgadzaj)
+ * bug #40759 [Form] Add missing TranslatableMessage support to choice_label option of ChoiceType (alexandre-daubois)
+ * bug #40917 [Config][DependencyInjection] Uniformize trailing slash handling (dunglas)
+ * bug #40699 [PropertyInfo] Make ReflectionExtractor correctly extract nullability (shiftby)
+ * bug #40874 [PropertyInfo] fix attribute namespace with recursive traits (soullivaneuh)
+ * bug #40957 [PhpUnitBridge] Fix tests with ``@doesNotPerformAssertions`` annotations (alexpott)
+ * bug #41099 [Cache] Check if phpredis version is compatible with stream parameter (nicolassing)
+ * bug #40982 [Notifier] Fix return SentMessage then Messenger not used (WaylandAce)
+ * bug #40972 Avoid regenerating the remember me token if it is still fresh (Seldaek)
+ * bug #41072 [VarExporter] Add support of PHP enumerations (alexandre-daubois)
+ * feature #40992 [Notifier] Add SlackOptions::threadTs() to send message as reply (WaylandAce)
+ * bug #41104 Fix return type in isAllowedProperty method on ReflectionExtractor class (Tomanhez)
+ * bug #41078 [Notifier] Make FailoverTransport always pick the first transport (jschaedl)
+ * feature #39157 [TwigBridge] Add form templates for Bootstrap 5 (ker0x)
+ * bug #41022 [PasswordHasher] Improved BC layer (derrabus)
+ * bug #41105 [Inflector][String] Fixed singularize `edges` > `edge` (ruudk)
+ * bug #41075 [ErrorHandler] Skip "same vendor" ``@method`` deprecations for `Symfony\*` classes unless symfony/symfony is being tested (nicolas-grekas)
+ * bug #41096 Make Serializable implementation internal and final (derrabus)
+ * bug #40994 [Config] More accurate message on invalid config builder (a-menshchikov)
+ * bug #40767 [Routing] Fix localized paths (l-vo)
+
 * 5.3.0-BETA2 (2021-05-01)
 
  * feature #41002 [FrameworkBundle][HttpKernel] Move IDE file link formats from FrameworkExtension to FileLinkFormatter (MatTheCat)

From b30f848e1d864593ce9e5b96f1f443116ef3e0b9 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 9 May 2021 18:06:21 +0200
Subject: [PATCH 67/67] Update VERSION for 5.3.0-BETA3

---
 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 330ca1ef85c7d..606b06a14431c 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -75,12 +75,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     private static $freshCache = [];
 
-    public const VERSION = '5.3.0-DEV';
+    public const VERSION = '5.3.0-BETA3';
     public const VERSION_ID = 50300;
     public const MAJOR_VERSION = 5;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = 'BETA3';
 
     public const END_OF_MAINTENANCE = '05/2021';
     public const END_OF_LIFE = '01/2022';