Organize framework namespaces by domain

.github/workflows/api.yml

@@ -53,8 +53,15 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const labels = context.payload.pull_request.labels.map((label) => label.name);
-            const versionLabels = labels.filter((name) => /^v\d+\.\d+(\.\d+)?$/.test(name));
+            const {owner, repo} = context.repo;
+            const pull_number = context.payload.pull_request.number;
+            const {data: labels} = await github.rest.issues.listLabelsOnIssue({
+              owner,
+              repo,
+              issue_number: pull_number,
+            });
+            const labelNames = labels.map((label) => label.name);
+            const versionLabels = labelNames.filter((name) => /^v\d+\.\d+(\.\d+)?$/.test(name));
 
             if (versionLabels.length !== 1) {
               core.setFailed(`Pull request must have exactly one version label like v0.6. Found: ${versionLabels.join(', ') || 'none'}`);

Engine/App.php

@@ -3,11 +3,16 @@
 namespace Engine;
 
 use Engine\Error\HttpError;
+use Engine\Response\JsonResponse;
+use Engine\Response\Response;
+use Engine\Response\ResponseEmitter;
 use Engine\Routing\Attributes\Body;
 use Engine\Routing\Attributes\Header;
 use Engine\Routing\Attributes\PathParam;
 use Engine\Routing\Attributes\QueryParam;
 use Engine\Routing\Attributes\Status;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 use JsonException;
 use ReflectionClass;
 use ReflectionException;

Engine/Console/Commands/RouteList.php

@@ -5,7 +5,7 @@
 use Engine\Console\Cli;
 use Engine\Console\CommandInterface;
 use Engine\Modules\ModuleLoader;
-use Engine\Router;
+use Engine\Routing\Router\Router;
 
 class RouteList implements CommandInterface
 {

Engine/Controller.php

@@ -2,6 +2,9 @@
 
 namespace Engine;
 
+use Engine\Response\JsonResponse;
+use Engine\Response\Response;
+use Engine\Service\ServiceContainer;
 use JsonException;
 
 /**

Engine/Modules/AbstractModule.php

@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 abstract class AbstractModule implements ModuleInterface
 {

Engine/Modules/ModuleInterface.php

@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 interface ModuleInterface
 {

Engine/Modules/ModuleLoader.php

@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 class ModuleLoader
 {

Engine/JsonResponse.php → Engine/Response/JsonResponse.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 use JsonException;
 

Engine/Response.php → Engine/Response/Response.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 class Response
 {

Engine/ResponseEmitter.php → Engine/Response/ResponseEmitter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 class ResponseEmitter
 {

Engine/Routing/AttributeRouteLoader.php

@@ -2,9 +2,9 @@
 
 namespace Engine\Routing;
 
-use Engine\Router;
 use Engine\Routing\Attributes\Route;
 use Engine\Routing\Attributes\RoutePrefix;
+use Engine\Routing\Router\Router;
 use ReflectionClass;
 
 class AttributeRouteLoader

Engine/Route.php → Engine/Routing/Router/Route.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
+
+use Engine\Request;
 
 class Route
 {

Engine/RouteMatch.php → Engine/Routing/Router/RouteMatch.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
 
 readonly class RouteMatch
 {

Engine/Router.php → Engine/Routing/Router/Router.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
 
 use Engine\Error\HttpError;
+use Engine\Request;
 
 class Router
 {

Engine/ServiceContainer.php → Engine/Service/ServiceContainer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Service;
 
 use Closure;
 use InvalidArgumentException;
@@ -107,4 +107,4 @@ public function getSingletonServices(): array
     {
         return array_keys($this->singletons);
     }
-} 
+} 

Engine/ServiceInterface.php → Engine/Service/ServiceInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Service;
 
 /**
  * Interface ServiceInterface
@@ -22,4 +22,4 @@ public function isReady(): bool;
      * Get service name
      */
     public function getName(): string;
-} 
+} 

README.md

