Merge branch '4.4' into 5.0

* 4.4:
  Fixed translations file dumper behavior
  When set, get secret from config variable
  [FrameworkBundle] Set the parameter bag as resolved in ContainerLintCommand
  [SecurityBundle] Fix switch_user provider configuration handling

Author: fabpot

DependencyInjection/Security/Factory/AnonymousFactory.php

@@ -24,19 +24,19 @@ class AnonymousFactory implements SecurityFactoryInterface
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
         if (null === $config['secret']) {
-            $firewall['anonymous']['secret'] = new Parameter('container.build_hash');
+            $config['secret'] = new Parameter('container.build_hash');
         }
 
         $listenerId = 'security.authentication.listener.anonymous.'.$id;
         $container
             ->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.anonymous'))
-            ->replaceArgument(1, $firewall['anonymous']['secret'])
+            ->replaceArgument(1, $config['secret'])
         ;
 
         $providerId = 'security.authentication.provider.anonymous.'.$id;
         $container
             ->setDefinition($providerId, new ChildDefinition('security.authentication.provider.anonymous'))
-            ->replaceArgument(0, $firewall['anonymous']['secret'])
+            ->replaceArgument(0, $config['secret'])
         ;
 
         return [$providerId, $listenerId, $defaultEntryPoint];

DependencyInjection/SecurityExtension.php

@@ -676,7 +676,7 @@ private function createExceptionListener(ContainerBuilder $container, array $con
         return $exceptionListenerId;
     }
 
-    private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, string $defaultProvider, bool $stateless): string
+    private function createSwitchUserListener(ContainerBuilder $container, string $id, array $config, ?string $defaultProvider, bool $stateless): string
     {
         $userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
 

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -389,6 +389,30 @@ public function sessionConfigurationProvider()
         ];
     }
 
+    public function testSwitchUserWithSeveralDefinedProvidersButNoFirewallRootProviderConfigured()
+    {
+        $container = $this->getRawContainer();
+        $container->loadFromExtension('security', [
+            'providers' => [
+                'first' => ['id' => 'foo'],
+                'second' => ['id' => 'bar'],
+            ],
+
+            'firewalls' => [
+                'foobar' => [
+                    'switch_user' => [
+                        'provider' => 'second',
+                    ],
+                    'anonymous' => true,
+                ],
+            ],
+        ]);
+
+        $container->compile();
+
+        $this->assertEquals(new Reference('security.user.provider.concrete.second'), $container->getDefinition('security.authentication.switchuser_listener.foobar')->getArgument(1));
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();