Merge pull request #10 from Minstel/middleware-errorsorigin/router-cleanup

Middleware errors

3 files changed, 135 insertions, 6 deletions

diff --git a/src/Router.php b/src/Router.php
index 955e1e1..18c40be 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -78,7 +78,7 @@ class Router
      * @param ResponseInterface      $response
      * @return ResponseInterface
      */
-    final public function run(ServerRequestInterface $request, ResponseInterface $response)
+    final public function handle(ServerRequestInterface $request, ResponseInterface $response)
     {
         return $this->__invoke($request, $response);
     }
@@ -93,11 +93,11 @@ class Router
      */
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next = null)
     {
-        $handle = [$this, 'handle'];
+        $run = [$this, 'run'];
 
-        #Call to $this->handle will be executed last in the chain of middlewares
-        $next = function(ServerRequestInterface $request, ResponseInterface $response) use ($next, $handle) {
-            return call_user_func($handle, $request, $response, $next);
+        #Call to $this->run will be executed last in the chain of middlewares
+        $next = function(ServerRequestInterface $request, ResponseInterface $response) use ($next, $run) {
+            return call_user_func($run, $request, $response, $next);
         };
 
         #Build middlewares call chain, so that the last added was executed in first place
@@ -118,7 +118,7 @@ class Router
      * @param callback      $next
      * @return ResponseInterface
      */
-    protected function handle(ServerRequestInterface $request, ResponseInterface $response, $next = null)
+    public function run(ServerRequestInterface $request, ResponseInterface $response, $next = null)
     {
         $glob = new Glob($this->routes);
         $route = $glob->getRoute($request);
diff --git a/src/Router/Middleware/ErrorHandler.php b/src/Router/Middleware/ErrorHandler.php
new file mode 100644
index 0000000..789c455
--- /dev/null
+++ b/src/Router/Middleware/ErrorHandler.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Jasny\Router\Middleware;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Handle error in following middlewares/app actions
+ */
+class ErrorHandler
+{    
+    /**
+     * Run middleware action
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param callback               $next
+     * @return ResponseInterface
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next = null)
+    {
+        if ($next && !is_callable($next)) {
+            throw new \InvalidArgumentException("'next' should be a callback");            
+        }
+
+        $error = false;
+
+        try {
+            $response = $next ? call_user_func($next, $request, $response) : $response;
+        } catch(\Throwable $e) {
+            $error = true;
+        } catch(\Exception $e) { #This block can be removed when migrating to PHP7, because Throwable represents both Exception and Error
+            $error = true;
+        }
+
+        return $error ? $this->handleError($response) : $response;
+    }
+
+    /**
+     * Handle caught error
+     *
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    protected function handleError($response)
+    {
+        $body = $response->getBody();        
+        $body->rewind();
+        $body->write('Unexpected error');
+
+        return $response->withStatus(500, 'Internal Server Error')->withBody($body);
+    }
+}
diff --git a/src/Router/Middleware/ErrorPage.php b/src/Router/Middleware/ErrorPage.php
new file mode 100644
index 0000000..7064b1e
--- /dev/null
+++ b/src/Router/Middleware/ErrorPage.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Jasny\Router\Middleware;
+
+use Jasny\Router;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Route to error page on error
+ */
+class ErrorPage
+{    
+    /**
+     * Router
+     * @var Router
+     */
+    protected $router = null;
+
+    /**
+     * Class constructor
+     * 
+     * @param Router $routes
+     */
+    public function __construct(Router $router)
+    {
+        $this->router = $router;
+    }
+
+    /**
+     * Get router connected to middleware
+     *
+     * @return Router
+     */
+    public function getRouter()
+    {
+        return $this->router;
+    }
+
+    /**
+     * Run middleware action
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param callback               $next
+     * @return ResponseInterface
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next = null)
+    {
+        if ($next && !is_callable($next)) {
+            throw new \InvalidArgumentException("'next' should be a callback");            
+        }
+
+        $response = $next ? call_user_func($next, $request, $response) : $response;    
+        $status = $response->getStatusCode();
+
+        if (!$this->isErrorStatus($status)) return $response;
+
+        $uri = $request->getUri()->withPath("/$status");
+        $request = $request->withUri($uri, true);
+
+        return $this->getRouter()->run($request, $response);
+    }
+
+    /**
+     * Detect if response has error status code
+     *
+     * @param int $status
+     * @return boolean
+     */
+    protected function isErrorStatus($status)
+    {
+        return $status >= 400 && $status < 600;
+    }
+}