fix code quality

src/EmptyRouteStack.php → src/Exception/EmptyRouteStack.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router;
+namespace IngeniozIT\Router\Exception;
 
 use OutOfRangeException;
 

src/InvalidRoute.php → src/Exception/InvalidRoute.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace IngeniozIT\Router;
+namespace IngeniozIT\Router\Exception;
 
 use InvalidArgumentException;
 

src/Exception/InvalidRouteCondition.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Exception;
+
+use InvalidArgumentException;
+
+final class InvalidRouteCondition extends InvalidArgumentException
+{
+}

src/Exception/InvalidRouteHandler.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Exception;
+
+use InvalidArgumentException;
+
+final class InvalidRouteHandler extends InvalidArgumentException
+{
+}

src/Exception/InvalidRouteMiddleware.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Exception;
+
+use InvalidArgumentException;
+
+final class InvalidRouteMiddleware extends InvalidArgumentException
+{
+}

src/Exception/RouteNotFound.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Exception;
+
+use DomainException;
+
+final class RouteNotFound extends DomainException
+{
+}

src/Handler/ConditionHandler.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Handler;
+
+use Closure;
+use IngeniozIT\Router\Exception\InvalidRouteCondition;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+readonly final class ConditionHandler
+{
+    private Closure $handler;
+
+    public function __construct(
+        private ContainerInterface $container,
+        mixed $callback,
+    ) {
+        $handler = is_string($callback) ? $this->container->get($callback) : $callback;
+
+        if (!is_callable($handler)) {
+            throw new InvalidRouteCondition('Invalid condition handler');
+        }
+
+        $this->handler = $handler(...);
+    }
+
+    /**
+     * @return array<string, mixed>|false
+     */
+    public function handle(ServerRequestInterface $request): array|false
+    {
+        $result = ($this->handler)($request);
+
+        if ($result === false || is_array($result)) {
+            return $result;
+        }
+
+        throw new InvalidRouteCondition('Condition must either return an array or false.');
+    }
+}

src/Handler/MiddlewaresHandler.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Handler;
+
+use Closure;
+use IngeniozIT\Router\Exception\InvalidRouteMiddleware;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+readonly final class MiddlewaresHandler
+{
+    private Closure $handler;
+
+    public function __construct(
+        private ContainerInterface $container,
+        mixed $callback,
+    ) {
+        $handler = is_string($callback) ? $this->container->get($callback) : $callback;
+
+        if (is_callable($handler)) {
+            $this->handler = $handler(...);
+            return;
+        }
+
+        if ($handler instanceof MiddlewareInterface) {
+            $this->handler = $handler->process(...);
+            return;
+        }
+
+        throw new InvalidRouteMiddleware('Middleware must be a PSR Middleware or a callable.');
+    }
+
+    public function handle(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $result = ($this->handler)($request, $handler);
+
+        if (!$result instanceof ResponseInterface) {
+            throw new InvalidRouteMiddleware('Middleware must return a PSR Response.');
+        }
+
+        return $result;
+    }
+}

src/Handler/RouteHandler.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace IngeniozIT\Router\Handler;
+
+use Closure;
+use IngeniozIT\Router\Exception\InvalidRouteHandler;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+readonly final class RouteHandler
+{
+    private Closure|MiddlewareInterface|RequestHandlerInterface $handler;
+
+    public function __construct(
+        private ContainerInterface $container,
+        mixed $callback,
+    ) {
+        $handler = is_string($callback) ? $this->container->get($callback) : $callback;
+
+        if (
+            !($handler instanceof MiddlewareInterface)
+            && !($handler instanceof RequestHandlerInterface)
+            && !is_callable($handler)
+        ) {
+            throw new InvalidRouteHandler('Route handler must be a PSR Middleware, a PSR RequestHandler or a callable.');
+        }
+
+        $this->handler = is_callable($handler) ? $handler(...) : $handler;
+    }
+
+    public function handle(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $result = $this->executeHandler($request, $handler);
+
+        if (!$result instanceof ResponseInterface) {
+            throw new InvalidRouteHandler('Route handler must return a PSR Response.');
+        }
+
+        return $result;
+    }
+
+    private function executeHandler(ServerRequestInterface $request, RequestHandlerInterface $handler): mixed
+    {
+        if ($this->handler instanceof RequestHandlerInterface) {
+            return $this->handler->handle($request);
+        }
+
+        if ($this->handler instanceof MiddlewareInterface) {
+            return $this->handler->process($request, $handler);
+        }
+
+        return ($this->handler)($request, $handler);
+    }
+}

src/Route.php

@@ -171,7 +171,6 @@ private function extractParametersFromPath(string $path): array
 
     /**
      * @param string[][] $parameters
-     * @param array<string, string> $additionalPatterns
      * @return array<string, string>
      */
     private function extractParametersValue(array $parameters, string $path): array
@@ -182,7 +181,6 @@ private function extractParametersValue(array $parameters, string $path): array
 
     /**
      * @param string[][] $parameters
-     * @param array<string, string> $additionalPatterns
      */
     private function buildRegex(array $parameters): string
     {

src/RouteGroup.php

@@ -38,13 +38,14 @@ function (RouteGroup|Route $route) use ($with, $where, $name, $path): RouteGroup
                         $path,
                     );
                 }
+
                 return new Route(
                     $route->method,
                     $path . $route->path,
                     $route->callback,
-                    array_merge($where, $route->where),
-                    array_merge($with, $route->with),
-                    name: $route->name ? $this->concatenatedName($name) . $route->name : null,
+                    [...$where, ...$route->where],
+                    [...$with, ...$route->with],
+                    name: !empty($route->name) ? $this->concatenatedName($name) . $route->name : null,
                 );
             },
             $routes,
@@ -53,6 +54,6 @@ function (RouteGroup|Route $route) use ($with, $where, $name, $path): RouteGroup
 
     private function concatenatedName(?string $name): ?string
     {
-        return empty($name) ? $name : $name . '.';
+        return $name === null || $name === '' ? $name : $name . '.';
     }
 }