eee

src/Base/AbstractHandler.php

@@ -7,39 +7,39 @@ use Kiri\Router\Handler;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
+use ReflectionException;
 
 abstract class AbstractHandler
 {
 
 
-	public int $offset = 0;
+    public int $offset = 0;
 
 
-	/**
+    /**
-	 * @param array $middlewares
+     * @param array $middlewares
-	 * @param Handler $handler
+     * @param Handler $handler
-	 */
+     */
-	public function __construct(public array $middlewares, public Handler $handler)
+    public function __construct(public array $middlewares, public Handler $handler)
-	{
+    {
-	}
+    }
 
+    /**
+     * @param ServerRequestInterface $request
+     * @return ResponseInterface
+     * @throws ReflectionException
+     */
+    public function execute(ServerRequestInterface $request): ResponseInterface
+    {
+        if (!isset($this->middlewares[$this->offset])) {
+            return $this->handler->handle($request);
+        }
 
-	/**
+        /** @var MiddlewareInterface $middleware */
-	 * @param ServerRequestInterface $request
+        $middleware   = di($this->middlewares[$this->offset]);
-	 * @return ResponseInterface
+        $this->offset += 1;
-	 * @throws \ReflectionException
-	 */
-	public function execute(ServerRequestInterface $request): ResponseInterface
-	{
-		if (!isset($this->middlewares[$this->offset])) {
-			return $this->handler->handle($request);
-		}
 
-		/** @var MiddlewareInterface $middleware */
+        return $middleware->process($request, $this);
-		$middleware = di($this->middlewares[$this->offset]);
+    }
-		$this->offset += 1;
-
-		return $middleware->process($request, $this);
-	}
 
 }

src/HttpRequestHandler.php

@@ -13,16 +13,27 @@ class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterf
 {
 
 
-	/**
+    /**
-	 * @param ServerRequestInterface $request
+     * @param ServerRequestInterface $request
-	 * @return ResponseInterface
+     * @return ResponseInterface
-	 * @throws ReflectionException
+     * @throws ReflectionException
-	 */
+     */
-	public function handle(ServerRequestInterface $request): ResponseInterface
+    public function run(ServerRequestInterface $request): ResponseInterface
-	{
+    {
-		// TODO: Implement handle() method.
+        $this->offset = 0;
-		return $this->execute($request);
+        return $this->handle($request);
-	}
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @return ResponseInterface
+     * @throws ReflectionException
+     */
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        // TODO: Implement handle() method.
+        return $this->execute($request);
+    }
 
 
 }

src/Router.php

@@ -191,9 +191,11 @@ class Router
     {
         $router     = Kiri::getDi()->get(DataGrip::class)->get(static::$type);
         $middleware = \Kiri::getDi()->get(MiddlewareManager::class);
-        foreach ($router->getMethods() as $method) {
+        foreach ($router->getMethods() as $name => $method) {
             $middlewares = $middleware->get($method->getClass(), $method->getMethod());
             $method->setMiddlewares($middlewares);
+
+            $router->setMethod($name, $method);
         }
     }
 

src/RouterCollector.php

@@ -66,6 +66,17 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
     }
 
 
+    /**
+     * @param string $method
+     * @param HttpRequestHandler $handler
+     * @return void
+     */
+    public function setMethod(string $method, HttpRequestHandler $handler): void
+    {
+        $this->methods[$method] = $handler;
+    }
+
+
     /**
      * @return array
      */
@@ -213,11 +224,11 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
     /**
      * @param string $path
      * @param string $method
-     * @return Handler
+     * @return HttpRequestHandler
      */
-    public function query(string $path, string $method): Handler
+    public function query(string $path, string $method): HttpRequestHandler
     {
-        return $this->methods[$method . '_' . $path] ?? $this->found;
+        return $this->methods[$method . '_' . $path] ?? new HttpRequestHandler([], $this->found);
     }