eee

src/ControllerInterpreter.php

@@ -40,11 +40,10 @@ class ControllerInterpreter
     public function addRouteByClosure(Closure $method): Handler
     {
         $reflection = new \ReflectionFunction($method);
-		if ($reflection->getReturnType()->getName() !== 'Psr\Http\Message\ResponseInterface') {
-			die('Request Handler returns must implements on Psr\Http\Message\ResponseInterface');
-		}
+
         $params = \Kiri::getDi()->resolveMethodParams($reflection);
-		return new Handler($method, $params);
+
+        return new Handler($method, $params, $reflection->getReturnType());
     }
 
 
@@ -75,7 +74,7 @@ class ControllerInterpreter
     public function resolveMethod(object $class, string|\ReflectionMethod $reflectionMethod, ReflectionClass $reflectionClass): Handler
     {
         if (empty($reflectionMethod)) {
-			return new Handler([$class, $reflectionMethod], []);
+            return new Handler([$class, $reflectionMethod], [], $reflectionMethod->getReturnType());
         }
         if (is_string($reflectionMethod)) {
             $reflectionMethod = $reflectionClass->getMethod($reflectionMethod);
@@ -89,7 +88,7 @@ class ControllerInterpreter
         $container  = \Kiri::getDi();
         $parameters = $container->getMethodParams($reflectionMethod);
 
-		return new Handler([$class, $reflectionMethod->getName()], $parameters);
+        return new Handler([$class, $reflectionMethod->getName()], $parameters, $reflectionMethod->getReturnType());
     }
 
 }

src/Handler.php

@@ -4,10 +4,13 @@ declare(strict_types=1);
 namespace Kiri\Router;
 
 use Closure;
+use Kiri\Router\Constrict\Stream;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use ReflectionException;
+use ReflectionNamedType;
+use ReflectionUnionType;
 
 class Handler implements RequestHandlerInterface
 {
@@ -15,9 +18,9 @@ class Handler implements RequestHandlerInterface
     /**
      * @param array|Closure $handler
      * @param array $parameter
-	 * @throws
+     * @param ReflectionNamedType|ReflectionUnionType|null $responseType
      */
-	public function __construct(public array|Closure $handler, public array $parameter)
+    public function __construct(public array|Closure $handler, public array $parameter, public ReflectionNamedType|ReflectionUnionType|null $responseType)
     {
     }
 
@@ -76,7 +79,29 @@ class Handler implements RequestHandlerInterface
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         // TODO: Implement handle() method.
-		return call_user_func($this->handler, ...$this->parameter);
+        if ($this->responseType->getName() !== 'void') {
+            return $this->typeEncode();
+        }
+        call_user_func($this->handler, ...$this->parameter);
+        return response();
+    }
+
+
+    /**
+     * @return ResponseInterface
+     */
+    protected function typeEncode(): ResponseInterface
+    {
+        $result = call_user_func($this->handler, ...$this->parameter);
+        if ($result instanceof ResponseInterface) {
+            return $result;
+        }
+        if (is_object($result)) {
+            $result = '[object]';
+        } else if (is_array($result)) {
+            $result = json_encode($result, JSON_UNESCAPED_UNICODE);
+        }
+        return response()->withBody(new Stream($result));
     }
 
 }