Merge branch '7.2' into 7.3

* 7.2:
  [Security] Fix added $token argument to UserCheckerInterface::checkPostAuth()
  bugfix(symfony#61139): Only generate an outputDir if none is set.

Author: nicolas-grekas

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

@@ -986,7 +986,7 @@ public function checkPreAuth(UserInterface $user): void
     {
     }
 
-    public function checkPostAuth(UserInterface $user): void
+    public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void
     {
     }
 }

src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php

@@ -159,10 +159,12 @@ public function testSetExtraKeyMethodIsNotGeneratedWhenAllowExtraKeysIsFalse()
      */
     private function generateConfigBuilder(string $configurationClass, ?string &$outputDir = null)
     {
-        $outputDir = tempnam(sys_get_temp_dir(), 'sf_config_builder_');
-        unlink($outputDir);
-        mkdir($outputDir);
-        $this->tempDir[] = $outputDir;
+        if (null === $outputDir) {
+            $outputDir = tempnam(sys_get_temp_dir(), 'sf_config_builder_');
+            unlink($outputDir);
+            mkdir($outputDir);
+            $this->tempDir[] = $outputDir;
+        }
 
         $configuration = new $configurationClass();
         $rootNode = $configuration->getConfigTreeBuilder()->buildTree();

src/Symfony/Component/Security/Core/User/ChainUserChecker.php

@@ -29,16 +29,15 @@ public function checkPreAuth(UserInterface $user): void
         }
     }
 
-    public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void
+    /**
+     * @param ?TokenInterface $token
+     */
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
     {
         $token = 1 < \func_num_args() ? func_get_arg(1) : null;
 
         foreach ($this->checkers as $checker) {
-            if ($token instanceof TokenInterface) {
-                $checker->checkPostAuth($user, $token);
-            } else {
-                $checker->checkPostAuth($user);
-            }
+            $checker->checkPostAuth($user, $token);
         }
     }
 }

src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php

@@ -33,7 +33,10 @@ public function checkPreAuth(UserInterface $user): void
         }
     }
 
-    public function checkPostAuth(UserInterface $user): void
+    /**
+     * @param ?TokenInterface $token
+     */
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
     {
     }
 }

src/Symfony/Component/Security/Core/User/UserCheckerInterface.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Core\User;
 
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AccountStatusException;
 
 /**
@@ -33,7 +34,9 @@ public function checkPreAuth(UserInterface $user): void;
     /**
      * Checks the user account after authentication.
      *
+     * @param ?TokenInterface $token
+     *
      * @throws AccountStatusException
      */
-    public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void;
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void;
 }