Merge branch '5.3' into 5.4

* 5.3: fixes issue #41478 by resetting the $attributes array per controller argument [Security] Fix setUsername() deprecation message Add conflict with property-info < 5.3 Fix Symfony 5.3 end of maintenance date Bump Symfony version to 5.3.1 Update VERSION for 5.3.0 Update CHANGELOG for 5.3.0 [FrameworkBundle] fix ConfigBuilderCacheWarmer [FrameworkBundle] fix creating ContainerBuilder at warmup/CLI time [Framework] Remove redundant cache service Remove PoEditor Provider
symfony · mbrodala · May 12, 2021 · May 19, 2021 · May 19, 2021 · May 19, 2021
commit c4404fd5a6a7705de70bbac6b2d01b60a9bf79da
diff --git a/CHANGELOG-5.3.md b/CHANGELOG-5.3.md
@@ -7,6 +7,24 @@ 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 (2021-05-31)
+
+ * bug #41458 [FrameworkBundle] fix ConfigBuilderCacheWarmer (nicolas-grekas)
+ * bug #41456 [FrameworkBundle] fix creating ContainerBuilder at warmup/CLI time (nicolas-grekas)
+ * bug #41452 [FrameworkBundle] Remove redundant cache service (derrabus)
+ * bug #41451 [Translation] Remove PoEditor Provider (welcoMattic)
+ * bug #41000 [Form] Use !isset for checks cause this doesn't falsely include 0 (Kai Dederichs)
+ * bug #41407 [DependencyInjection] keep container.service_subscriber tag on the decorated definition (xabbuh)
+ * bug #40866 [Filesystem] fix readlink() for Windows (a1812)
+ * bug #41402 [HttpKernel] Throw when HttpKernel is created and the env is empty (nicolas-grekas)
+ * bug #41376 [SecurityBundle] Don't register deprecated listeners with authenticator manager enabled (chalasr)
+ * bug #41394 [Form] fix support for years outside of the 32b range on x86 arch (nicolas-grekas)
+ * bug #41380 Make Mailgun Header compatible with other Bridges (jderusse)
+ * bug #39847 [Messenger] Fix merging PrototypedArrayNode associative values (svityashchuk)
+ * bug #41367 [Ldap] Avoid calling the deprecated getUsername() (derrabus)
+ * bug #41346 [WebProfilerBundle] Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed (weaverryan)
+ * bug #41344 [VarDumper] Don't pass null to parse_url() (derrabus)
+
 * 5.3.0-RC1 (2021-05-19)
 
  * security #cve-2021-21424 [Security\Core] Fix user enumeration via response body on invalid credentials (chalasr)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -12,10 +12,10 @@
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
 use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Command\BuildDebugContainerTrait;
 use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\Builder\ConfigBuilderGeneratorInterface;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
@@ -28,8 +28,6 @@
  */
 class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 {
-    use BuildDebugContainerTrait;
-
     private $kernel;
     private $logger;
 
@@ -73,7 +71,7 @@ private function dumpExtension(ExtensionInterface $extension, ConfigBuilderGener
         if ($extension instanceof ConfigurationInterface) {
             $configuration = $extension;
         } elseif ($extension instanceof ConfigurationExtensionInterface) {
-            $configuration = $extension->getConfiguration([], $this->getContainerBuilder($this->kernel));
+            $configuration = $extension->getConfiguration([], new ContainerBuilder($this->kernel->getContainer()->getParameterBag()));
         }
 
         if (!$configuration) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php
@@ -40,7 +40,11 @@ protected function getContainerBuilder(KernelInterface $kernel): ContainerBuilde
         }
 
         if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
-            $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
+            $buildContainer = \Closure::bind(function () {
+                $this->initializeBundles();
+
+                return $this->buildContainer();
+            }, $kernel, \get_class($kernel));
             $container = $buildContainer();
             $container->getCompilerPassConfig()->setRemovingPasses([]);
             $container->getCompilerPassConfig()->setAfterRemovingPasses([]);

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -172,7 +172,6 @@
 use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
 use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
 use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProviderFactory;
-use Symfony\Component\Translation\Bridge\PoEditor\PoEditorProviderFactory;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
 use Symfony\Component\Translation\PseudoLocalizationTranslator;
 use Symfony\Component\Translation\Translator;
@@ -1345,15 +1344,12 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             CrowdinProviderFactory::class => 'translation.provider_factory.crowdin',
             LocoProviderFactory::class => 'translation.provider_factory.loco',
             LokaliseProviderFactory::class => 'translation.provider_factory.lokalise',
-            PoEditorProviderFactory::class => 'translation.provider_factory.poeditor',
         ];
 
         $parentPackages = ['symfony/framework-bundle', 'symfony/translation', 'symfony/http-client'];
 
         foreach ($classToServices as $class => $service) {
-            switch ($package = substr($service, \strlen('translation.provider_factory.'))) {
-                case 'poeditor': $package = 'po-editor'; break;
-            }
+            $package = substr($service, \strlen('translation.provider_factory.'));
 
             if (!$container->hasDefinition('http_client') || !ContainerBuilder::willBeAvailable(sprintf('symfony/%s-translation-provider', $package), $class, $parentPackages)) {
                 $container->removeDefinition($service);
@@ -1555,7 +1551,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
             $container->setDefinition('annotations.cached_reader', $container->getDefinition('annotations.psr_cached_reader'));
 
             if ('php_array' === $config['cache']) {
-                $cacheService = 'annotations.psr_cache';
+                $cacheService = 'annotations.cache_adapter';
 
                 // Enable warmer only if PHP array is used for cache
                 $definition = $container->findDefinition('annotations.cache_warmer');

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
@@ -68,10 +68,11 @@
                 param('kernel.cache_dir').'/annotations.php',
                 service('cache.annotations'),
             ])
+            ->tag('container.hot_path')
 
         ->set('annotations.cache', DoctrineProvider::class)
             ->args([
-                service('annotations.cache_adapter')
+                service('annotations.cache_adapter'),
             ])
             ->tag('container.hot_path')
 
@@ -86,13 +87,6 @@
                     inline_service(ArrayAdapter::class),
                     abstract_arg('Debug-Flag'),
                 ])
