handle session deprecations in 5.3 for make:auth tests

Author: jrushlow

tests/fixtures/MakeAuthenticatorLoginFormUserEntity/tests/SecurityControllerTest.php

@@ -6,6 +6,7 @@
 use App\Security\AppCustomAuthenticator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\Kernel;
 
 class SecurityControllerTest extends WebTestCase
 {
@@ -60,7 +61,17 @@ public function testCommand()
         $client->submit($form);
 
         $this->assertStringContainsString('TODO: provide a valid redirect', $client->getResponse()->getContent());
-        $this->assertNotNull($token = $client->getContainer()->get('security.token_storage')->getToken());
+
+        $tokenStorage = static::$container->get('security.token_storage');
+
+        // Handle Session deprecations in Symfony 5.3+
+        if (Kernel::VERSION_ID >= 50300) {
+            $tokenStorage->disableUsageTracking();
+        }
+
+        $token = $tokenStorage->getToken();
+
+        self::assertNotNull($token);
         $this->assertInstanceOf(User::class, $token->getUser());
     }
 }

tests/fixtures/MakeAuthenticatorLoginFormUserEntityLogout/tests/SecurityControllerTest.php

@@ -6,6 +6,8 @@
 use App\Security\AppCustomAuthenticator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class SecurityControllerTest extends WebTestCase
 {
@@ -60,10 +62,23 @@ public function testCommand()
         $client->submit($form);
 
         $this->assertStringContainsString('TODO: provide a valid redirect', $client->getResponse()->getContent());
-        $this->assertNotNull($token = $client->getContainer()->get('security.token_storage')->getToken());
-        $this->assertInstanceOf(User::class, $token->getUser());
+        $this->assertInstanceOf(User::class, $this->getToken()->getUser());
 
         $client->request('GET', '/logout');
-        $this->assertNull($client->getContainer()->get('security.token_storage')->getToken());
+        $this->assertNull($this->getToken());
+    }
+
+    /**
+     * Handle Session deprecations in Symfony 5.3+
+     */
+    private function getToken(): ?TokenInterface
+    {
+        $tokenStorage = static::$container->get('security.token_storage');
+
+        if (Kernel::VERSION_ID >= 50300) {
+            $tokenStorage->disableUsageTracking();
+        }
+
+        return $tokenStorage->getToken();
     }
 }

tests/fixtures/MakeAuthenticatorSecurity52LoginForm/tests/SecurityControllerTest.php

@@ -6,6 +6,7 @@
 use App\Security\AppTestSecurity52LoginFormAuthenticator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -68,7 +69,17 @@ public function testLoginFormAuthenticatorUsingSecurity51(): void
         $client->submit($form);
 
         self::assertStringContainsString('TODO: provide a valid redirect', $client->getResponse()->getContent());
-        self::assertNotNull($token = $client->getContainer()->get('security.token_storage')->getToken());
+
+        $tokenStorage = static::$container->get('security.token_storage');
+
+        // Handle Session deprecations in Symfony 5.3+
+        if (Kernel::VERSION_ID >= 50300) {
+            $tokenStorage->disableUsageTracking();
+        }
+
+        $token = $tokenStorage->getToken();
+
+        self::assertNotNull($token);
         self::assertInstanceOf(User::class, $token->getUser());
     }
 }