refactor: split http and router classes in correct namespaces (#1184)

Author: brendt

src/Tempest/Auth/src/AuthorizerMiddleware.php

@@ -6,12 +6,12 @@
 
 use Tempest\Container\Container;
 use Tempest\Core\Priority;
+use Tempest\Http\Request;
+use Tempest\Http\Response;
+use Tempest\Http\Responses\Forbidden;
 use Tempest\Router\HttpMiddleware;
 use Tempest\Router\HttpMiddlewareCallable;
 use Tempest\Router\MatchedRoute;
-use Tempest\Router\Request;
-use Tempest\Router\Response;
-use Tempest\Router\Responses\Forbidden;
 
 #[Priority(Priority::HIGHEST)]
 final readonly class AuthorizerMiddleware implements HttpMiddleware

src/Tempest/Auth/src/SessionAuthenticator.php

@@ -4,8 +4,8 @@
 
 namespace Tempest\Auth;
 
+use Tempest\Http\Session\Session;
 use Tempest\Reflection\ClassReflector;
-use Tempest\Router\Session\Session;
 
 final readonly class SessionAuthenticator implements Authenticator
 {

src/Tempest/Console/src/Stubs/HttpMiddlewareStub.php

@@ -6,10 +6,10 @@
 
 use Tempest\Core\Priority;
 use Tempest\Discovery\SkipDiscovery;
+use Tempest\Http\Request;
+use Tempest\Http\Response;
 use Tempest\Router\HttpMiddleware;
 use Tempest\Router\HttpMiddlewareCallable;
-use Tempest\Router\Request;
-use Tempest\Router\Response;
 
 #[SkipDiscovery]
 #[Priority(Priority::NORMAL)]

src/Tempest/Core/src/Exceptions/WhoopsErrorHandler.php

@@ -3,8 +3,8 @@
 namespace Tempest\Core\Exceptions;
 
 use Tempest\Container\Container;
+use Tempest\Http\Request;
 use Tempest\Router\MatchedRoute;
-use Tempest\Router\Request;
 use Whoops\Handler\HandlerInterface;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;

src/Tempest/Core/src/FrameworkKernel.php

@@ -15,10 +15,6 @@
 use Tempest\Core\Kernel\LoadDiscoveryLocations;
 use Tempest\Core\ShellExecutors\GenericShellExecutor;
 use Tempest\EventBus\EventBus;
-use Tempest\Router\MatchedRoute;
-use Tempest\Router\Request;
-use Whoops\Handler\PrettyPageHandler;
-use Whoops\Run;
 
 final class FrameworkKernel implements Kernel
 {

src/Tempest/Framework/Testing/Http/HttpRouterTester.php

@@ -7,11 +7,11 @@
 use Laminas\Diactoros\ServerRequestFactory;
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Tempest\Container\Container;
+use Tempest\Http\GenericRequest;
+use Tempest\Http\Mappers\RequestToPsrRequestMapper;
 use Tempest\Http\Method;
-use Tempest\Router\GenericRequest;
+use Tempest\Http\Request;
 use Tempest\Router\GenericRouter;
-use Tempest\Router\Mappers\RequestToPsrRequestMapper;
-use Tempest\Router\Request;
 use Tempest\Router\Router;
 
 use function Tempest\map;

src/Tempest/Framework/Testing/Http/TestResponseHelper.php

@@ -7,10 +7,10 @@
 use Closure;
 use Generator;
 use PHPUnit\Framework\Assert;
+use Tempest\Http\Cookie\CookieManager;
+use Tempest\Http\Response;
+use Tempest\Http\Session\Session;
 use Tempest\Http\Status;
-use Tempest\Router\Cookie\CookieManager;
-use Tempest\Router\Response;
-use Tempest\Router\Session\Session;
 use Tempest\Validation\Rule;
 use Tempest\View\View;
 use Tempest\View\ViewRenderer;
@@ -28,7 +28,7 @@ public function __construct(
         get => $this->response->status;
     }
 
-    /** @var \Tempest\Router\Header[] */
+    /** @var \Tempest\Http\Header[] */
     public array $headers {
         get => $this->response->headers;
     }

src/Tempest/Framework/Testing/IntegrationTest.php

@@ -16,9 +16,9 @@
 use Tempest\DateTime\DateTimeInterface;
 use Tempest\EventBus\Testing\EventBusTester;
 use Tempest\Framework\Testing\Http\HttpRouterTester;
+use Tempest\Http\GenericRequest;
 use Tempest\Http\Method;
-use Tempest\Router\GenericRequest;
-use Tempest\Router\Request;
+use Tempest\Http\Request;
 use Tempest\Storage\Testing\StorageTester;
 
 use function Tempest\Support\Path\normalize;

src/Tempest/Http/composer.json

@@ -4,7 +4,16 @@
     "license": "MIT",
     "minimum-stability": "dev",
     "require": {
-        "php": "^8.4"
+        "php": "^8.4",
+        "tempest/core": "dev-main",
+        "tempest/clock": "dev-main",
+        "tempest/console": "dev-main",
+        "tempest/mapper": "dev-main",
+        "tempest/container": "dev-main",
+        "laminas/laminas-diactoros": "^3.3",
+        "psr/http-factory": "^1.0",
+        "psr/http-message": "^1.0|^2.0",
+        "symfony/uid": "^7.1"
     },
     "autoload": {
         "psr-4": {

…uter/src/Commands/MakeRequestCommand.php …Http/src/Commands/MakeRequestCommand.phpsrc/Tempest/Router/src/Commands/MakeRequestCommand.php renamed to src/Tempest/Http/src/Commands/MakeRequestCommand.php src/Tempest/Router/src/Commands/MakeRequestCommand.php renamed to src/Tempest/Http/src/Commands/MakeRequestCommand.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Tempest\Router\Commands;
+namespace Tempest\Http\Commands;
 
 use Tempest\Console\ConsoleArgument;
 use Tempest\Console\ConsoleCommand;
 use Tempest\Core\PublishesFiles;
 use Tempest\Generation\DataObjects\StubFile;
-use Tempest\Router\Stubs\RequestStub;
+use Tempest\Http\Stubs\RequestStub;
 
 final class MakeRequestCommand
 {