Integrate Container Scopes

composer.json

@@ -78,7 +78,7 @@
             "Spiral\\Cookies\\": "src/Cookies/src",
             "Spiral\\Core\\": [
                 "src/Core/src",
-                "src/Hmvc/src"
+                "src/Hmvc/src/Core"
             ],
             "Spiral\\Csrf\\": "src/Csrf/src",
             "Spiral\\Debug\\": "src/Debug/src",
@@ -90,6 +90,7 @@
             "Spiral\\Files\\": "src/Files/src",
             "Spiral\\Filters\\": "src/Filters/src",
             "Spiral\\Http\\": "src/Http/src",
+            "Spiral\\Interceptors\\": "src/Hmvc/src/Interceptors",
             "Spiral\\Logger\\": "src/Logger/src",
             "Spiral\\Mailer\\": "src/Mailer/src",
             "Spiral\\Models\\": "src/Models/src",
@@ -135,7 +136,7 @@
         "rector/rector": "0.18.1",
         "spiral/code-style": "^1.1",
         "spiral/nyholm-bridge": "^1.2",
-        "spiral/testing": "^2.7",
+        "spiral/testing": "dev-feature/scopes as 2.8.0",
         "spiral/validator": "^1.3",
         "google/protobuf": "^3.25",
         "symplify/monorepo-builder": "^10.2.7",
@@ -158,7 +159,7 @@
             "Spiral\\Tests\\Cookies\\": "src/Cookies/tests",
             "Spiral\\Tests\\Core\\": [
                 "src/Core/tests",
-                "src/Hmvc/tests"
+                "src/Hmvc/tests/Core"
             ],
             "Spiral\\Tests\\Csrf\\": "src/Csrf/tests",
             "Spiral\\Tests\\Debug\\": "src/Debug/tests",
@@ -171,6 +172,7 @@
             "Spiral\\Tests\\Filters\\": "src/Filters/tests",
             "Spiral\\Tests\\Framework\\": "tests/Framework",
             "Spiral\\Tests\\Http\\": "src/Http/tests",
+            "Spiral\\Tests\\Interceptors\\": "src/Hmvc/tests/Interceptors",
             "Spiral\\Tests\\Logger\\": "src/Logger/tests",
             "Spiral\\Tests\\Mailer\\": "src/Mailer/tests",
             "Spiral\\Tests\\Models\\": "src/Models/tests",

src/AnnotatedRoutes/composer.json

@@ -40,6 +40,7 @@
         "mockery/mockery": "^1.5",
         "phpunit/phpunit": "^10.1",
         "spiral/framework": "^3.1",
+        "spiral/testing": "^2.8",
         "spiral/nyholm-bridge": "^1.2",
         "vimeo/psalm": "^5.9"
     },

src/AnnotatedRoutes/tests/IntegrationTest.php

@@ -4,124 +4,35 @@
 
 namespace Spiral\Tests\Router;
 
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestFactoryInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Spiral\Tests\Router\App\App;
+use Spiral\Testing\Attribute\TestScope;
 
