diff --git a/src/ControllerInterpreter.php b/src/ControllerInterpreter.php index 64c68f8..b5676bf 100644 --- a/src/ControllerInterpreter.php +++ b/src/ControllerInterpreter.php @@ -46,9 +46,7 @@ class ControllerInterpreter { $reflection = new \ReflectionFunction($method); - $params = $this->container->resolveMethodParams($reflection); - - return new Handler($method, $params, $reflection->getReturnType()); + return new Handler($method, $reflection); } @@ -81,14 +79,7 @@ class ControllerInterpreter $reflectionMethod = $reflectionClass->getMethod($reflectionMethod); } - $returnType = $reflectionMethod->getReturnType(); - if ($returnType instanceof \ReflectionUnionType) { - throw new Exception("Return type error, cannot be multi type."); - } - - $parameters = $this->container->getMethodParams($reflectionMethod); - - return new Handler([$class, $reflectionMethod->getName()], $parameters, $returnType); + return new Handler([$class, $reflectionMethod->getName()], $reflectionMethod); } } diff --git a/src/Handler.php b/src/Handler.php index acc3704..79e0a8a 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -11,10 +11,13 @@ use Kiri\Router\Format\NoBody; use Kiri\Router\Format\OtherFormat; use Kiri\Router\Format\ResponseFormat; use Kiri\Router\Format\VoidFormat; +use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; +use Psr\Container\NotFoundExceptionInterface; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; +use ReflectionMethod; use ReflectionNamedType; class Handler implements RequestHandlerInterface @@ -37,15 +40,14 @@ class Handler implements RequestHandlerInterface /** * @param array|Closure $handler - * @param array $parameter - * @param ReflectionNamedType|null $reflectionType + * @param ReflectionMethod $parameter * @throws */ - public function __construct(public array|Closure $handler, public array $parameter, public ?ReflectionNamedType $reflectionType) + public function __construct(public array|Closure $handler, public ReflectionMethod|\ReflectionFunction $parameter) { $this->container = \Kiri::getDi(); - if ($this->reflectionType != null) { - $this->format = $this->container->get($this->returnType()); + if ($this->parameter->getReturnType() != null) { + $this->format = $this->container->get($this->returnType($parameter)); } else { $this->format = $this->container->get(MixedFormat::class); } @@ -53,11 +55,12 @@ class Handler implements RequestHandlerInterface /** + * @param $reflectionType * @return string */ - protected function returnType(): string + protected function returnType($reflectionType): string { - return match ($this->reflectionType->getName()) { + return match ($reflectionType->getName()) { 'array' => ArrayFormat::class, 'mixed', 'object' => MixedFormat::class, 'int', 'string', 'bool' => OtherFormat::class, @@ -133,7 +136,9 @@ class Handler implements RequestHandlerInterface */ public function handle(ServerRequestInterface $request): ResponseInterface { - $data = call_user_func($this->handler, ...$this->parameter); + $parameter = $this->container->getMethodParams($this->parameter); + + $data = call_user_func($this->handler, ...$parameter); /** 根据返回类型 */ return $this->format->call($data); diff --git a/src/Router.php b/src/Router.php index f7fb277..1a64393 100644 --- a/src/Router.php +++ b/src/Router.php @@ -176,7 +176,7 @@ class Router { $container = Kiri::getDi(); $scanner = $container->get(Kiri\Di\Scanner::class); - $scanner->load_directory(APP_PATH . 'app/'); + $scanner->load_directory(APP_PATH . 'app/Controller'); $this->read_dir_file(APP_PATH . 'routes'); $this->reset($container); diff --git a/src/RouterCollector.php b/src/RouterCollector.php index eecb5d4..fce0912 100644 --- a/src/RouterCollector.php +++ b/src/RouterCollector.php @@ -86,7 +86,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate $found = di(NotFoundController::class); $reflection = new ReflectionMethod($found, 'fail'); - $this->found = new Handler([$found, 'fail'], [], $reflection->getReturnType()); + $this->found = new Handler([$found, 'fail'], $reflection); }