Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 07dfb3e9efaf · 2021-09-07T12:23:40.000+02:00
* 5.4:
  cs fix
  Fix tests when security-http 5.4 uses security-core 6.0
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -335,10 +335,8 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
             $session->set('_security_session', $original);
         }
 
-        $tokenStorage = new UsageTrackingTokenStorage(new TokenStorage(), new class(['request_stack' => function () use ($requestStack) {
-            return $requestStack;
-        },
-        ]) implements ContainerInterface {
+        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $tokenStorage = new UsageTrackingTokenStorage(new TokenStorage(), new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
 
@@ -382,17 +380,9 @@ private function handleEventWithPreviousSession($userProviders, UserInterface $u
 
         $tokenStorage = new TokenStorage();
         $usageIndex = $session->getUsageIndex();
-        $tokenStorage = new UsageTrackingTokenStorage($tokenStorage, new class(
-            (new \ReflectionClass(UsageTrackingTokenStorage::class))->hasMethod('getSession') ? [
-                'request_stack' => function () use ($requestStack) {
-                return $requestStack;
-            }] : [
-                // BC for symfony/framework-bundle < 5.3
-                'session' => function () use ($session) {
-                    return $session;
-                },
-            ]
-        ) implements ContainerInterface {
+
+        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $tokenStorage = new UsageTrackingTokenStorage($tokenStorage, new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
         $sessionTrackerEnabler = [$tokenStorage, 'enableUsageTracking'];
