Updates

- Simplified exception-handling (see demo project for examples).
- Optimised sample-project.
- Optimised and added further unit-tests.
- Optimised and bugfixes.

README.md

@@ -187,37 +187,19 @@ The framework has it's own ```Router``` class which inherits from the ```SimpleR
 namespace Demo;
 
 use Pecee\Exception\RouterException;
-use Pecee\Handler\ExceptionHandler;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\SimpleRouter\RouterBase;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Router extends SimpleRouter {
 
-    protected static $defaultExceptionHandler;
     protected static $defaultMiddlewares = array();
 
     public static function start($defaultNamespace = null) {
 
-        // Debug information
+        // change this to whatever makes sense in your project
-        Debug::getInstance()->add('Router initialised.');
+        require_once 'routes.php';
 
-        // Load framework specific controllers
-        static::get('/js-wrap', 'ControllerJs@wrap', ['namespace' => '\Pecee\Controller'])->setAlias('pecee.js.wrap');
-        static::get('/css-wrap', 'ControllerCss@wrap', ['namespace' => '\Pecee\Controller'])->setAlias('pecee.css.wrap');
-        static::get('/captcha', 'ControllerCaptcha@show', ['namespace' => '\Pecee\Controller']);
-
-        // Load routes.php
-        $file = $_ENV['base_path'] . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'routes.php';
-        if(file_exists($file)) {
-            require_once $file;
-        }
-
-        // Set default namespace
-        $defaultNamespace = '\\'.$_ENV['app_name'] . '\\Controller';
-
-        // Handle exceptions
-        try {
 
         if(count(static::$defaultMiddlewares)) {
             /* @var $middleware \Pecee\Http\Middleware\IMiddleware */
@@ -230,33 +212,11 @@ class Router extends SimpleRouter {
             }
         }
 
+        // Set default namespace
+        $defaultNamespace = '\\Demo\\Controllers';
+
         parent::start($defaultNamespace);
-        } catch(\Exception $e) {
 
-            $route = RouterBase::getInstance()->getLoadedRoute();
-
-            // Otherwise use the fallback default exceptions handler
-            if(static::$defaultExceptionHandler !== null) {
-                static::loadExceptionHandler(static::$defaultExceptionHandler, $route, $e);
-            }
-
-            throw $e;
-        }
-
-    }
-
-    protected static function loadExceptionHandler($class, $route, $e) {
-        $class = new $class();
-
-        if(!($class instanceof ExceptionHandler)) {
-            throw new \ErrorException('Exception handler must be an instance of \Pecee\Handler\ExceptionHandler');
-        }
-
-        $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-    }
-
-    public static function defaultExceptionHandler($handler) {
-        static::$defaultExceptionHandler = $handler;
     }
 
     /**

demo-project/README.md

@@ -18,7 +18,7 @@ Please note that this demo-project only covers how to integrate the `simple-php-
 
 ## Installation
 
-- Navigate to the `demo-project` folder in terminal and run `composer install`.
+- Navigate to the `demo-project` folder in terminal and run `composer update` to install the latest version.
 - Point your webserver to `demo-project/public`.
 
 ### Setting up Nginx
@@ -46,7 +46,8 @@ Nothing special is required for Apache to work. We've include the `.htaccess` fi
 
 ## Notes
 
-The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality such as default exceptionhandlers and middlewares. This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
+The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality. 
+This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
 
 In this project we also use our custom router-class to autoload the `routes.php` file from our custom location (`app/routes.php`).
 

demo-project/app/Controllers/DefaultController.php

@@ -22,4 +22,8 @@ class DefaultController {
 
     }
 
+    public function notFound() {
+        echo 'Page not found';
+    }
+
 }

demo-project/app/Handlers/CustomExceptionHandler.php

@@ -21,8 +21,14 @@ class CustomExceptionHandler implements IExceptionHandler {
 
         // else we just throw the error
         if($error->getCode() == 404) {
-            die(sprintf('An error occurred (%s):<br/>%s', $error->getCode(), $error->getMessage()));
+
+            // Return 404 path
+            $request->setUri('/404');
+            return $request;
+
         }
+
+        throw $error;
     }
 
 }

demo-project/app/Router.php

@@ -8,14 +8,12 @@
 namespace Demo;
 
 use Pecee\Exception\RouterException;
-use Pecee\Handler\IExceptionHandler;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\SimpleRouter\RouterBase;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Router extends SimpleRouter {
 
-    protected static $defaultExceptionHandler;
     protected static $defaultMiddlewares = array();
 
     public static function start($defaultNamespace = null) {
@@ -23,8 +21,6 @@ class Router extends SimpleRouter {
         // change this to whatever makes sense in your project
         require_once 'routes.php';
 
-        // Handle exceptions
-        try {
 
         if(count(static::$defaultMiddlewares)) {
             /* @var $middleware \Pecee\Http\Middleware\IMiddleware */
@@ -41,32 +37,7 @@ class Router extends SimpleRouter {
         $defaultNamespace = '\\Demo\\Controllers';
 
         parent::start($defaultNamespace);
-        } catch(\Exception $e) {
 
-            $route = RouterBase::getInstance()->getLoadedRoute();
-
-            // Otherwise use the fallback default exceptions handler
-            if(static::$defaultExceptionHandler !== null) {
-                static::loadExceptionHandler(static::$defaultExceptionHandler, $route, $e);
-            }
-
-            throw $e;
-        }
-
-    }
-
-    protected static function loadExceptionHandler($class, $route, $e) {
-        $class = new $class();
-
-        if(!($class instanceof IExceptionHandler)) {
-            throw new \ErrorException('Exception handler must be an instance of \Pecee\Handler\IExceptionHandler');
-        }
-
-        $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-    }
-
-    public static function defaultExceptionHandler($handler) {
-        static::$defaultExceptionHandler = $handler;
     }
 
     /**

demo-project/app/routes.php

@@ -6,10 +6,12 @@
 use Demo\Router;
 
 Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
-Router::defaultExceptionHandler('\Demo\Handlers\CustomExceptionHandler');
+
+Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function() {
 
     Router::get('/', 'DefaultController@index')->setAlias('home');
     Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
+    Router::get('/404', 'DefaultController@notFound')->setAlias('404');
     Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
     Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
 
@@ -17,3 +19,5 @@ Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('compa
     Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
         Router::resource('/demo', 'ApiController');
     });
+
+});

src/Pecee/SimpleRouter/RouterBase.php

@@ -109,10 +109,12 @@ class RouterBase {
         }
     }
 
-    public function routeRequest() {
+    public function routeRequest($original = true) {
 
         $originalUri = $this->request->getUri();
 
+        try {
+
             // Initialize boot-managers
             if(count($this->bootManagers)) {
                 /* @var $manager RouterBootManager */
