Merge pull request #13 from clebsonsh/feat/add-support-to-handler-has-a-string-class

feat/add-support-to-handler-has-a-string-class

Author: clebsonsh

app/Routes/api.php

@@ -6,5 +6,5 @@
 use Infra\Http\Router;
 
 return function (Router $router) {
-    $router->post('/api/posts/{id}', new PostHandler);
+    $router->post('/api/posts/{id}', PostHandler::class);
 };

app/Routes/web.php

@@ -6,5 +6,5 @@
 use Infra\Http\Router;
 
 return function (Router $router) {
-    $router->get('/', new HomeHandler);
+    $router->get('/', HomeHandler::class);
 };

infra/Http/Request.php

@@ -96,18 +96,10 @@ private static function getHeadersFromGlobals(): array
         return $headers;
     }
 
-    /**
-     * @template T of RequestDtoInterface
-     *
-     * @param  class-string<T>  $requestDto
-     * @return T
-     */
+    /** @param  class-string<RequestDtoInterface>  $requestDto */
     public function getData(string $requestDto): RequestDtoInterface
     {
-        /** @var T $requestData */
-        $requestData = $requestDto::fromRequestData($this->data);
-
-        return $requestData;
+        return $requestDto::fromRequestData($this->data);
     }
 
     public function getPath(): string

infra/Http/Route.php

@@ -14,10 +14,11 @@ class Route
 
     private string $pattern;
 
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
     public function __construct(
         private readonly string $path,
         private readonly HttpMethod $method,
-        private readonly RequestHandlerInterface $handler
+        private readonly string|RequestHandlerInterface $handler
     ) {
         $this->params = [];
         $this->pattern = $this->compilePath();
@@ -30,7 +31,8 @@ private function compilePath(): string
         return '#^'.$pattern.'$#';
     }
 
-    public function getHandler(): RequestHandlerInterface
+    /** @return class-string<RequestHandlerInterface>|RequestHandlerInterface $handler */
+    public function getHandler(): string|RequestHandlerInterface
     {
         return $this->handler;
     }

infra/Http/Router.php

@@ -26,27 +26,32 @@ public function __construct(
         private readonly Request $request,
     ) {}
 
