Usage of scopes in sessions and auth, adding CurrentRequest

src/AuthHttp/src/Middleware/AuthMiddleware.php

@@ -22,13 +22,17 @@
 final class AuthMiddleware implements MiddlewareInterface
 {
     public const ATTRIBUTE = 'authContext';
+    public const TOKEN_STORAGE_ATTRIBUTE = 'tokenStorage';
 
+    /**
+     * @param ScopeInterface $scope. Deprecated, will be removed in v4.0.
+     */
     public function __construct(
         private readonly ScopeInterface $scope,
         private readonly ActorProviderInterface $actorProvider,
         private readonly TokenStorageInterface $tokenStorage,
         private readonly TransportRegistry $transportRegistry,
-        private readonly ?EventDispatcherInterface $eventDispatcher = null
+        private readonly ?EventDispatcherInterface $eventDispatcher = null,
     ) {
     }
 
@@ -39,12 +43,10 @@ public function process(Request $request, RequestHandlerInterface $handler): Res
     {
         $authContext = $this->initContext($request, new AuthContext($this->actorProvider, $this->eventDispatcher));
 
-        $response = $this->scope->runScope(
-            [
-                AuthContextInterface::class => $authContext,
-                TokenStorageInterface::class => $this->tokenStorage,
-            ],
-            static fn () => $handler->handle($request->withAttribute(self::ATTRIBUTE, $authContext))
+        $response = $handler->handle(
+            $request
+                ->withAttribute(self::ATTRIBUTE, $authContext)
+                ->withAttribute(self::TOKEN_STORAGE_ATTRIBUTE, $this->tokenStorage),
         );
 
         return $this->closeContext($request, $response, $authContext);
@@ -85,15 +87,15 @@ private function closeContext(Request $request, Response $response, AuthContextI
             return $transport->removeToken(
                 $request,
                 $response,
-                $authContext->getToken()->getID()
+                $authContext->getToken()->getID(),
             );
         }
 
         return $transport->commitToken(
             $request,
             $response,
             $authContext->getToken()->getID(),
-            $authContext->getToken()->getExpiresAt()
+            $authContext->getToken()->getExpiresAt(),
         );
     }
 }

src/AuthHttp/src/Middleware/AuthTransportMiddleware.php

@@ -21,6 +21,9 @@ final class AuthTransportMiddleware implements MiddlewareInterface
 {
     private readonly AuthMiddleware $authMiddleware;
 
+    /**
+     * @param ScopeInterface $scope. Deprecated, will be removed in v4.0.
+     */
     public function __construct(
         string $transportName,
         ScopeInterface $scope,

src/AuthHttp/src/Middleware/AuthTransportWithStorageMiddleware.php

@@ -21,6 +21,9 @@ final class AuthTransportWithStorageMiddleware implements MiddlewareInterface
 {
     private readonly MiddlewareInterface $authMiddleware;
 
+    /**
+     * @param ScopeInterface $scope. Deprecated, will be removed in v4.0.
+     */
     public function __construct(
         string $transportName,
         ScopeInterface $scope,

src/AuthHttp/tests/AuthTransportWithStorageMiddlewareTest.php

@@ -4,8 +4,6 @@
 
 namespace Spiral\Tests\Auth;
 
-use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -19,54 +17,63 @@
 use Spiral\Auth\TransportRegistry;
 use Spiral\Core\ScopeInterface;
 
-final class AuthTransportWithStorageMiddlewareTest extends TestCase
+final class AuthTransportWithStorageMiddlewareTest extends ScopedTestCase
 {
     public function testProcessMiddlewareWithTokenStorageProvider(): void
     {
-        $serverRequest = m::mock(ServerRequestInterface::class);
-        $storageProvider = m::mock(TokenStorageProviderInterface::class);
-        $scope = m::mock(ScopeInterface::class);
-        $response = m::mock(ResponseInterface::class);
+        $storageProvider = $this->createMock(TokenStorageProviderInterface::class);
+        $storageProvider
+            ->expects($this->once())
+            ->method('getStorage')
+            ->with('session')
+            ->willReturn($tokenStorage = $this->createMock(TokenStorageInterface::class));
 
-        $storageProvider->shouldReceive('getStorage')->once()->with('session')->andReturn(
-            $tokenStorage = m::mock(TokenStorageInterface::class)
-        );
+        $matcher = $this->exactly(2);
+        $request = $this->createMock(ServerRequestInterface::class);
+        $request
+            ->expects($this->exactly(2))
+            ->method('withAttribute')
+            ->willReturnCallback(function (string $key, string $value) use ($matcher, $tokenStorage) {
+                match ($matcher->numberOfInvocations()) {
+                    1 =>  $this->assertInstanceOf(AuthContextInterface::class, $value),
+                    2 =>  $this->assertSame($tokenStorage, $value),
+                };
+            })
+            ->willReturnSelf();
+
+        $response = $this->createMock(ResponseInterface::class);
 
         $registry = new TransportRegistry();
-        $registry->setTransport('header', $transport = m::mock(HttpTransportInterface::class));
+        $registry->setTransport('header', $transport = $this->createMock(HttpTransportInterface::class));
 
-        $transport->shouldReceive('fetchToken')->once()->with($serverRequest)->andReturn('fooToken');
-        $transport->shouldReceive('commitToken')->once()->with($serverRequest, $response, '123', null)
-            ->andReturn($response);
+        $transport->expects($this->once())->method('fetchToken')->with($request)->willReturn('fooToken');
+        $transport->expects($this->once())->method('commitToken')->with($request, $response, '123', null)
+            ->willReturn($response);
 
-        $tokenStorage->shouldReceive('load')->once()->with('fooToken')->andReturn(
-            $token = m::mock(TokenInterface::class)
-        );
+        $tokenStorage
+            ->expects($this->once())
+            ->method('load')
+            ->with('fooToken')
+            ->willReturn($token = $this->createMock(TokenInterface::class));
 
-        $scope
-            ->shouldReceive('runScope')
-            ->once()
-            ->withArgs(
-                fn(array $bindings, callable $callback) => $bindings[AuthContextInterface::class]
-                        ->getToken() instanceof $token
-            )
-            ->andReturn($response);
-
-        $token->shouldReceive('getID')->once()->andReturn('123');
-        $token->shouldReceive('getExpiresAt')->once()->andReturnNull();
+        $token->expects($this->once())->method('getID')->willReturn('123');
+        $token->expects($this->once())->method('getExpiresAt')->willReturn(null);
 
         $middleware = new AuthTransportWithStorageMiddleware(
             'header',
-            $scope,
-            m::mock(ActorProviderInterface::class),
+            $this->createMock(ScopeInterface::class),
+            $this->createMock(ActorProviderInterface::class),
             $storageProvider,
             $registry,
             storage: 'session'
         );
 
+        $handler = $this->createMock(RequestHandlerInterface::class);
+        $handler->expects($this->once())->method('handle')->with($request)->willReturn($response);
+
         $this->assertSame(
             $response,
-            $middleware->process($serverRequest, m::mock(RequestHandlerInterface::class))
+            $middleware->process($request, $handler)
         );
     }
 }

src/AuthHttp/tests/CookieTransportTest.php

@@ -20,7 +20,7 @@
 use Spiral\Tests\Auth\Stub\TestAuthHttpStorage;
 use Spiral\Tests\Auth\Stub\TestAuthHttpToken;
 
-class CookieTransportTest extends BaseTestCase
+final class CookieTransportTest extends ScopedTestCase
 {
     public function testCookieToken(): void
     {
@@ -175,7 +175,7 @@ protected function getCore(HttpTransportInterface $transport): Http
 
         $http = new Http(
             $config,
-            new Pipeline($this->container),
+            new Pipeline($this->container, $this->container),
             new ResponseFactory($config),
             $this->container
         );

src/AuthHttp/tests/HeaderTransportTest.php

@@ -4,35 +4,23 @@
 
 namespace Spiral\Tests\Auth;
 
-use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Spiral\Auth\HttpTransportInterface;
 use Spiral\Auth\Middleware\AuthMiddleware;
 use Spiral\Auth\Transport\HeaderTransport;
 use Spiral\Auth\TransportRegistry;
-use Spiral\Core\Container;
 use Spiral\Http\Config\HttpConfig;
 use Spiral\Http\Http;
 use Spiral\Http\Pipeline;
-use Spiral\Telemetry\NullTracer;
-use Spiral\Telemetry\TracerInterface;
 use Spiral\Tests\Auth\Diactoros\ResponseFactory;
 use Nyholm\Psr7\ServerRequest;
 use Spiral\Tests\Auth\Stub\TestAuthHttpProvider;
 use Spiral\Tests\Auth\Stub\TestAuthHttpStorage;
 use Spiral\Tests\Auth\Stub\TestAuthHttpToken;
 
-class HeaderTransportTest extends TestCase
+final class HeaderTransportTest extends ScopedTestCase
 {
-    private Container $container;
-
-    public function setUp(): void
-    {
-        $this->container = new Container();
-        $this->container->bind(TracerInterface::class, new NullTracer($this->container));
-    }
-
     public function testHeaderToken(): void
     {
         $http = $this->getCore(new HeaderTransport());
@@ -168,7 +156,7 @@ protected function getCore(HttpTransportInterface $transport): Http
 
         $http = new Http(
             $config,
-            new Pipeline($this->container),
+            new Pipeline($this->container, $this->container),
             new ResponseFactory($config),
             $this->container
         );

src/AuthHttp/tests/Middleware/AuthMiddlewareTest.php

@@ -12,13 +12,13 @@
 use Spiral\Http\Config\HttpConfig;
 use Spiral\Http\Http;
 use Spiral\Http\Pipeline;
-use Spiral\Tests\Auth\BaseTestCase;
 use Spiral\Tests\Auth\Diactoros\ResponseFactory;
 use Nyholm\Psr7\ServerRequest;
+use Spiral\Tests\Auth\ScopedTestCase;
 use Spiral\Tests\Auth\Stub\TestAuthHttpProvider;
 use Spiral\Tests\Auth\Stub\TestAuthHttpStorage;
 
-class AuthMiddlewareTest extends BaseTestCase
+final class AuthMiddlewareTest extends ScopedTestCase
 {
     public function testAttributeRead(): void
     {
@@ -84,7 +84,7 @@ protected function getCore(array $middleware = []): Http
 
         return new Http(
             $config,
-            new Pipeline($this->container),
+            new Pipeline($this->container, $this->container),
             new ResponseFactory($config),
             $this->container
         );

src/AuthHttp/tests/Middleware/Firewall/BaseFirewallTestCase.php

@@ -11,12 +11,12 @@
 use Spiral\Http\Config\HttpConfig;
 use Spiral\Http\Http;
 use Spiral\Http\Pipeline;
-use Spiral\Tests\Auth\BaseTestCase;
 use Spiral\Tests\Auth\Diactoros\ResponseFactory;
+use Spiral\Tests\Auth\ScopedTestCase;
 use Spiral\Tests\Auth\Stub\TestAuthHttpProvider;
 use Spiral\Tests\Auth\Stub\TestAuthHttpStorage;
 
-abstract class BaseFirewallTestCase extends BaseTestCase
+abstract class BaseFirewallTestCase extends ScopedTestCase
 {
     protected function getCore(AbstractFirewall $firewall, HttpTransportInterface $transport): Http
     {
@@ -30,7 +30,7 @@ protected function getCore(AbstractFirewall $firewall, HttpTransportInterface $t
 
         $http = new Http(
             $config,
-            new Pipeline($this->container),
+            new Pipeline($this->container, $this->container),
             new ResponseFactory($config),
             $this->container
         );

src/AuthHttp/tests/ScopedTestCase.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\Tests\Auth;
+
+use Spiral\Core\Container;
+use Spiral\Core\Scope;
+
+abstract class ScopedTestCase extends BaseTestCase
+{
+    protected function runTest(): mixed
+    {
+        return $this->container->runScope(new Scope('http'), function (Container $container): mixed {
+            $this->container = $container;
+            return parent::runTest();
+        });
+    }
+}

src/Cookies/src/CookieQueue.php

@@ -4,6 +4,9 @@
 
 namespace Spiral\Cookies;
 
+use Spiral\Core\Attribute\Scope;
+
+#[Scope('http.request')]
 final class CookieQueue
 {
     public const ATTRIBUTE = 'cookieQueue';