-            ->set('annotations.psr_cache', PhpArrayAdapter::class)
-                ->factory([PhpArrayAdapter::class, 'create'])
-                ->args([
-                    param('kernel.cache_dir').'/annotations.php',
-                    service('cache.annotations'),
-                ])
-                ->tag('container.hot_path')
         ;
     }
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
 use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
 use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProviderFactory;
-use Symfony\Component\Translation\Bridge\PoEditor\PoEditorProviderFactory;
 use Symfony\Component\Translation\Provider\NullProviderFactory;
 use Symfony\Component\Translation\Provider\TranslationProviderCollection;
 use Symfony\Component\Translation\Provider\TranslationProviderCollectionFactory;
@@ -63,14 +62,5 @@
                 service('translation.loader.xliff'),
             ])
             ->tag('translation.provider_factory')
-
-        ->set('translation.provider_factory.poeditor', PoEditorProviderFactory::class)
-            ->args([
-                service('http_client'),
-                service('logger'),
-                param('kernel.default_locale'),
-                service('translation.loader.xliff'),
-            ])
-            ->tag('translation.provider_factory')
     ;
 };
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -34,6 +34,7 @@ public function createArgumentMetadata($controller): array
         }
 
         foreach ($reflection->getParameters() as $param) {
+            $attributes = [];
             if (\PHP_VERSION_ID >= 80000) {
                 foreach ($param->getAttributes() as $reflectionAttribute) {
                     if (class_exists($reflectionAttribute->getName())) {
@@ -42,7 +43,7 @@ public function createArgumentMetadata($controller): array
                 }
             }
 
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull(), $attributes ?? []);
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull(), $attributes);
         }
 
         return $arguments;

diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -140,6 +140,18 @@ public function testMultipleAttributes()
         $this->assertCount(1, $this->factory->createArgumentMetadata([new AttributeController(), 'multiAttributeArg'])[0]->getAttributes());
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testIssue41478()
+    {
+        $arguments = $this->factory->createArgumentMetadata([new AttributeController(), 'issue41478']);
+        $this->assertEquals([
+            new ArgumentMetadata('baz', 'string', false, false, null, false, [new Foo('bar')]),
+            new ArgumentMetadata('bat', 'string', false, false, null, false, []),
+        ], $arguments);
+    }
+
     private function signature1(self $foo, array $bar, callable $baz)
     {
     }

diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/AttributeController.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/AttributeController.php
@@ -20,4 +20,7 @@ public function action(#[Foo('bar')] string $baz) {
 
     public function multiAttributeArg(#[Foo('bar'), Undefined('bar')] string $baz) {
     }
+
+    public function issue41478(#[Foo('bar')] string $baz, string $bat) {
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/Exception/UserNotFoundException.php b/src/Symfony/Component/Security/Core/Exception/UserNotFoundException.php
@@ -62,7 +62,7 @@ public function setUserIdentifier(string $identifier): void
      */
     public function setUsername(string $username)
     {
-        trigger_deprecation('symfony/security-core', '5.3', 'Method "%s()" is deprecated, use getUserIdentifier() instead.', __METHOD__);
+        trigger_deprecation('symfony/security-core', '5.3', 'Method "%s()" is deprecated, use setUserIdentifier() instead.', __METHOD__);
 
         $this->identifier = $username;
     }

@@ -47,7 +47,7 @@
         "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/dependency-injection": "<4.4",
         "symfony/property-access": "<4.4",
-        "symfony/property-info": "<4.4",
+        "symfony/property-info": "<5.3",
         "symfony/yaml": "<4.4"
     },
     "suggest": {

diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/.gitattributes b/src/Symfony/Component/Translation/Bridge/PoEditor/.gitattributes
diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/.gitignore b/src/Symfony/Component/Translation/Bridge/PoEditor/.gitignore
diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/CHANGELOG.md b/src/Symfony/Component/Translation/Bridge/PoEditor/CHANGELOG.md
diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/LICENSE b/src/Symfony/Component/Translation/Bridge/PoEditor/LICENSE
diff --git a/src/Symfony/Component/Translation/Bridge/PoEditor/PoEditorHttpClient.php b/src/Symfony/Component/Translation/Bridge/PoEditor/PoEditorHttpClient.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,7 @@ public function action(#[Foo('bar')] string $baz) { @@
         public function multiAttributeArg(#[Foo('bar'), Undefined('bar')] string $baz) {
         }
+        public function issue41478(#[Foo('bar')] string $baz, string $bat) {
+        }
     }