-    public function get(string $path, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    public function get(string $path, string|RequestHandlerInterface $handler): void
     {
         $this->register($path, HttpMethod::GET, $handler);
     }
 
-    public function post(string $path, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    public function post(string $path, string|RequestHandlerInterface $handler): void
     {
         $this->register($path, HttpMethod::POST, $handler);
     }
 
-    public function put(string $path, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    public function put(string $path, string|RequestHandlerInterface $handler): void
     {
         $this->register($path, HttpMethod::PUT, $handler);
     }
 
-    public function patch(string $path, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    public function patch(string $path, string|RequestHandlerInterface $handler): void
     {
         $this->register($path, HttpMethod::PATCH, $handler);
     }
 
-    public function delete(string $path, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    public function delete(string $path, string|RequestHandlerInterface $handler): void
     {
         $this->register($path, HttpMethod::DELETE, $handler);
     }
@@ -56,7 +61,8 @@ public function redirect(string $from, string $to, int $status = 302): void
         $this->get($from, new RedirectHandler($to, $status));
     }
 
-    private function register(string $path, HttpMethod $httpMethod, RequestHandlerInterface $handler): void
+    /** @param  class-string<RequestHandlerInterface>|RequestHandlerInterface  $handler */
+    private function register(string $path, HttpMethod $httpMethod, string|RequestHandlerInterface $handler): void
     {
         $this->routes[] = new Route($path, $httpMethod, $handler);
     }
@@ -65,8 +71,14 @@ public function handleRequest(): Response
     {
         try {
             $route = $this->getRoute();
+
             $this->request->setParams($route->getParams());
-            $response = $route->getHandler()->handle($this->request);
+
+            /** @var class-string<RequestHandlerInterface>|RequestHandlerInterface $handler */
+            $handler = $route->getHandler();
+            $response = is_string($handler)
+                ? (new $handler)->handle($this->request)
+                : $handler->handle($this->request);
         } catch (NotFoundException) {
             $response = (new NotFoundHandler)->handle($this->request);
         } catch (MethodNotAllowedException) {

tests/Unit/app/Handlers/HomeHandlerTest.php

@@ -10,7 +10,7 @@
 use Infra\Http\Router;
 
 describe('Web', function () {
-    it('should return home page', function () {
+    it('returns a successful response for the home page', function () {
         $request = new Request('/', HttpMethod::GET, []);
         $router = new Router($request);
 

tests/Unit/app/Handlers/PostHandlerTest.php

@@ -10,7 +10,7 @@
 use Infra\Http\Router;
 
 describe('Api', function () {
-    it('should return a json response', function () {
+    it('returns a JSON response with data and params for a POST request', function () {
         $data = [
             'title' => 'Test title',
             'content' => 'Test content',

tests/Unit/infra/Http/EmitterTest.php

@@ -6,7 +6,7 @@
 use Infra\Http\Response;
 
 describe('Emitter', function () {
-    it('should emit the status code, headers, and body from a response', function () {
+    it('emits the status code, headers, and body from a response', function () {
         $response = new Response(
             status: 404,
             body: '{"error":"Not Found"}',
@@ -24,7 +24,7 @@
         expect($output)->toBe('{"error":"Not Found"}');
     });
 
-    it('should handle a response with no headers and an empty body', function () {
+    it('handles a response with no headers and an empty body', function () {
         $response = new Response(status: 204, body: '', headers: []);
         $emitter = new Emitter;
 

tests/Unit/infra/Http/RequestTest.php

@@ -10,7 +10,7 @@
         unset($_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI'], $_SERVER['HTTP_ACCEPT']);
     });
 
-    it('should create a request from globals', function () {
+    it('creates a Request instance from PHP superglobals', function () {
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/test';
 
@@ -19,7 +19,7 @@
         expect($request)->toBeInstanceOf(Request::class);
     });
 
-    it('should get accept headers from globals', function () {
+    it('extracts headers from PHP superglobals', function () {
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/test';
         $_SERVER['HTTP_ACCEPT'] = 'application/json';
@@ -30,7 +30,7 @@
             ->and($request->getHeaders())->toBe(['accept' => 'application/json']);
     });
 
-    it('should throw an exception if request method is not defined', function () {
+    it('throws a RuntimeException if REQUEST_METHOD is not defined', function () {
         $_SERVER['REQUEST_URI'] = '/test';
 
         expect(fn () => Request::createFromGlobals())
@@ -39,15 +39,15 @@
 });
 
 describe('Getters', function () {
-    it('should return the correct request path', function () {
+    it('getPath returns the correct request path', function () {
         $request = prepareRequest(path: '/users/1');
 
         expect($request->getPath())
             ->toBeString()
             ->toBe('/users/1');
     });
 
-    it('should return the correct request method', function () {
+    it('getMethod returns the correct request method', function () {
         $request = prepareRequest(method: HttpMethod::POST);
 
         expect($request->getMethod())

tests/Unit/infra/Http/ResponseTest.php

@@ -5,15 +5,15 @@
 use Infra\Http\Response;
 
 describe('Constructor', function () {
-    it('should create a response with default values', function () {
+    it('creates a response with default values', function () {
         $response = new Response;
 
         expect($response->getStatus())->toBe(200)
             ->and($response->getHeaders())->toBe([])
             ->and($response->getBody())->toBe('');
     });
 
-    it('should create a response with custom values', function () {
+    it('creates a response with custom values', function () {
         $response = new Response(
             status: 404,
             body: 'Not Found',
@@ -27,7 +27,7 @@
 });
 
 describe('JSON Factory', function () {
-    it('should create a JSON response with a 200 status by default', function () {
+    it('creates a JSON response with a 200 status by default', function () {
         $data = ['user' => 'John Doe', 'id' => 123];
         $response = Response::json($data);
 
@@ -36,7 +36,7 @@
             ->and($response->getBody())->toBe(json_encode($data));
     });
 
-    it('should create a JSON response with a custom status', function () {
+    it('creates a JSON response with a custom status', function () {
         $data = ['error' => 'Invalid input'];
         $response = Response::json($data, 422);
 
@@ -45,15 +45,15 @@
             ->and($response->getBody())->toBe(json_encode($data));
     });
 
-    it('should handle an empty array for a JSON response', function () {
+    it('handles an empty array for a JSON response', function () {
         $response = Response::json([]);
 
         expect($response->getBody())->toBe('[]');
     });
 });
 
 describe('HTML Factory', function () {
-    it('should create an HTML response with a 200 status by default', function () {
+    it('creates an HTML response with a 200 status by default', function () {
         $html = '<h1>Hello, World!</h1>';
         $response = Response::html($html);
 
@@ -62,7 +62,7 @@
             ->and($response->getBody())->toBe($html);
     });
 
-    it('should create an HTML response with a custom status', function () {
+    it('creates an HTML response with a custom status', function () {
         $html = '<h1>Unauthorized</h1>';
         $response = Response::html($html, 401);