fixed process

fastdlabs · May 16, 2017 · 1e5f451 · 1e5f451
1 parent e6b9d24
commit 1e5f451
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/Middleware.php b/src/Middleware.php
@@ -10,6 +10,7 @@
 namespace FastD\Middleware;
 
 
+use FastD\Http\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -29,11 +30,27 @@ abstract public function handle(ServerRequestInterface $request, DelegateInterfa
     /**
      * @param ServerRequestInterface $request
      * @param DelegateInterface $next
-     * @return ResponseInterface
+     * @return Response|mixed|ResponseInterface
+     * @throws \Exception
      */
     public function process(ServerRequestInterface $request, DelegateInterface $next)
     {
-        return $this->handle($request, $next);
+        try {
+            $return = call_user_func_array([$this, 'handle'], [$request, $next]);
+            if ($return instanceof ResponseInterface) {
+                $response = $return;
+                $return = '';
+            } else {
+                $response = new Response();
+            }
+            $body = $response->getBody();
+            if (!empty($return) && $body->isWritable()) {
+                $body->write($return);
+            }
+            return $response;
+        } catch (\Exception $exception) {
+            throw $exception;
+        }
     }
 
     /**