diff --git a/src/ControllerInterpreter.php b/src/ControllerInterpreter.php index a4db35f..e56d136 100644 --- a/src/ControllerInterpreter.php +++ b/src/ControllerInterpreter.php @@ -5,6 +5,8 @@ namespace Kiri\Router; use Closure; use Exception; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; use ReflectionClass; use ReflectionException; use ReflectionMethod; @@ -18,6 +20,8 @@ class ControllerInterpreter * @param string|ReflectionMethod $method * @param ReflectionClass|null $reflection * @return Handler + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface * @throws ReflectionException */ public function addRouteByString(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler @@ -33,7 +37,8 @@ class ControllerInterpreter * @param Closure $method * @return Handler * @throws ReflectionException - * @throws Exception + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ public function addRouteByClosure(Closure $method): Handler { @@ -50,6 +55,8 @@ class ControllerInterpreter * @param string|ReflectionMethod $method * @param ReflectionClass|null $reflection * @return Handler + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface * @throws ReflectionException */ public function addRouteByObject(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler @@ -67,6 +74,8 @@ class ControllerInterpreter * @param ReflectionClass $reflectionClass * @return Handler * @throws ReflectionException + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface * @throws Exception */ public function resolveMethod(object $class, string|\ReflectionMethod $reflectionMethod, ReflectionClass $reflectionClass): Handler diff --git a/src/Handler.php b/src/Handler.php index 139ef67..87da378 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -37,14 +37,13 @@ class Handler implements RequestHandlerInterface /** * @param array|Closure $handler - * @param string $method * @param array $parameter * @param ReflectionNamedType|null $reflectionType * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface * @throws ReflectionException */ - public function __construct(public array|Closure $handler, string $method, public array $parameter, public ?ReflectionNamedType $reflectionType) + public function __construct(public array|Closure $handler, public array $parameter, public ?ReflectionNamedType $reflectionType) { $this->container = \Kiri::getDi(); if ($this->reflectionType != null) { @@ -52,9 +51,6 @@ class Handler implements RequestHandlerInterface } else { $this->format = $this->container->get(MixedFormat::class); } - if ($method === 'HEAD') { - $this->format = $this->container->get(NoBody::class); - } }