Merge branch '6.4' into 7.0

* 6.4:
  be explicit about the signal to reset
  fix Finder test using the ftp wrapper by switching the server being used
  use firewall-specific user checkers when manually logging in users

Author: xabbuh

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -560,6 +560,9 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
 
         $container->setAlias('security.user_checker.'.$id, new Alias($firewall['user_checker'], false));
 
+        $userCheckerLocator = $container->getDefinition('security.user_checker_locator');
+        $userCheckerLocator->replaceArgument(0, array_merge($userCheckerLocator->getArgument(0), [$id => new ServiceClosureArgument(new Reference('security.user_checker.'.$id))]));
+
         foreach ($this->getSortedFactories() as $factory) {
             $key = str_replace('-', '_', $factory->getKey());
             if ('custom_authenticators' !== $key && \array_key_exists($key, $firewall)) {

src/Symfony/Bundle/SecurityBundle/Resources/config/security.php

@@ -19,6 +19,7 @@
 use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
 use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
 use Symfony\Bundle\SecurityBundle\Security\LazyFirewallContext;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 use Symfony\Component\Ldap\Security\LdapUserProvider;
 use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver;
@@ -87,7 +88,7 @@
                     'security.authenticator.managers_locator' => service('security.authenticator.managers_locator')->ignoreOnInvalid(),
                     'request_stack' => service('request_stack'),
                     'security.firewall.map' => service('security.firewall.map'),
-                    'security.user_checker' => service('security.user_checker'),
+                    'security.user_checker_locator' => service('security.user_checker_locator'),
                     'security.firewall.event_dispatcher_locator' => service('security.firewall.event_dispatcher_locator'),
                     'security.csrf.token_manager' => service('security.csrf.token_manager')->ignoreOnInvalid(),
                 ]),
@@ -121,6 +122,8 @@
             ->args(['none'])
 
         ->set('security.user_checker', InMemoryUserChecker::class)
+        ->set('security.user_checker_locator', ServiceLocator::class)
+            ->args([[]])
 
         ->set('security.expression_language', ExpressionLanguage::class)
             ->args([service('cache.security_expression_language')->nullOnInvalid()])

src/Symfony/Bundle/SecurityBundle/Security.php

@@ -96,7 +96,8 @@ public function login(UserInterface $user, ?string $authenticatorName = null, ?s
 
         $authenticator = $this->getAuthenticator($authenticatorName, $firewallName);
 
-        $this->container->get('security.user_checker')->checkPreAuth($user);
+        $userCheckerLocator = $this->container->get('security.user_checker_locator');
+        $userCheckerLocator->get($firewallName)->checkPreAuth($user);
 
         return $this->container->get('security.authenticator.managers_locator')->get($firewallName)->authenticateUser($user, $authenticator, $request, $badges);
     }

src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php

@@ -142,7 +142,7 @@ public function testLogin()
                 ['request_stack', $requestStack],
                 ['security.firewall.map', $firewallMap],
                 ['security.authenticator.managers_locator', $this->createContainer('main', $userAuthenticator)],
-                ['security.user_checker', $userChecker],
+                ['security.user_checker_locator', $this->createContainer('main', $userChecker)],
             ])
         ;
 
@@ -188,7 +188,7 @@ public function testLoginReturnsAuthenticatorResponse()
                 ['request_stack', $requestStack],
                 ['security.firewall.map', $firewallMap],
                 ['security.authenticator.managers_locator', $this->createContainer('main', $userAuthenticator)],
-                ['security.user_checker', $userChecker],
+                ['security.user_checker_locator', $this->createContainer('main', $userChecker)],
             ])
         ;
 

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -71,12 +71,10 @@ protected function tearDown(): void
 
         if (\function_exists('pcntl_signal')) {
             // We reset all signals to their default value to avoid side effects
-            for ($i = 1; $i <= 15; ++$i) {
-                if (9 === $i) {
-                    continue;
-                }
-                pcntl_signal($i, \SIG_DFL);
-            }
+            pcntl_signal(\SIGINT, \SIG_DFL);
+            pcntl_signal(\SIGTERM, \SIG_DFL);
+            pcntl_signal(\SIGUSR1, \SIG_DFL);
+            pcntl_signal(\SIGUSR2, \SIG_DFL);
         }
     }
 

src/Symfony/Component/Console/Tests/ConsoleEventsTest.php

@@ -35,12 +35,10 @@ protected function tearDown(): void
         if (\function_exists('pcntl_signal')) {
             pcntl_async_signals(false);
             // We reset all signals to their default value to avoid side effects
-            for ($i = 1; $i <= 15; ++$i) {
-                if (9 === $i) {
-                    continue;
-                }
-                pcntl_signal($i, \SIG_DFL);
-            }
+            pcntl_signal(\SIGINT, \SIG_DFL);
+            pcntl_signal(\SIGTERM, \SIG_DFL);
+            pcntl_signal(\SIGUSR1, \SIG_DFL);
+            pcntl_signal(\SIGUSR2, \SIG_DFL);
         }
     }
 

src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php

@@ -23,12 +23,10 @@ protected function tearDown(): void
     {
         pcntl_async_signals(false);
         // We reset all signals to their default value to avoid side effects
-        for ($i = 1; $i <= 15; ++$i) {
-            if (9 === $i) {
-                continue;
-            }
-            pcntl_signal($i, \SIG_DFL);
-        }
+        pcntl_signal(\SIGINT, \SIG_DFL);
+        pcntl_signal(\SIGTERM, \SIG_DFL);
+        pcntl_signal(\SIGUSR1, \SIG_DFL);
+        pcntl_signal(\SIGUSR2, \SIG_DFL);
     }
 
     public function testOneCallbackForASignalSignalIsHandled()

src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php

@@ -27,7 +27,7 @@ protected function setUp(): void
      */
     public function testRewindOnFtp()
     {
-        $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        $i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $i->rewind();
 
@@ -39,11 +39,11 @@ public function testRewindOnFtp()
      */
     public function testSeekOnFtp()
     {
-        $i = new RecursiveDirectoryIterator('ftp://speedtest:[email protected]/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        $i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $contains = [
-            'ftp://speedtest:[email protected]'.\DIRECTORY_SEPARATOR.'test100Mb.db',
-            'ftp://speedtest:[email protected]'.\DIRECTORY_SEPARATOR.'test100k.db',
+            'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'pub',
+            'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'readme.txt',
         ];
         $actual = [];