Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 235c8a51ed52 · 2025-07-22T10:30:51.000+02:00
* 7.3: [ObjectMapper] Fix test using LazyObjectInterface [Security] Fix added $token argument to UserCheckerInterface::checkPostAuth() minor #61192 [ObjectMapper] add missing legacy group (xabbuh) bugfix(#61139): Only generate an outputDir if none is set.
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -995,7 +995,7 @@ public function checkPreAuth(UserInterface $user): void
     {
     }
 
-    public function checkPostAuth(UserInterface $user): void
+    public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void
     {
     }
 }
diff --git a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php b/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();
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/LazyFoo.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/LazyFoo.php
@@ -11,12 +11,28 @@
 
 namespace Symfony\Component\ObjectMapper\Tests\Fixtures;
 
-use Symfony\Component\VarExporter\LazyGhostTrait;
 use Symfony\Component\VarExporter\LazyObjectInterface;
 
 class LazyFoo extends \stdClass implements LazyObjectInterface
 {
-    use LazyGhostTrait;
+    private bool $initialized = false;
 
-    public string $name = 'foo';
+    public function isLazyObjectInitialized(bool $partial = false): bool
+    {
+        return $this->initialized;
+    }
+
+    public function initializeLazyObject(): object
+    {
+        $this->initialized = true;
+
+        return $this;
+    }
+
+    public function resetLazyObject(): bool
+    {
+        $this->initialized = false;
+
+        return true;
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/User/ChainUserChecker.php b/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);
         }
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php b/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
     {
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/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;
 }

Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,7 @@ public function checkPreAuth(UserInterface $user): void`
`995`	`995`	`{`
`996`	`996`	`}`
`997`	`997`
`998`		`- public function checkPostAuth(UserInterface $user): void`
	`998`	`+ public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void`
`999`	`999`	`{`
`1000`	`1000`	`}`
`1001`	`1001`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,15 @@ public function checkPreAuth(UserInterface $user): void`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void`
	`32`	`+ /**`
	`33`	`+ * @param ?TokenInterface $token`
	`34`	`+ */`
	`35`	`+ public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void`
`33`	`36`	`{`
`34`	`37`	`$token = 1 < \func_num_args() ? func_get_arg(1) : null;`
`35`	`38`
`36`	`39`	`foreach ($this->checkers as $checker) {`
`37`		`- if ($token instanceof TokenInterface) {`
`38`		`- $checker->checkPostAuth($user, $token);`
`39`		`- } else {`
`40`		`- $checker->checkPostAuth($user);`
`41`		`- }`
	`40`	`+ $checker->checkPostAuth($user, $token);`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ public function checkPreAuth(UserInterface $user): void`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function checkPostAuth(UserInterface $user): void`
	`36`	`+ /**`
	`37`	`+ * @param ?TokenInterface $token`
	`38`	`+ */`
	`39`	`+ public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void`
`37`	`40`	`{`
`38`	`41`	`}`
`39`	`42`	`}`