@@ -125,13 +127,15 @@ class RouterBase {
                 }
             }
 
+            // Loop through each route-request
+            $this->processRoutes($this->routes);
+
+            if($original === true) {
                 // Verify csrf token for request
                 if ($this->baseCsrfVerifier !== null) {
                     $this->baseCsrfVerifier->handle($this->request);
                 }
-
+            }
-        // Loop through each route-request
-        $this->processRoutes($this->routes);
 
             $routeNotAllowed = false;
 
@@ -159,16 +163,16 @@ class RouterBase {
                     $this->request->loadedRoute = $route;
                     $route->loadMiddleware($this->request);
 
-                try {
                     $this->request->loadedRoute->renderRoute($this->request);
-                } catch(\Exception $e) {
-                    $this->handleException($e);
-                }
 
                     break;
                 }
             }
 
+        } catch(\Exception $e) {
+            $this->handleException($e);
+        }
+
         if($routeNotAllowed) {
             $this->handleException(new RouterException('Route or method not allowed', 403));
         }
@@ -180,6 +184,8 @@ class RouterBase {
 
     protected function handleException(\Exception $e) {
 
+        $request = null;
+
         /* @var $route RouterGroup */
         foreach ($this->exceptionHandlers as $route) {
             $route->loadMiddleware($this->request);
@@ -190,7 +196,13 @@ class RouterBase {
                 throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
             }
 
-            $handler->handleError($this->request, $this->request->loadedRoute, $e);
+            $request = $handler->handleError($this->request, $this->request->loadedRoute, $e);
+        }
+
+        if($request !== null) {
+            $this->request = $request;
+            $this->routeRequest(false);
+            return;
         }
 
         throw $e;
@@ -457,14 +469,14 @@ class RouterBase {
     }
 
     public static function getInstance() {
-        if(self::$instance === null) {
+        if(static::$instance === null) {
-            self::$instance = new static();
+            static::$instance = new static();
         }
-        return self::$instance;
+        return static::$instance;
     }
 
     public static function reset() {
-        self::$instance = null;
+        static::$instance = null;
     }
 
 }

src/Pecee/SimpleRouter/RouterEntry.php

@@ -310,7 +310,7 @@ abstract class RouterEntry {
             if($max) {
                 for($i = 0; $i < $max; $i++) {
                     $name = $parameterNames[$i];
-                    $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
+                    $parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
 
                     if($name['required'] && $parameterValue === null) {
                         throw new RouterException('Missing required parameter ' . $name['name'], 404);

test/Dummy/DummyController.php

@@ -11,4 +11,8 @@ class DummyController {
         echo 'Params: ' . join(', ', $params);
     }
 
+    public function notFound() {
+        echo 'not found';
+    }
+
 }

test/Dummy/Handler/ExceptionHandler.php

@@ -0,0 +1,8 @@
+<?php
+class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
+
+    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry $router = null, \Exception $error){
+        throw $error;
+    }
+
+}

test/GroupTest.php

@@ -7,13 +7,6 @@ class GroupTest extends PHPUnit_Framework_TestCase  {
 
     protected $result;
 
-    public function __construct() {
-        // Initial setup
-        $_SERVER['HTTP_HOST'] = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/api/v1/test';
-        $_SERVER['REQUEST_METHOD'] = 'get';
-    }
-
     protected function group() {
         $this->result = true;
     }

test/MiddlewareTest.php

@@ -2,29 +2,25 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
 
 class MiddlewareTest extends PHPUnit_Framework_TestCase  {
 
-    public function __construct() {
-        // Initial setup
-        $_SERVER['HTTP_HOST'] = 'example.com';
-        $_SERVER['REQUEST_URI'] = '/my/test/url';
-        $_SERVER['REQUEST_METHOD'] = 'get';
-    }
-
     public function testMiddlewareFound() {
-
-        \Pecee\Http\Request::getInstance()->setMethod('get');
-
         \Pecee\SimpleRouter\RouterBase::reset();
 
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/my/test/url');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
             \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        });
 
         $found = false;
 
         try {
             \Pecee\SimpleRouter\SimpleRouter::start();
-        }catch(Exception $e) {
+        }catch(\Exception $e) {
             $found = ($e instanceof MiddlewareLoadedException);
         }
 

test/RouterRouteTest.php

@@ -2,14 +2,31 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase  {
   
-    public function __construct() {
+
-        // Initial setup
+    public function testNotFound() {
-        $_SERVER['HTTP_HOST'] = 'example.com';
+        \Pecee\SimpleRouter\RouterBase::reset();
-        $_SERVER['REQUEST_URI'] = '/my/test/url';
+
-        $_SERVER['REQUEST_METHOD'] = 'get';
+        \Pecee\Http\Request::getInstance()->setMethod('get');
+        \Pecee\Http\Request::getInstance()->setUri('/test-param1-param2');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::get('/non-existing-path', 'DummyController@start');
+        });
+
+        $found = false;
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        }catch(\Exception $e) {
+            $found = ($e instanceof \Pecee\Exception\RouterException && $e->getCode() == 404);
+        }
+
+        $this->assertTrue($found);
+
     }
 
     public function testGet() {