@@ -26,10 +26,7 @@ Routes are owned by modules and registered from each module boundary:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;
-use Engine\Router;
-use Engine\Routing\AttributeRouteLoader;
-use Modules\Health\Controllers\HealthController;
+use Engine\Modules\AbstractModule;use Engine\Routing\AttributeRouteLoader;use Engine\Routing\Router\Router;use Modules\Health\Controllers\HealthController;
 
 class Module extends AbstractModule
 {
@@ -58,12 +55,12 @@ Controllers extend `Engine\Controller` and return a response object:
 namespace Modules\Users\Controllers;
 
 use Engine\Controller;
-use Engine\JsonResponse;
+use Engine\Response\JsonResponse;
 use Engine\Routing\Attributes\Body;
 use Engine\Routing\Attributes\Get;
 use Engine\Routing\Attributes\Header;
-use Engine\Routing\Attributes\Post;
 use Engine\Routing\Attributes\PathParam;
+use Engine\Routing\Attributes\Post;
 use Engine\Routing\Attributes\QueryParam;
 use Engine\Routing\Attributes\RoutePrefix;
 use Engine\Routing\Attributes\Status;
@@ -177,12 +174,7 @@ A module registers itself through `Module.php`:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;
-use Engine\Router;
-use Engine\Routing\AttributeRouteLoader;
-use Engine\ServiceContainer;
-use Modules\Health\Controllers\HealthController;
-use Modules\Health\Services\HealthService;
+use Engine\Modules\AbstractModule;use Engine\Routing\AttributeRouteLoader;use Engine\Routing\Router\Router;use Engine\Service\ServiceContainer;use Modules\Health\Controllers\HealthController;use Modules\Health\Services\HealthService;
 
 class Module extends AbstractModule
 {

application/modules/Health/Controllers/HealthController.php

@@ -3,7 +3,7 @@
 namespace Modules\Health\Controllers;
 
 use Engine\Controller;
-use Engine\JsonResponse;
+use Engine\Response\JsonResponse;
 use Engine\Routing\Attributes\Get;
 use Engine\Routing\Attributes\RoutePrefix;
 use Modules\Health\Services\HealthService;

application/modules/Health/Module.php

@@ -3,9 +3,9 @@
 namespace Modules\Health;
 
 use Engine\Modules\AbstractModule;
-use Engine\Router;
 use Engine\Routing\AttributeRouteLoader;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 use Modules\Health\Controllers\HealthController;
 use Modules\Health\Services\HealthService;
 

tests/ApiCoreTest.php

@@ -3,11 +3,10 @@
 use Engine\App;
 use Engine\Controller;
 use Engine\Error\HttpError;
-use Engine\JsonResponse;
+use Engine\Modules\ModuleLoader;
 use Engine\Request;
-use Engine\ResponseEmitter;
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Response\JsonResponse;
+use Engine\Response\ResponseEmitter;
 use Engine\Routing\AttributeRouteLoader;
 use Engine\Routing\Attributes\Body;
 use Engine\Routing\Attributes\Get;
@@ -17,7 +16,9 @@
 use Engine\Routing\Attributes\QueryParam;
 use Engine\Routing\Attributes\RoutePrefix;
 use Engine\Routing\Attributes\Status;
-use Engine\Modules\ModuleLoader;
+use Engine\Routing\Router\Route;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 use Modules\Health\Services\HealthService;
 
 require_once __DIR__ . '/../bootstrap.php';
@@ -28,7 +29,7 @@ final class CapturingEmitter extends ResponseEmitter
     public array $headers = [];
     public string $content = '';
 
-    public function emit(\Engine\Response $response): void
+    public function emit(\Engine\Response\Response $response): void
     {
         $this->statusCode = $response->getStatusCode();
         $this->headers = $response->getHeaders();
@@ -112,7 +113,7 @@ function makeRequest(string $method, string $uri, string $body = '', array $quer
     (new AttributeRouteLoader())->load($router, [TestAttributeController::class]);
 
     $routes = array_map(
-        static fn (\Engine\Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
+        static fn (Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
         $router->getRoutes()
     );
 
@@ -224,7 +225,7 @@ function makeRequest(string $method, string $uri, string $body = '', array $quer
     assertSameValue(true, $container->has(HealthService::class), 'Health module service should be registered.');
 
     $routes = array_map(
-        static fn (\Engine\Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
+        static fn (Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
         $router->getRoutes()
     );