do not mock the RequestStack class

Author: xabbuh

Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php

@@ -13,9 +13,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\UsageTrackingTokenStorage;
@@ -25,28 +26,14 @@ class UsageTrackingTokenStorageTest extends TestCase
 {
     public function testGetSetToken()
     {
-        $sessionAccess = 0;
-        $sessionLocator = new class(['request_stack' => function () use (&$sessionAccess) {
-            $session = $this->createMock(SessionInterface::class);
-
-            $request = new Request();
-            $request->setSession($session);
-            $requestStack = $this->getMockBuilder(RequestStack::class)->onlyMethods(['getSession'])->getMock();
-            $requestStack->push($request);
-            $requestStack->expects($this->any())->method('getSession')->willReturnCallback(function () use ($session, &$sessionAccess) {
-                ++$sessionAccess;
-
-                $session->expects($this->once())
-                        ->method('getMetadataBag');
-
-                return $session;
-            });
-
-            return $requestStack;
-        }]) implements ContainerInterface {
-            use ServiceLocatorTrait;
-        };
         $tokenStorage = new TokenStorage();
+        $session = new Session();
+        $request = new Request();
+        $request->setSession($session);
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+        $sessionLocator = new ContainerBuilder();
+        $sessionLocator->set('request_stack', $requestStack);
         $trackingStorage = new UsageTrackingTokenStorage($tokenStorage, $sessionLocator);
 
         $this->assertNull($trackingStorage->getToken());
@@ -55,15 +42,15 @@ public function testGetSetToken()
         $trackingStorage->setToken($token);
         $this->assertSame($token, $trackingStorage->getToken());
         $this->assertSame($token, $tokenStorage->getToken());
-        $this->assertSame(0, $sessionAccess);
+        $this->assertSame(0, $session->getUsageIndex());
 
         $trackingStorage->enableUsageTracking();
         $this->assertSame($token, $trackingStorage->getToken());
-        $this->assertSame(1, $sessionAccess);
+        $this->assertSame(1, $session->getUsageIndex());
 
         $trackingStorage->disableUsageTracking();
         $this->assertSame($token, $trackingStorage->getToken());
-        $this->assertSame(1, $sessionAccess);
+        $this->assertSame(1, $session->getUsageIndex());
     }
 
     public function testWithoutMainRequest()

composer.json

@@ -25,6 +25,7 @@
         "psr/container": "^1.1|^2.0",
         "psr/cache": "^1.0|^2.0|^3.0",
         "symfony/cache": "^6.4|^7.0",
+        "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/expression-language": "^6.4|^7.0",
         "symfony/http-foundation": "^6.4|^7.0",
@@ -35,6 +36,7 @@
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
+        "symfony/dependency-injection": "<6.4",
         "symfony/event-dispatcher": "<6.4",
         "symfony/http-foundation": "<6.4",
         "symfony/ldap": "<6.4",