-class IntegrationTest extends TestCase
+#[TestScope('http')]
+final class IntegrationTest extends TestCase
 {
-    private App $app;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->app = $this->makeApp(['DEBUG' => true]);
-    }
-
     public function testRoute(): void
     {
-        $r = $this->get('/');
-        $this->assertStringContainsString('index', $r->getBody()->__toString());
+        $this->fakeHttp()->get('/')->assertBodySame('index');
     }
 
     public function testRoute2(): void
     {
-        $r = $this->post('/');
-        $this->assertStringContainsString('method', $r->getBody()->__toString());
+        $this->fakeHttp()->post('/')->assertBodySame('method');
     }
 
     public function testRoute3(): void
     {
-        $r = $this->get('/page/test');
-
-        $this->assertSame('page-test', $r->getBody()->__toString());
+        $this->fakeHttp()->get('/page/test')->assertBodySame('page-test');
     }
 
     public function testRoute4(): void
     {
-        $r = $this->get('/page/about');
-
-        $this->assertSame('about', $r->getBody()->__toString());
+        $this->fakeHttp()->get('/page/about')->assertBodySame('about');
     }
 
     public function testRoutesWithoutNames(): void
     {
-        $r = $this->get('/nameless');
-        $this->assertSame('index', $r->getBody()->__toString());
-
-        $r = $this->post('/nameless');
-        $this->assertSame('method', $r->getBody()->__toString());
-
-        $r = $this->get('/nameless/route');
-        $this->assertSame('route', $r->getBody()->__toString());
-    }
-
-    public function get(
-        $uri,
-        array $query = [],
-        array $headers = [],
-        array $cookies = []
-    ): ResponseInterface {
-        return $this->app->getHttp()->handle($this->request($uri, 'GET', $query, $headers, $cookies));
-    }
-
-    public function getWithAttributes(
-        $uri,
-        array $attributes,
-        array $headers = []
-    ): ResponseInterface {
-        $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
-            $r = $r->withAttribute($k, $v);
-        }
-
-        return $this->app->getHttp()->handle($r);
-    }
-
-    public function post(
-        $uri,
-        array $data = [],
-        array $headers = [],
-        array $cookies = []
-    ): ResponseInterface {
-        return $this->app->getHttp()->handle(
-            $this->request($uri, 'POST', [], $headers, $cookies)->withParsedBody($data)
-        );
-    }
-
-    public function request(
-        $uri,
-        string $method,
-        array $query = [],
-        array $headers = [],
-        array $cookies = []
-    ): ServerRequestInterface {
-        $headers = array_merge([
-            'accept-language' => 'en'
-        ], $headers);
-
-        /** @var ServerRequestFactoryInterface $factory */
-        $factory = $this->app->getContainer()->get(ServerRequestFactoryInterface::class);
-        $request = $factory->createServerRequest($method, $uri);
-
-        foreach ($headers as $name => $value) {
-            $request = $request->withAddedHeader($name, $value);
-        }
-
-        return $request
-            ->withCookieParams($cookies)
-            ->withQueryParams($query);
-    }
-
-    public function fetchCookies(array $header)
-    {
-        $result = [];
-        foreach ($header as $line) {
-            $cookie = explode('=', $line);
-            $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
-        }
-
-        return $result;
+        $this->fakeHttp()->get('/nameless')->assertBodySame('index');
+        $this->fakeHttp()->post('/nameless')->assertBodySame('method');
+        $this->fakeHttp()->get('/nameless/route')->assertBodySame('route');
     }
 }

src/AnnotatedRoutes/tests/RouteLocatorListenerTest.php

@@ -4,6 +4,7 @@
 
 namespace Spiral\Tests\Router;
 
+use PHPUnit\Framework\TestCase;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Message\UriFactoryInterface;
 use Spiral\Attributes\Factory;

src/AnnotatedRoutes/tests/TestCase.php

@@ -4,25 +4,37 @@
 
 namespace Spiral\Tests\Router;
 
-use PHPUnit\Framework\TestCase as BaseTestCase;
-use Spiral\Boot\Environment;
-use Spiral\Tests\Router\App\App;
+use Spiral\Nyholm\Bootloader\NyholmBootloader;
+use Spiral\Router\Bootloader\AnnotatedRoutesBootloader;
+use Spiral\Testing\TestCase as BaseTestCase;
 
 /**
  * @requires function \Spiral\Framework\Kernel::init
  */
 abstract class TestCase extends BaseTestCase
 {
-    /**
-     * @throws \Throwable
-     */
-    protected function makeApp(array $env): App
+    public function defineBootloaders(): array
     {
-        $config = [
-            'root' => __DIR__ . '/App',
-            'app'  => __DIR__ . '/App',
+        return [
+            NyholmBootloader::class,
+            AnnotatedRoutesBootloader::class,
         ];
+    }
+
+    public function rootDirectory(): string
+    {
+        return __DIR__;
+    }
+
+    public function defineDirectories(string $root): array
+    {
+        return \array_merge(parent::defineDirectories($root), ['app' => $root . '/App']);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
 
-        return (App::create($config, false))->run(new Environment($env));
+        $this->cleanUpRuntimeDirectory();
     }
 }

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,