Merge pull request #135 from skipperbent/v2-development

Bugfixes
2026-06-17 16:57:53 +00:00 · 2016-11-16 15:32:32 +02:00 · 2016-11-16 14:30:19 +01:00 · 2016-11-15 09:46:54 +02:00 · 2016-11-15 08:46:14 +01:00 · 2016-11-15 08:13:09 +02:00
42 changed files with 2013 additions and 622 deletions
@@ -1,2 +1,4 @@
 .idea
-composer.lock
+composer.lock
+vendor/
+demo-project/vendor
@@ -5,16 +5,20 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 Add the latest version of Simple PHP Router running this command.

 ```
-composer require pecee/framework
+composer require pecee/simple-router
 ```

+## Requirements
+
+- PHP 5.4 or greater
+
 ## Notes

 The goal of this project is to create a router that is 100% compatible with the Laravel documentation, but as simple as possible and as easy to integrate and change as possible.

 ### Features

- Basic routing (get, post, put, delete) with support for custom multiple verbs.
+- Basic routing (`GET`, `POST`, `PUT`, `DELETE`) with support for custom multiple verbs.
 - Regular Expression Constraints for parameters.
 - Named routes.
 - Generating url to routes.
@@ -26,6 +30,15 @@ The goal of this project is to create a router that is 100% compatible with the
 - Optional parameters
 - Sub-domain routing
 - Custom boot managers to redirect urls to other routes
+- Input manager; to manage `GET`, `POST` params.
+
+## Installation and demo
+
+We've included a simple demo project for the router which can be found in the `demo-project` folder.
+
+Please refer to the demo-project documentation for further reading on how to setup and install simple-php-router:
+
+[Link to demo documentation](demo-project/README.md)

 ## Initialising the router

@@ -34,15 +47,20 @@ In your ```index.php``` require your ```routes.php``` and call the ```routeReque
 This is an example of a basic ```index.php``` file:

 ```php
-use \Pecee\SimpleRouter;
+use \Pecee\SimpleRouter\SimpleRouter;

-require_once 'routes.php'; // change this to whatever makes sense in your project
+// Load external routes file
+require_once 'routes.php';

-// The apps default namespace (so we don't have to specify it each time we use MyController@home)
-$defaultControllerNamespace = 'MyWebsite\\Controller';
+/* 
+ * The default namespace for route-callbacks, so we don't have to specify it each time.
+ * Can be overwritten by using the namespace config option.
+ */
+ 
+SimpleRouter::setDefaultNamespace('MyWebsite\Controller');

-// Do the routing
-SimpleRouter::init($defaultControllerNamespace);
+// Start the routing
+SimpleRouter::start();
 ```

 ## Adding routes
@@ -51,6 +69,9 @@ This router is heavily inspired by the Laravel 5.* router, so anything you find

 ### Basic example

+- ExceptionsHandlers must implement the `IExceptionHandler` interface.
+- Middlewares must implement the `IMiddleware` interface.
+
 ```php
 use Pecee\SimpleRouter\SimpleRouter;

@@ -62,7 +83,12 @@ use Pecee\SimpleRouter\SimpleRouter;
 * the request, for instance if a user is not authenticated.
 */

-SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {
+// Add CSRF support (if needed)
+SimpleRouter::csrfVerifier(new \Pecee\Http\Middleware\BaseCsrfVerifier());
+
+SimpleRouter::get('/page/404', 'ControllerPage@notFound', ['as' => 'page.notfound']);
+
+SimpleRouter::group(['prefix' => '/v1', 'middleware' => '\MyWebsite\Middleware\SomeMiddlewareClass'], function() {

    SimpleRouter::group(['prefix' => '/services', 'exceptionHandler' => '\MyProject\Handler\CustomExceptionHandler'], function() {

@@ -92,6 +118,42 @@ SimpleRouter::group(['prefix' => 'v1', 'middleware' => '\MyWebsite\Middleware\So
 });
 ```

+#### ExceptionHandler example
+
+This is a basic example of an ExceptionHandler implementation:
+
+```php
+namespace Demo\Handlers;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomExceptionHandler implements IExceptionHandler {
+
+    public function handleError( Request $request, RouterEntry $router = null, \Exception $error) {
+
+        // If the error-code is 404; show another route which contains the page-not-found
+        if($error->getCode() === 404) {
+        
+            // Throw your custom 404-page view
+            // - or -
+            // load another route with our 404 page
+            
+            return $request->setUri(url('page.notfound'));
+        }
+
+        // Output error as json if on api path.
+        if(stripos($request->getUri(), '/api') !== false) {
+            response()->json(['error' => $error->getMessage()]);
+        }
+
+        // Otherwise default exception will be thrown by the router.
+
+    }
+
+}
+```
+
 ### Sub-domain routing

 Route groups may also be used to route wildcard sub-domains. Sub-domains may be assigned route parameters just like route URIs, allowing you to capture a portion of the sub-domain for usage in your route or controller. The sub-domain may be specified using the ```domain``` key on the group attribute array:
@@ -134,78 +196,39 @@ This is a simple example of an integration into a framework.
 The framework has it's own ```Router``` class which inherits from the ```SimpleRouter``` class. This allows the framework to add custom functionality.

 ```php
-namespace MyProject;
+namespace Demo;

-use Pecee\Handler\ExceptionHandler;
-use Pecee\SimpleRouter\RouterBase;
 use Pecee\SimpleRouter\SimpleRouter;

 class Router extends SimpleRouter {

-    protected static $defaultExceptionHandler;
+    public static function start() {

-    public static function start($defaultNamespace = null) {
+        // change this to whatever makes sense in your project
+        require_once 'routes.php';
+        
+        // change default namespace for all routes
+        parent::setDefaultNamespace('\Demo\Controllers');

-        // Load routes.php
-        $file = $_ENV['base_path'] . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'routes.php';
-        if(file_exists($file)) {
-            require_once $file;
-        }
+        // Do initial stuff
+        parent::start();

-        // Set default namespace
-        $defaultNamespace = '\\'.$_ENV['app_name'] . '\\Controller';
-
-        // Handle exceptions
-        try {
-            parent::start($defaultNamespace);
-        } catch(\Exception $e) {
-
-            $route = RouterBase::getInstance()->getLoadedRoute();
-
-            $exceptionHandler = null;
-
-            // Load and use exception-handler defined on group
-
-            if($route && $route->getGroup()) {
-                $exceptionHandler = $route->getGroup()->getExceptionHandler();
-
-                if($exceptionHandler !== null) {
-                    $class = new $exceptionHandler();
-                    $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-                }
-            }
-
-            // Otherwise use the fallback default exceptions handler
-
-            if(self::$defaultExceptionHandler !== null) {
-                $class = new self::$defaultExceptionHandler();
-                $class->handleError(RouterBase::getInstance()->getRequest(), $route, $e);
-            }
-
-            throw $e;
-        }
-    }
-
-    public static function setDefaultExceptionHandler($handler) {
-        self::$defaultExceptionHandler = $handler;
    }

 }
 ```

-#### Helper functions examples
-**This is a basic example of a helper function for generating urls.**
+## Helper functions
+
+To simplify to use of simple-router functionality, we recommend you add these helper functions to your project.

 ```php
-use Pecee\SimpleRouter\RouterBase;
+use Pecee\SimpleRouter\SimpleRouter;
+
 function url($controller, $parameters = null, $getParams = null) {
-    RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
 }
-```

-**This is a basic example for getting the current csrf token**
-
-```php
 /**
 * Get current csrf-token
 * @return null|string
@@ -214,6 +237,30 @@ function csrf_token() {
    $token = new \Pecee\CsrfToken();
    return $token->getToken();
 }
+
+/**
+ * Get request object
+ * @return \Pecee\Http\Request
+ */
+function request() {
+    return SimpleRouter::request();
+}
+
+/**
+ * Get response object
+ * @return \Pecee\Http\Response
+ */
+function response() {
+    return SimpleRouter::response();
+}
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
+}
 ```

 ## Getting urls
@@ -249,7 +296,10 @@ use Pecee\Http\Middleware\BaseCsrfVerifier;

 class CsrfVerifier extends BaseCsrfVerifier {

-    protected $except = ['/companies/*', '/user/save'];
+    protected $except = [
+        '/companies/*', 
+        '/api'
+    ];

 }
 ```
@@ -264,10 +314,9 @@ SimpleRouter::csrfVerifier(new \Demo\Middleware\CsrfVerifier());

 Sometimes it can be necessary to keep urls stored in the database, file or similar. In this example, we want the url ```/my-cat-is-beatiful``` to load the route ```/article/view/1``` which the router knows, because it's defined in the ```routes.php``` file.

-To interfere with the router, we create a class that inherits from ```RouterBootManager```. This class will be loaded before any other rules in ```routes.php``` and allow us to "change" the current route, if any of our criteria are fulfilled (like comming from the url ```/my-cat-is-beatiful```).
+To interfere with the router, we create a class that inherits from ```RouterBootManager```. This class will be loaded before any other rules in ```routes.php``` and allow us to "change" the current route, if any of our criteria are fulfilled (like coming from the url ```/my-cat-is-beatiful```).

 ```php
-
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\RouterBootManager;

@@ -304,34 +353,149 @@ By doing this the route will now load the url ```/article/view/1``` instead of `

 The last thing we need to do, is to add our custom boot-manager to the ```routes.php``` file. You can create as many bootmanagers as you like and easily add them in your ```routes.php``` file.

-**routes.php example:**
-
-```php
-// Add new bootmanager
-SimpleRouter::addBootManager(new CustomRouterRules());
-
-// This rule is what our custom bootmanager will use.
-SimpleRouter::get('/article/view/{id}', 'ControllerArticle@view');
-```
-
 ## Easily overwrite route about to be loaded
-Sometimes it can be useful to manipulate the route that's about to be loaded, for instance if a user is not authenticated or if an error occurred within your Middleware that requires
-some other route to be initialised. Simple PHP Router allows you to easily change the route about to be executed. All information about the current route is stored in
-the ```\Pecee\SimpleRouter\Http\Request``` object.
+Sometimes it can be useful to manipulate the route about to be loaded. 
+simple-php-router allows you to easily change the route about to be executed. 
+All information about the current route is stored in the ```\Pecee\SimpleRouter\RouterBase``` instance's `loadedRoute` property. 
+
+For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.

-**Note:** Please note that it's only possible to change the route BEFORE any route has initially been loaded, so doing this in your custom ExceptionHandler or Middleware is highly recommended.

 ```php
-$route = Request::getInstance()->getLoadedRoute();
+use Pecee\SimpleRouter;
+$route = SimpleRouter::router()->getLoadedRoute();

 $route->setCallback('Example\MyCustomClass@hello');

-// -- or --
+// -- or you can rewrite by doing --

 $route->setClass('Example\MyCustomClass');
 $route->setMethod('hello');
 ```

+
+### Examples
+
+It's only possible to change the route BEFORE the route has initially been loaded. If you want to redirect to another route, we highly recommend that you 
+modify the `RouterEntry` object from a `Middleware` or `ExceptionHandler`, like the examples below.
+
+#### Faking new route
+
+The example below will cause the router to re-route the request with another url. We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
+ 
+This does require the `$request` object to be returned, otherwise the `request` object will be ignored by the router.
+
+Using the example below will NOT inherit the rules from the other route. This means that IF you are faking a route that is enabled in `post`.
+
+**NOTE: Use this method if you want to fully load a route (middlewares, request-method etc. will be kept).**
+
+
+```php
+namespace demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, RouterEntry &$route = null) {
+        return $request->setUri(url('home'));
+    }
+    
+}
+
+```
+
+#### Changing callback
+You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
+on some criteria's for the request.
+
+The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
+If you wish to change the callback from outside, please have this in mind.
+
+**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
+
+```php
+namespace demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, RouterEntry &$route = null) { 
+        $route->callback('DefaultController@home');
+    }
+    
+}
+```
+
+## Using the Input class to manage parameters
+
+We've added the `Input` class to easy access parameters from your Controller-classes.
+
+**Return single parameter value (matches both GET, POST, FILE):**
+```php
+$value = input()->get('name');
+```
+
+**Return parameter object (matches both GET, POST, FILE):**
+```php
+$object = input()->getObject('name');
+```
+
+**Return specific GET parameter (where name is the name of your parameter):**
+```php
+$object = input()->get->name;
+$object = input()->post->name;
+$object = input()->file->name;
+```
+
+**Return all parameters:**
+```php
+// Get all
+$values = input()->all();
+
+// Only match certain keys
+$values = input()->all([
+    'company_name',
+    'user_id'
+]);
+```
+
+All object inherits from `InputItem` class and will always contain these methods:
+- `getValue()` - returns the value of the input.
+- `getIndex()` - returns the index/key of the input.
+- `getName()` - returns a human friendly name for the input (company_name will be Company Name etc).
+
+`InputFile` has the same methods as above along with some other file-specific methods like:
+- `getTmpName()` - get file temporary name.
+- `getSize()` - get file size.
+- `move($destination)` - move file to destination.
+- `getContents()` - get file content.
+- `getType()` - get mime-type for file.
+- `getError()` - get file upload error.
+
+
+### Easy access to methods
+
+Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
+
+```php
+// Get parameter site_id or default-value 2
+$siteId = input()->get('site_id', 2);
+```
+
+## Sites
+This is some sites that uses the simple-router project in production.
+
+- [holla.dk](http://www.holla.dk)
+- [ninjaimg.com](http://ninjaimg.com)
+- [bookandbegin.com](https://bookandbegin.com)
+- [dscuz.com](https://www.dscuz.com)
+
 ## Documentation
 While I work on a better documentation, please refer to the Laravel 5 routing documentation here:

@@ -13,7 +13,7 @@
        }
 	],
 	"require": {
-
+		"php": ">=5.4.0"
    },
    "require-dev": {
        "phpunit/phpunit": "4.7.7"
@@ -0,0 +1,100 @@
+# Simple PHP router demo project
+
+This project is here to give you a basic understanding of how to setup and using simple-php-router.
+
+Please note that this demo-project only covers how to integrate the `simple-php-router` in a project without a framework. If you are using some sort of PHP framework in your project the implementation might vary.
+
+**What we won't cover:**
+
+- How to setup a solution that fits your need. This is a basic demo to help you get started.
+- Understanding of MVC; including Controllers, Middlewares or ExceptionHandlers.
+- How to integrate into third party frameworks.
+
+**What we cover:**
+
+- How to get up and running fast - from scratch.
+- How to get ExceptionHandlers, Middlewares and Controllers working.
+- How to setup your webservers.
+
+## Installation
+
+- 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
+
+If you are using Nginx please make sure that url-rewriting is enabled.
+
+You can easily enable url-rewriting by adding the following configuration for the Nginx configuration-file for the demo-project.
+
+```
+location / {
+    try_files $uri $uri/ /index.php?$query_string;
+}
+```
+
+### Setting up Apache
+
+Nothing special is required for Apache to work. We've include the `.htaccess` file in the `public` folder. If rewriting is not working for you, please check that the `mod_rewrite` module (htaccess support) is enabled in the Apache configuration.
+
+## Folder structure
+
+| Folder        | Description |
+| ------------- |-------------|
+| app            |Contains projects-specific PHP classes|
+| public         |Public folder which are accessible through the web.|
+
+## Notes
+
+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`).
+
+Please check the `routes.php` file in `demo-project/app` for all the urls/rules available in the project.
+
+### CSRF-verifier
+
+For the purpose of this demo, we've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`. This will ensure that CSRF form-checks are not applied when calling our demo api url.
+
+### Exception handlers
+
+The included `CustomExceptionHandler` class returns a very basic json response for errors received on calls to `/api/*` or otherwise just a simple formatted error response.
+
+### Middlewares
+
+`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the `ApiController` class. We've added this class to demonstrate that you can use middlewares to ensure that the user has the correct authentication - before router loads the controller itself.
+
+### Urls
+
+Please see `routes.php` for all routes and rules.
+
+| URL        |
+| ------------- |
+| /             |
+| /api/demo       |
+| /companies       |
+| /companies/[id]  |
+| /contact         |
+
+## The MIT License (MIT)
+
+Copyright (c) 2016 Simon Sessingø / simple-php-router
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -0,0 +1,20 @@
+<?php
+namespace Demo\Controllers;
+
+use Pecee\SimpleRouter\SimpleRouter;
+
+class ApiController {
+
+    public function index() {
+
+        // The variable authenticated is set to true in the ApiVerification middleware class.
+
+        header('content-type: application/json');
+
+        echo json_encode([
+            'authenticated' => request()->authenticated
+        ]);
+
+    }
+
+}
@@ -0,0 +1,29 @@
+<?php
+namespace Demo\Controllers;
+
+class DefaultController {
+
+    public function index() {
+
+        // implement
+        echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
+
+    }
+
+    public function contact() {
+
+        echo 'DefaultController -> contact';
+
+    }
+
+    public function companies($id = null) {
+
+        echo 'DefaultController -> companies -> id: ' . $id;
+
+    }
+
+    public function notFound() {
+        echo 'Page not found';
+    }
+
+}
@@ -0,0 +1,34 @@
+<?php
+namespace Demo\Handlers;
+
+use Pecee\Handler\IExceptionHandler;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class CustomExceptionHandler implements IExceptionHandler {
+
+    public function handleError( Request $request, RouterEntry &$route = null, \Exception $error) {
+
+        // Return json errors if we encounter an error on /api.
+        if(stripos($request->getUri(), '/api') !== false) {
+            header('content-type: application/json');
+            echo json_encode([
+                'error' => $error->getMessage(),
+                'code' => $error->getCode()
+            ]);
+            die();
+        }
+
+        // else we just throw the error
+        if($error->getCode() == 404) {
+
+            // Return 404 path
+            $request->setUri('/404');
+            return $request;
+
+        }
+
+        throw $error;
+    }
+
+}
@@ -0,0 +1,17 @@
+<?php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+class ApiVerification implements IMiddleware {
+
+    public function handle(Request $request, RouterEntry &$route = null) {
+
+        // Do authentication
+        $request->authenticated = true;
+
+    }
+
+}
@@ -0,0 +1,13 @@
+<?php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\BaseCsrfVerifier;
+
+class CsrfVerifier extends BaseCsrfVerifier {
+
+    /**
+     * CSRF validation will be ignored on the following urls.
+     */
+    protected $except = ['/api/*'];
+
+}
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Custom router which handles default middlewares, default exceptions and things
+ * that should be happen before and after the router is initialised.
+ */
+
+namespace Demo;
+
+use Pecee\SimpleRouter\SimpleRouter;
+
+class Router extends SimpleRouter {
+
+    public static function start($defaultNamespace = null) {
+
+        // Load our helpers
+        require_once 'helpers.php';
+
+        // Load our custom routes
+        require_once 'routes.php';
+
+        parent::setDefaultNamespace('\Demo\Controllers');
+
+        // Do initial stuff
+        parent::start();
+
+    }
+
+}
@@ -0,0 +1,39 @@
+<?php
+use Pecee\SimpleRouter\SimpleRouter;
+
+function url($controller, $parameters = null, $getParams = null) {
+    SimpleRouter::getRoute($controller, $parameters, $getParams);
+}
+
+/**
+ * Get current csrf-token
+ * @return null|string
+ */
+function csrf_token() {
+    $token = new \Pecee\CsrfToken();
+    return $token->getToken();
+}
+
+/**
+ * Get request object
+ * @return \Pecee\Http\Request
+ */
+function request() {
+    return SimpleRouter::request();
+}
+
+/**
+ * Get response object
+ * @return \Pecee\Http\Response
+ */
+function response() {
+    return SimpleRouter::response();
+}
+
+/**
+ * Get input class
+ * @return \Pecee\Http\Input\Input
+ */
+function input() {
+    return SimpleRouter::request()->getInput();
+}
@@ -0,0 +1,23 @@
+<?php
+/**
+ * This file contains all the routes for the project
+ */
+
+use Demo\Router;
+
+Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
+
+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');
+
+    // Api
+    Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function() {
+        Router::resource('/demo', 'ApiController');
+    });
+
+});
@@ -0,0 +1,26 @@
+{
+ 	"name": "pecee/simple-router-demo",
+ 	"description": "Simple router demo project",
+ 	"keywords": [
+		"simple-router",
+		"php",
+		"php-simple-router"
+	],
+	"license": "MIT",
+	"type": "project",
+	"require": {
+		"php": ">=5.4.0",
+		"pecee/simple-router": "1.*"
+	},
+	"require-dev": {
+
+	},
+	"config": {
+		"preferred-install": "dist"
+	},
+    "autoload": {
+      "psr-4": {
+        "Demo\\": "app/"
+      }
+    }
+}
@@ -0,0 +1,5 @@
+RewriteEngine on
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteCond %{SCRIPT_FILENAME} !-l
+RewriteRule ^(.*)$ index.php/$1
@@ -0,0 +1,7 @@
+<?php
+
+// load composer dependencies
+require '../vendor/autoload.php';
+
+// Start the routing
+\Demo\Router::start();
@@ -37,7 +37,7 @@ class CsrfToken {
     * @param $token
     */
    public function setToken($token) {
-        setcookie(self::CSRF_KEY, $token, time() + 60 * 120, '/');
+        setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
    }

    /**
@@ -46,7 +46,7 @@ class CsrfToken {
     */
    public function getToken(){
        if($this->hasToken()) {
-            return $_COOKIE[self::CSRF_KEY];
+            return $_COOKIE[static::CSRF_KEY];
        }
        return null;
    }
@@ -56,7 +56,7 @@ class CsrfToken {
     * @return bool
     */
    public function hasToken() {
-        return isset($_COOKIE[self::CSRF_KEY]);
+        return isset($_COOKIE[static::CSRF_KEY]);
    }

 }
@@ -1,3 +1,4 @@
 <?php
 namespace Pecee\Exception;
+
 class RouterException extends \Exception { }
@@ -0,0 +1,17 @@
+<?php
+namespace Pecee\Handler;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;
+
+interface IExceptionHandler {
+
+    /**
+     * @param Request $request
+     * @param RouterEntry|null $route
+     * @param \Exception $error
+     * @return Request|null
+     */
+	public function handleError(Request $request, RouterEntry &$route = null, \Exception $error);
+
+}
@@ -0,0 +1,213 @@
+<?php
+namespace Pecee\Http\Input;
+
+use Pecee\Http\Request;
+
+class Input {
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $get;
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $post;
+
+    /**
+     * @var \Pecee\Http\Input\InputCollection
+     */
+    public $file;
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    public function __construct(Request $request) {
+        $this->request = $request;
+        $this->setGet();
+        $this->setPost();
+        $this->setFile();
+    }
+
+    /**
+     * Get all get/post items
+     * @param array|null $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = null) {
+
+        $output = $_POST;
+
+        if($this->request->getMethod() === 'post') {
+
+            $contents = file_get_contents('php://input');
+
+            if (stripos(trim($contents), '{') === 0) {
+                $output = json_decode($contents, true);
+                if($output === false) {
+                    $output = array();
+                }
+            }
+        }
+
+        $output = array_merge($_GET, $output);
+
+        if($filter !== null) {
+            $output = array_filter($output, function ($key) use ($filter) {
+                if (in_array($key, $filter)) {
+                    return true;
+                }
+
+                return false;
+            }, ARRAY_FILTER_USE_KEY);
+        }
+
+        return $output;
+    }
+
+    public function getObject($index, $default = null) {
+        $key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[')+1, strpos($index, ']') - strlen($index)) : null;
+        $index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
+
+        $element = $this->get->findFirst($index);
+
+        if($element !== null) {
+            return ($key !== null) ? $element[$key] : $element;
+        }
+
+        if($this->request->getMethod() !== 'get') {
+
+            $element = $this->post->findFirst($index);
+
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
+
+            $element = $this->file->findFirst($index);
+            if ($element !== null) {
+                return ($key !== null) ? $element[$key] : $element;
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Get input element value matching index
+     * @param string $index
+     * @param string|null $default
+     * @return string|null
+     */
+    public function get($index, $default = null) {
+
+        $item = $this->getObject($index);
+
+        if($item !== null) {
+
+            if($item instanceof InputCollection || $item instanceof InputFile) {
+                return $item;
+            }
+
+            return (trim($item->getValue()) === '') ? $default : $item->getValue();
+        }
+
+        return $default;
+    }
+
+    public function exists($index) {
+        return ($this->getObject($index) !== null);
+    }
+
+    public function setGet() {
+        $this->get = new InputCollection();
+
+        if(count($_GET)) {
+            foreach($_GET as $key => $get) {
+                if(!is_array($get)) {
+                    $this->get->{$key} = new InputItem($key, $get);
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($get as $k => $g) {
+                    $output->{$k} = new InputItem($k, $g);
+                }
+
+                $this->get->{$key} = $output;
+            }
+        }
+    }
+
+    public function setPost() {
+        $this->post = new InputCollection();
+
+        $postVars = $_POST;
+
+        if(in_array($this->request->getMethod(), ['put', 'patch', 'delete'])) {
+            parse_str(file_get_contents('php://input'), $postVars);
+        }
+
+        if(count($postVars)) {
+
+            foreach($postVars as $key => $post) {
+                if(!is_array($post)) {
+                    $this->post->{strtolower($key)} = new InputItem($key, $post);
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($post as $k => $p) {
+                    $output->{$k} = new InputItem($k, $p);
+                }
+
+                $this->post->{strtolower($key)} = $output;
+            }
+        }
+    }
+
+    public function setFile() {
+        $this->file = new InputCollection();
+
+        if(count($_FILES)) {
+            foreach($_FILES as $key => $value) {
+                // Multiple files
+                if(!is_array($value['name'])) {
+                    // Strip empty values
+                    if($value['error'] != '4') {
+                        $file = new InputFile($key);
+                        $file->setName($value['name']);
+                        $file->setSize($value['size']);
+                        $file->setType($value['type']);
+                        $file->setTmpName($value['tmp_name']);
+                        $file->setError($value['error']);
+                        $this->file->{strtolower($key)} = $file;
+                    }
+                    continue;
+                }
+
+                $output = new InputCollection();
+
+                foreach($value['name'] as $k=>$val) {
+                    // Strip empty values
+                    if($value['error'][$k] != '4') {
+                        $file = new InputFile($k);
+                        $file->setName($value['name'][$k]);
+                        $file->setSize($value['size'][$k]);
+                        $file->setType($value['type'][$k]);
+                        $file->setTmpName($value['tmp_name'][$k]);
+                        $file->setError($value['error'][$k]);
+                        $output->{$k} = $file;
+                    }
+                }
+
+                $this->file->{strtolower($key)} = $output;
+            }
+        }
+    }
+
+}
@@ -0,0 +1,85 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputCollection implements \IteratorAggregate {
+
+    protected $data = array();
+
+    /**
+     * Search for input element matching index.
+     * Useful for searching for finding items where $index doesn't contain form name.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return mixed
+     */
+    public function findFirst($index, $defaultValue = null) {
+        if(count($this->data)) {
+
+            if(isset($this->data[$index])) {
+                return $this->data[$index];
+            }
+
+            foreach($this->data as $key => $value) {
+                if(strtolower($index) === strtolower($key)) {
+                    return $value;
+                }
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    public function getValue($index, $defaultValue = null) {
+        if(count($this->data)) {
+
+            if(isset($this->data[$index])) {
+                return $this->data[$index]->getValue();
+            }
+
+            foreach($this->data as $key => $value) {
+                if(strtolower($index) === strtolower($key)) {
+                    return $value->getValue();
+                }
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    /**
+     * @param $index
+     * @throws \InvalidArgumentException
+     * @return InputItem
+     */
+    public function __get($index) {
+        $item = $this->findFirst($index);
+        // Ensure that item are always available
+        if($item === null) {
+            $this->data[$index] = new InputItem($index, null);
+            return $this->data[$index];
+        }
+
+        return $item;
+    }
+
+    public function __set($index, $value) {
+        $this->data[$index] = $value;
+    }
+
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * Retrieve an external iterator
+     * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
+     * @return \Traversable An instance of an object implementing <b>Iterator</b> or
+     * <b>Traversable</b>
+     * @since 5.0.0
+     */
+    public function getIterator() {
+        return new \ArrayIterator($this->data);
+    }
+
+}
@@ -0,0 +1,68 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputFile extends InputItem {
+
+	protected $name;
+	protected $size;
+	protected $type;
+	protected $error;
+	protected $tmpName;
+
+	/**
+	 * @return string
+	 */
+	public function getSize() {
+		return $this->size;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType() {
+		return $this->type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getError() {
+		return $this->error;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTmpName() {
+		return $this->tmpName;
+	}
+
+    public function getExtension() {
+		return pathinfo($this->getName(), PATHINFO_EXTENSION);
+    }
+
+	public function move($destination) {
+		return move_uploaded_file($this->tmpName, $destination);
+	}
+
+	public function getContents() {
+		return file_get_contents($this->tmpName);
+	}
+
+    public function setTmpName($name) {
+        $this->tmpName = $name;
+    }
+
+    public function setSize($size) {
+        $this->size = $size;
+    }
+
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    public function setError($error) {
+        $this->error = $error;
+    }
+
+}
@@ -0,0 +1,63 @@
+<?php
+namespace Pecee\Http\Input;
+
+class InputItem {
+
+    protected $index;
+    protected $name;
+    protected $value;
+
+    public function __construct($index, $value = null) {
+        $this->index = $index;
+        $this->value = $value;
+
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+    }
+
+    /**
+     * @return array
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getValue() {
+        return $this->value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex() {
+        return $this->index;
+    }
+
+    /**
+     * Set input name
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name) {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Set input value
+     * @param string $value
+     * @return static $this
+     */
+    public function setValue($value) {
+        $this->value = $value;
+        return $this;
+    }
+
+    public function __toString() {
+        return (string)$this->getValue();
+    }
+
+}
@@ -4,6 +4,7 @@ namespace Pecee\Http\Middleware;
 use Pecee\CsrfToken;
 use Pecee\Exception\TokenMismatchException;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;

 class BaseCsrfVerifier implements IMiddleware {

@@ -12,10 +13,13 @@ class BaseCsrfVerifier implements IMiddleware {

    protected $except;
    protected $csrfToken;
-
+    protected $token;

    public function __construct() {
        $this->csrfToken = new CsrfToken();
+
+        // Generate or get the CSRF-Token from Cookie.
+        $this->token = (!$this->hasToken()) ? $this->generateToken() : $this->csrfToken->getToken();
    }

    /**
@@ -46,18 +50,18 @@ class BaseCsrfVerifier implements IMiddleware {
        return false;
    }

-    public function handle(Request $request) {
+    public function handle(Request $request, RouterEntry &$route = null) {

-        if($request->getMethod() != 'get' && !$this->skip($request)) {
+        if($request->getMethod() !== 'get' && !$this->skip($request)) {

-            $token = (isset($_POST[self::POST_KEY])) ? $_POST[self::POST_KEY] : null;
+            $token = $request->getInput()->post->getValue(static::POST_KEY);

            // If the token is not posted, check headers for valid x-csrf-token
            if($token === null) {
-                $token = $request->getHeader(self::HEADER_KEY);
+                $token = $request->getHeader(static::HEADER_KEY);
            }

-            if( !$this->csrfToken->validate( $token ) ) {
+            if( !$this->csrfToken->validate($token) ) {
                throw new TokenMismatchException('Invalid csrf-token.');
            }

@@ -65,4 +69,22 @@ class BaseCsrfVerifier implements IMiddleware {

    }

+    public function generateToken() {
+        $token = $this->csrfToken->generateToken();
+        $this->csrfToken->setToken($token);
+        return $token;
+    }
+
+    public function hasToken() {
+        if($this->token != null) {
+            return true;
+        }
+
+        return $this->csrfToken->hasToken();
+    }
+
+    public function getToken() {
+        return $this->token;
+    }
+
 }
@@ -2,7 +2,15 @@
 namespace Pecee\Http\Middleware;

 use Pecee\Http\Request;
+use Pecee\SimpleRouter\RouterEntry;

 interface IMiddleware {
-    public function handle(Request $request);
+
+    /**
+     * @param Request $request
+     * @param RouterEntry|null $route
+     * @return Request|null
+     */
+    public function handle(Request $request, RouterEntry &$route = null);
+
 }
@@ -1,46 +1,45 @@
 <?php
 namespace Pecee\Http;

+use Pecee\Http\Input\Input;
+
 class Request {

-    protected static $instance;
+    protected $data = array();
+    protected $headers;
+    protected $host;
+    protected $uri;
+    protected $method;
+    protected $input;

-    protected $data;
-
-    /**
-     * Return new instance
-     * @return static
-     */
-    public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
-        }
-        return self::$instance;
-    }

    public function __construct() {
-        $this->data = array();
-        $this->host = $_SERVER['HTTP_HOST'];
-        $this->uri = $_SERVER['REQUEST_URI'];
-        $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
-        $this->headers = $this->getAllHeaders();
+        $this->parseHeaders();
+        $this->input = new Input($this);
+
+        $this->host = $this->getHeader('http_host');;
+        $this->uri = $this->getHeader('request_uri');
+        $this->method = strtolower($this->input->post->findFirst('_method', $this->getHeader('request_method')));
    }

-    protected function getAllHeaders() {
-        $headers = array();
+    protected function parseHeaders() {
+        $this->headers = array();
+
        foreach ($_SERVER as $name => $value) {
-            if (substr($name, 0, 5) === 'HTTP_') {
-                $headers[strtolower(str_replace('_', '-', substr($name, 5)))] = $value;
-            }
+            $this->headers[strtolower($name)] = $value;
        }
-        return $headers;
    }

-    public function getIsSecure() {
-        if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https') {
+    public function isSecure() {
+        if($this->getHeader('http_x_forwarded_proto') === 'https') {
            return true;
        }
-        return isset($_SERVER['HTTPS']) ? true : (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] === 443);
+
+        if($this->getHeader('https') !== null) {
+            return true;
+        }
+
+        return ($this->getHeader('server_port') === 443);
    }

    /**
@@ -69,7 +68,7 @@ class Request {
     * @return string|null
     */
    public function getUser() {
-        return (isset($_SERVER['PHP_AUTH_USER'])) ? $_SERVER['PHP_AUTH_USER']: null;
+        return $this->getHeader('php_auth_user');
    }

    /**
@@ -77,11 +76,11 @@ class Request {
     * @return string|null
     */
    public function getPassword() {
-        return (isset($_SERVER['PHP_AUTH_PW'])) ? $_SERVER['PHP_AUTH_PW']: null;
+        return $this->getHeader('php_auth_pw');
    }

    /**
-     * Get headers
+     * Get all headers
     * @return array
     */
    public function getHeaders() {
@@ -93,7 +92,15 @@ class Request {
     * @return string
     */
    public function getIp() {
-        return isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
+        if($this->getHeader('http_cf_connecting_ip') !== null) {
+            return $this->getHeader('http_cf_connecting_ip');
+        }
+
+        if($this->getHeader('http_x_forwarded_for') !== null && strlen($this->getHeader('http_x_forwarded_for'))) {
+            return $this->getHeader('http_x_forwarded_for');
+        }
+
+        return $this->getHeader('remote_addr');
    }

    /**
@@ -101,7 +108,7 @@ class Request {
     * @return string
     */
    public function getReferer() {
-        return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+        return $this->getHeader('http_referer');
    }

    /**
@@ -109,37 +116,63 @@ class Request {
     * @return string
     */
    public function getUserAgent() {
-        return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
+        return $this->getHeader('http_user_agent');
    }

    /**
     * Get header value by name
     * @param string $name
+     * @param object|null $defaultValue
     * @return string|null
     */
-    public function getHeader($name) {
-        return (isset($this->headers[strtolower($name)])) ? $this->headers[strtolower($name)] : null;
+    public function getHeader($name, $defaultValue = null) {
+        return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
    }

    /**
-     * Get request input or default value
-     * @param string $name
-     * @param string $defaultValue
-     * @return mixed
+     * Get input class
+     * @return Input
     */
-    public function getInput($name, $defaultValue) {
-        return (isset($_REQUEST[$name]) ? $_REQUEST[$name] : $defaultValue);
+    public function getInput() {
+        return $this->input;
    }

+    /**
+     * Is format accepted
+     * @param string $format
+     * @return bool
+     */
    public function isFormatAccepted($format) {
-        return (isset($_SERVER['HTTP_ACCEPT']) && stripos($_SERVER['HTTP_ACCEPT'], $format) > -1);
+        return ($this->getHeader('http_accept') !== null && stripos($this->getHeader('http_accept'), $format) > -1);
    }

+    /**
+     * Get accept formats
+     * @return array
+     */
    public function getAcceptFormats() {
-        if(isset($_SERVER['HTTP_ACCEPT'])) {
-            return explode(',', $_SERVER['HTTP_ACCEPT']);
-        }
-        return array();
+        return explode(',', $this->getHeader('http_accept'));
+    }
+
+    /**
+     * @param string $uri
+     */
+    public function setUri($uri) {
+        $this->uri = $uri;
+    }
+
+    /**
+     * @param string $host
+     */
+    public function setHost($host) {
+        $this->host = $host;
+    }
+
+    /**
+     * @param string $method
+     */
+    public function setMethod($method) {
+        $this->method = $method;
    }

    public function __set($name, $value = null) {
@@ -150,33 +183,4 @@ class Request {
        return isset($this->data[$name]) ? $this->data[$name] : null;
    }

-    /**
-     * Get the currently loaded route.
-     * @return \Pecee\SimpleRouter\RouterEntry
-     */
-    public function getLoadedRoute() {
-        return $this->loadedRoute;
-    }
-
-    /**
-     * @param mixed $uri
-     */
-    public function setUri($uri) {
-        $this->uri = $uri;
-    }
-
-    /**
-     * @param mixed $host
-     */
-    public function setHost($host) {
-        $this->host = $host;
-    }
-
-    /**
-     * @param mixed $method
-     */
-    public function setMethod($method) {
-        $this->method = $method;
-    }
-
 }
@@ -4,11 +4,17 @@ namespace Pecee\Http;

 class Response {

+    protected $request;
+
+    public function __construct(Request $request) {
+        $this->request = $request;
+    }
+
    /**
     * Set the http status code
     *
     * @param int $code
-     * @return self $this
+     * @return static
     */
    public function httpCode($code) {
        http_response_code($code);
@@ -31,13 +37,13 @@ class Response {
    }

    public function refresh() {
-        $this->redirect(Request::getInstance()->getUri());
+        $this->redirect($this->request->getUri());
    }

    /**
     * Add http authorisation
     * @param string $name
-     * @return self $this
+     * @return static
     */
    public function auth($name = '') {
        $this->headers([
@@ -81,7 +87,7 @@ class Response {
    /**
     * Add header to response
     * @param string $value
-     * @return self $this
+     * @return static
     */
    public function header($value) {
        header($value);
@@ -91,7 +97,7 @@ class Response {
    /**
     * Add multiple headers to response
     * @param array $headers
-     * @return self $this
+     * @return static
     */
    public function headers(array $headers) {
        foreach($headers as $header) {
@@ -0,0 +1,11 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+interface IControllerRoute {
+
+    public function getController();
+    public function setController($controller);
+    public function getMethod();
+    public function setMethod($method);
+
+}
@@ -0,0 +1,9 @@
+<?php
+namespace Pecee\SimpleRouter;
+
+interface ILoadableRoute {
+
+    public function getUrl();
+    public function setUrl($url);
+
+}
@@ -1,97 +1,177 @@
 <?php
 namespace Pecee\SimpleRouter;

-use Pecee\CsrfToken;
 use Pecee\Exception\RouterException;
+use Pecee\Handler\IExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
+use Pecee\Http\Response;

 class RouterBase {

    protected static $instance;

+    /**
+     * Current request
+     * @var Request
+     */
    protected $request;
-    protected $currentRoute;
-    protected $routes;
-    protected $processedRoutes;
-    protected $controllerUrlMap;
-    protected $backStack;
-    protected $defaultNamespace;
-    protected $bootManagers;
-    protected $baseCsrfVerifier;

-    // TODO: clean up - cut some of the methods down to smaller pieces
+    /**
+     * Response
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Used to keep track of whether to add routes to stack or not.
+     * @var RouterEntry
+     */
+    protected $currentRoute;
+
+    /**
+     * All added routes
+     * @var array
+     */
+    protected $routes;
+
+    /**
+     * List of
+     * @var array
+     */
+    protected $controllerUrlMap;
+
+    /**
+     * Backstack array used to keep track of sub-routes
+     * @var array
+     */
+    protected $backStack;
+
+    /**
+     * The default namespace that all routes will inherit
+     * @var string
+     */
+    protected $defaultNamespace;
+
+    /**
+     * List of added bootmanagers
+     * @var array
+     */
+    protected $bootManagers;
+
+    /**
+     * Csrf verifier class
+     * @var BaseCsrfVerifier
+     */
+    protected $csrfVerifier;
+
+    /**
+     * Get exception handlers
+     * @var array
+     */
+    protected $exceptionHandlers;
+
+    /**
+     * The current loaded route
+     * @var RouterRoute|null
+     */
+    protected $loadedRoute;
+
+    /**
+     * List over route changes (to avoid looping)
+     * @var array
+     */
+    protected $routeChanges;

    public function __construct() {
+        $this->reset();
+    }
+
+    public function reset() {
+        $this->request = new Request();
+        $this->response = new Response($this->request);
        $this->routes = array();
        $this->backStack = array();
        $this->controllerUrlMap = array();
-        $this->baseCsrfVerifier = new BaseCsrfVerifier();
-        $this->request = new Request();
        $this->bootManagers = array();
-
-        $csrf = new CsrfToken();
-        $token = ($csrf->hasToken()) ? $csrf->getToken() : $csrf->generateToken();
-        $csrf->setToken($token);
+        $this->exceptionHandlers = array();
+        $this->routeChanges = array();
    }

+    /**
+     * Add route
+     * @param RouterEntry $route
+     * @return RouterEntry
+     */
    public function addRoute(RouterEntry $route) {
        if($this->currentRoute !== null) {
            $this->backStack[] = $route;
        } else {
            $this->routes[] = $route;
        }
+
+        return $route;
    }

-    protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), $backStack = false, $group = null) {
+    protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), $backStack = false, RouterGroup $group = null) {
        // Loop through each route-request

-        $routesCount = count($routes);
        $mergedSettings = array();

        /* @var $route RouterEntry */
-        for($i = 0; $i < $routesCount; $i++) {
+        for($i = 0; $i < count($routes); $i++) {

            $route = $routes[$i];

-            $route->addSettings($settings);
+            if(count($settings)) {
+                $route->addSettings($settings);
+            }

-            if($backStack) {
+            if($backStack && $group !== null) {
                $route->setGroup($group);
            }

-            if($this->defaultNamespace && !$route->getNamespace()) {
-                $namespace = null;
+            if($route->getNamespace() === null && $this->defaultNamespace !== null) {
+                $namespace = $this->defaultNamespace;
                if ($route->getNamespace()) {
-                    $namespace = $this->defaultNamespace . '\\' . $route->getNamespace();
-                } else {
-                    $namespace = $this->defaultNamespace;
+                    $namespace .= '\\' . $route->getNamespace();
                }

                $route->setNamespace($namespace);
            }

-            $newPrefixes = $prefixes;
-
-            if($route->getPrefix()) {
-                array_push($newPrefixes, rtrim($route->getPrefix(), '/'));
-            }
-
-            if(!($route instanceof RouterGroup)) {
-                if(is_array($newPrefixes) && count($newPrefixes) && $backStack) {
-                    $route->setUrl( join('/', $newPrefixes) . $route->getUrl() );
-                }
-
-                $group = null;
-                $this->controllerUrlMap[] = $route;
+            if($group !== null && $group->getPrefix() !== null && trim($group->getPrefix(), '/') !== '') {
+                $prefixes[] = trim($group->getPrefix(), '/');
            }

+            $group = null;
            $this->currentRoute = $route;

-            if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
-                $group = $route;
-                $route->renderRoute($this->request);
-                $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
+            if($route instanceof ILoadableRoute) {
+                if(is_array($prefixes) && count($prefixes) && $backStack) {
+                    $route->setUrl( '/' . join('/', $prefixes) . $route->getUrl() );
+                }
+
+                $this->controllerUrlMap[] = $route;
+            } else {
+                if(is_callable($route->getCallback())) {
+
+                    $route->renderRoute($this->request);
+
+                    if ($route->matchRoute($this->request)) {
+
+                        /* @var $group RouterGroup */
+                        $group = $route;
+
+                        $mergedSettings = array_merge($settings, $group->getMergeableSettings());
+
+                        // Add ExceptionHandler
+                        if ($group->getExceptionHandler() !== null) {
+                            $this->exceptionHandlers[] = $route;
+                        }
+
+                    }
+                }
            }

            $this->currentRoute = null;
@@ -101,74 +181,116 @@ class RouterBase {
                $this->backStack = array();

                // Route any routes added to the backstack
-                $this->processRoutes($backStack, $mergedSettings, $newPrefixes, true, $group);
+                $this->processRoutes($backStack, $mergedSettings, $prefixes, true, $group);
            }
        }
    }

-    public function routeRequest() {
-
-        // Initialize boot-managers
-        if(count($this->bootManagers)) {
-            /* @var $manager RouterBootManager */
-            foreach($this->bootManagers as $manager) {
-                $this->request = $manager->boot($this->request);
-
-                if(!($this->request instanceof Request)) {
-                    throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
-                }
-            }
-        }
-
-        // Verify csrf token for request
-        if($this->baseCsrfVerifier !== null) {
-            /* @var $csrfVerifier BaseCsrfVerifier */
-            $csrfVerifier = $this->baseCsrfVerifier;
-            $csrfVerifier = new $csrfVerifier();
-            $csrfVerifier->handle($this->request);
-        }
-
-        // Loop through each route-request
-        $this->processRoutes($this->routes);
+    public function routeRequest(Request $newRequest = null) {

+        $this->loadedRoute = null;
        $routeNotAllowed = false;

-        $max = count($this->controllerUrlMap);
+        // Create a fictive request - so it can be changed in the middleware or exceptionhandler later on...
+        $request = clone $this->request;

-        /* @var $route RouterEntry */
-        for($i = 0; $i < $max; $i++) {
+        try {

-            $route = $this->controllerUrlMap[$i];
+            // Initialize boot-managers
+            if(count($this->bootManagers)) {
+                /* @var $manager RouterBootManager */
+                foreach($this->bootManagers as $manager) {
+                    $request = $manager->boot($request);

-            $routeMatch = $route->matchRoute($this->request);
-
-            if($routeMatch) {
-
-                if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
-                    $routeNotAllowed = true;
-                    continue;
+                    if(!($this->request instanceof Request)) {
+                        throw new RouterException('Custom router bootmanager "'. get_class($manager) .'" must return instance of Request.');
+                    }
                }
-
-                $routeNotAllowed = false;
-
-                $this->request->loadedRoute = $route;
-                $route->loadMiddleware($this->request);
-
-                $this->request->loadedRoute->renderRoute($this->request);
-                break;
            }
+
+            if($newRequest === null) {
+
+                // Loop through each route-request
+                $this->processRoutes($this->routes);
+
+                if($this->csrfVerifier !== null) {
+
+                    // Verify csrf token for request
+                    $this->csrfVerifier->handle($this->request);
+                }
+            }
+
+            $request = ($newRequest !== null) ? $newRequest : $request;
+
+            /* @var $route RouterEntry */
+            for ($i = 0; $i < count($this->controllerUrlMap); $i++) {
+
+                $route = $this->controllerUrlMap[$i];
+
+                if ($route->matchRoute($request)) {
+
+                    if (count($route->getRequestMethods()) && !in_array($request->getMethod(), $route->getRequestMethods())) {
+                        $routeNotAllowed = true;
+                        continue;
+                    }
+
+                    $routeNotAllowed = false;
+
+                    $this->loadedRoute = $route;
+
+                    $request = $this->loadedRoute->loadMiddleware($request, $this->loadedRoute);
+                    $request = ($request === null) ? $this->request : $request;
+
+                    if($request !== null && $request->getUri() !== $this->request->getUri() && !in_array($request->getUri(), $this->routeChanges)) {
+                        $this->routeChanges[] = $request->getUri();
+                        $this->routeRequest($request);
+                        return;
+                    }
+
+                    $this->loadedRoute->renderRoute($request);
+
+                    break;
+                }
+            }
+
+        } catch(\Exception $e) {
+            $this->handleException($e);
        }

        if($routeNotAllowed) {
-            throw new RouterException('Route or method not allowed', 403);
+            $this->handleException(new RouterException('Route or method not allowed', 403));
        }

-        if(!$this->request->loadedRoute) {
-            throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
+        if($this->loadedRoute === null) {
+            $this->handleException(new RouterException(sprintf('Route not found: %s', $request->getUri()), 404));
        }
    }

+    protected function handleException(\Exception $e) {
+
+        /* @var $route RouterGroup */
+        foreach ($this->exceptionHandlers as $route) {
+            $handler = $route->getExceptionHandler();
+            $handler = new $handler();
+
+            if (!($handler instanceof IExceptionHandler)) {
+                throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
+            }
+
+            $request = $handler->handleError($this->request, $this->loadedRoute, $e);
+
+            if($request !== null && !in_array($request->getUri(), $this->routeChanges)) {
+                $this->routeChanges[] = $request->getUri();
+                $this->routeRequest($request);
+            }
+
+        }
+
+        throw $e;
+    }
+
    /**
+     * Get default namespace
     * @return string
     */
    public function getDefaultNamespace(){
@@ -176,13 +298,17 @@ class RouterBase {
    }

    /**
+     * Set the main default namespace that all routes will inherit
     * @param string $defaultNamespace
+     * @return static
     */
    public function setDefaultNamespace($defaultNamespace) {
        $this->defaultNamespace = $defaultNamespace;
+        return $this;
    }

    /**
+     * Get bootmanagers
     * @return array
     */
    public function getBootManagers() {
@@ -190,40 +316,21 @@ class RouterBase {
    }

    /**
+     * Set bootmanagers
     * @param array $bootManagers
     */
    public function setBootManagers(array $bootManagers) {
        $this->bootManagers = $bootManagers;
    }

+    /**
+     * Add bootmanager
+     * @param RouterBootManager $bootManager
+     */
    public function addBootManager(RouterBootManager $bootManager) {
        $this->bootManagers[] = $bootManager;
    }

-    /**
-     * @return RouterEntry
-     */
-    public function getLoadedRoute() {
-        if(!($this->request->loadedRoute instanceof RouterGroup)) {
-            return $this->request->loadedRoute;
-        }
-        return null;
-    }
-
-    /**
-     * @return array
-     */
-    public function getBackstack() {
-        return $this->backStack;
-    }
-
-    /**
-     * @return RouterEntry
-     */
-    public function getCurrentRoute(){
-        return $this->currentRoute;
-    }
-
    /**
     * @return array
     */
@@ -241,37 +348,48 @@ class RouterBase {
    }

    /**
-     * Get base csrf verifier class
-     * @return BaseCsrfVerifier
+     * Get response
+     * @return Response
     */
-    public function getBaseCsrfVerifier() {
-        return $this->baseCsrfVerifier;
+    public function getResponse() {
+        return $this->response;
    }

    /**
-     * Set base csrf verifier class
-     *
-     * @param BaseCsrfVerifier $baseCsrfVerifier
-     * @return self
+     * Get csrf verifier class
+     * @return BaseCsrfVerifier
     */
-    public function setBaseCsrfVerifier(BaseCsrfVerifier $baseCsrfVerifier) {
-        $this->baseCsrfVerifier = $baseCsrfVerifier;
+    public function getCsrfVerifier() {
+        return $this->csrfVerifier;
+    }
+
+    /**
+     * Set csrf verifier class
+     *
+     * @param BaseCsrfVerifier $csrfVerifier
+     * @return static
+     */
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier) {
+        $this->csrfVerifier = $csrfVerifier;
        return $this;
    }

    public function arrayToParams(array $getParams = null, $includeEmpty = true) {
-        if (is_array($getParams) && count($getParams) > 0) {
-            foreach ($getParams as $key => $val) {
-                if (!empty($val) || empty($val) && $includeEmpty) {
-                    $getParams[$key] = $key . '=' . $val;
-                }
+
+        if(is_array($getParams) && count($getParams)) {
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    return (!empty($item));
+                });
            }
-            return join('&', $getParams);
+
+            return '?' . http_build_query($getParams);
        }
+
        return '';
    }

-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
+    protected function processUrl(RouterRoute $route, $method = null, $parameters = null, $getParams = null) {

        $domain = '';

@@ -288,25 +406,22 @@ class RouterBase {

        $url = $domain . '/' . trim($route->getUrl(), '/');

-        if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
+        if($route instanceof IControllerRoute && $method !== null) {
            $url .= $method;
-        }

-        if($route instanceof RouterController || $route instanceof RouterResource) {
            if(count($parameters)) {
                $url .= join('/', $parameters);
            }
        } else {
-            /* @var $route RouterEntry */
-            if(is_array($parameters)) {
+            if($parameters !== null && is_array($parameters)) {
                $params = array_merge($route->getParameters(), $parameters);
            } else {
                $params = $route->getParameters();
            }

-            $otherParams = [];
-
+            $otherParams = array();
            $i = 0;
+
            foreach($params as $param => $value) {
                $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
                if(stripos($url, '{' . $param. '}') !== false || stripos($url, '{' . $param . '?}') !== false) {
@@ -322,8 +437,8 @@ class RouterBase {

        $url = rtrim($url, '/') . '/';

-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
        }

        return $url;
@@ -341,25 +456,23 @@ class RouterBase {

        // Return current route if no options has been specified
        if($controller === null && $parameters === null) {
-            $getParams = (is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;
+            $getParams = ($getParams !== null && is_array($getParams)) ? array_merge($_GET, $getParams) : $_GET;

-            $url = parse_url(Request::getInstance()->getUri());
-            $url = $url['path'];
+            $url = parse_url($this->request->getUri(), PHP_URL_PATH);

-            if(count($getParams)) {
-                $url .= '?' . $this->arrayToParams($getParams);
+            if($getParams !== null) {
+                $url .= $this->arrayToParams($getParams);
            }

            return $url;
        }

-        if($controller === null && $this->request->loadedRoute !== null) {
-            return $this->processUrl($this->request->loadedRoute, $this->request->loadedRoute->getMethod(), $parameters, $getParams);
+        if($controller === null && $this->loadedRoute !== null) {
+            return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams);
        }

        $c = '';
        $method = null;
-
        $max = count($this->controllerUrlMap);

        /* @var $route RouterRoute */
@@ -368,14 +481,16 @@ class RouterBase {
            $route = $this->controllerUrlMap[$i];

            // Check an alias exist, if the matches - use it
-            if($route instanceof RouterRoute && strtolower($route->getAlias()) === strtolower($controller)) {
-                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-            }
-
-            if($route instanceof RouterRoute && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getCallback();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
+            if($route instanceof IControllerRoute) {
                $c = $route->getController();
+            } else {
+                if($route->hasAlias($controller)) {
+                    return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
+                }
+
+                if(!is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
+                    $c = $route->getCallback();
+                }
            }

            if($c === $controller || strpos($c, $controller) === 0) {
@@ -390,10 +505,10 @@ class RouterBase {

            $route = $this->controllerUrlMap[$i];

-            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getClass();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
+            if($route instanceof IControllerRoute) {
                $c = $route->getController();
+            } else if(!is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
+                $c = $route->getClass();
            }

            if(stripos($controller, '@') !== false) {
@@ -410,27 +525,29 @@ class RouterBase {
        $controller = ($controller === null) ? '/' : $controller;
        $url = array($controller);

-        if(is_array($parameters)) {
-            foreach($parameters as $key => $value) {
-                array_push($url,$value);
-            }
+        if($parameters !== null && is_array($parameters) && count($parameters)) {
+            $url = array_merge($url, $parameters);
        }

        $url = '/' . trim(join('/', $url), '/') . '/';

-
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
        }

        return $url;
    }

+    /**
+     * Get current router instance
+     * @return static
+     */
    public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
+        if(static::$instance === null) {
+            static::$instance = new static();
        }
-        return self::$instance;
+
+        return static::$instance;
    }

 }
@@ -4,7 +4,7 @@ namespace Pecee\SimpleRouter;
 use Pecee\Exception\RouterException;
 use Pecee\Http\Request;

-class RouterController extends RouterEntry {
+class RouterController extends RouterEntry implements ILoadableRoute, IControllerRoute {

    const DEFAULT_METHOD = 'index';

@@ -13,7 +13,6 @@ class RouterController extends RouterEntry {
    protected $method;

    public function __construct($url, $controller) {
-        parent::__construct();
        $this->url = $url;
        $this->controller = $controller;
    }
@@ -44,8 +43,8 @@ class RouterController extends RouterEntry {
    }

    public function matchRoute(Request $request) {
-        $url = parse_url(urldecode($request->getUri()));
-        $url = rtrim($url['path'], '/') . '/';
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

        if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {

@@ -55,11 +54,11 @@ class RouterController extends RouterEntry {

            if(count($path)) {

-                $method = (!isset($path[0]) || trim($path[0]) === '') ? self::DEFAULT_METHOD : $path[0];
+                $method = (!isset($path[0]) || trim($path[0]) === '') ? static::DEFAULT_METHOD : $path[0];
                $this->method = $method;

                array_shift($path);
-                $this->parameters = $path;
+                $this->settings['parameters'] = $path;

                // Set callback
                $this->setCallback($this->controller . '@' . $this->method);
@@ -79,10 +78,12 @@ class RouterController extends RouterEntry {

    /**
     * @param string $url
+     * @return static
     */
    public function setUrl($url) {
        $url = rtrim($url, '/') . '/';
        $this->url = $url;
+        return $this;
    }

    /**
@@ -94,9 +95,11 @@ class RouterController extends RouterEntry {

    /**
     * @param string $controller
+     * @return static
     */
    public function setController($controller) {
        $this->controller = $controller;
+        return $this;
    }

    /**
@@ -108,9 +111,11 @@ class RouterController extends RouterEntry {

    /**
     * @param string $method
+     * @return static
     */
    public function setMethod($method) {
        $this->method = $method;
+        return $this;
    }

 }
@@ -14,41 +14,26 @@ abstract class RouterEntry {
    const REQUEST_TYPE_PATCH = 'patch';
    const REQUEST_TYPE_DELETE = 'delete';

-    public static $allowedRequestTypes = array(
+    public static $allowedRequestTypes = [
        self::REQUEST_TYPE_DELETE,
        self::REQUEST_TYPE_GET,
        self::REQUEST_TYPE_POST,
        self::REQUEST_TYPE_PUT,
-        self::REQUEST_TYPE_PATCH
-    );
+        self::REQUEST_TYPE_PATCH,
+    ];
+
+    protected $settings = [
+        'requestMethods' => array(),
+        'where' => array(),
+        'parameters' => array(),
+        'middleware' => array(),
+    ];

-    protected $settings;
    protected $callback;

-    public function __construct() {
-        $this->settings = array();
-        $this->settings['requestMethods'] = array();
-        $this->settings['where'] = array();
-        $this->settings['parameters'] = array();
-    }
-
-    /**
-     * Returns callback name/identifier for the current route based on the callback.
-     * Useful if you need to get a unique identifier for the loaded route, for instance
-     * when using translations etc.
-     *
-     * @return string
-     */
-    public function getIdentifier() {
-        if(strpos($this->callback, '@') !== false) {
-            return $this->callback;
-        }
-        return 'function_' . md5($this->callback);
-    }
-
    /**
     * @param string $callback
-     * @return self;
+     * @return static
     */
    public function setCallback($callback) {
        $this->callback = $callback;
@@ -88,52 +73,36 @@ abstract class RouterEntry {
        return $this;
    }

-    /**
-     * @param string $prefix
-     * @return self
-     */
-    public function setPrefix($prefix) {
-        $this->prefix = '/' . trim($prefix, '/') . '/';
-        return $this;
-    }
-
    /**
     * @param string $middleware
-     * @return self
+     * @return static
     */
    public function setMiddleware($middleware) {
-        $this->middleware = $middleware;
+        $this->settings['middleware'][] = $middleware;
        return $this;
    }

    /**
     * @param string $namespace
-     * @return self
+     * @return static
     */
    public function setNamespace($namespace) {
-        $this->namespace = $namespace;
+        $this->settings['namespace'] = $namespace;
        return $this;
    }

    /**
-     * @return string
-     */
-    public function getPrefix() {
-        return $this->prefix;
-    }
-
-    /**
-     * @return string
+     * @return string|array
     */
    public function getMiddleware() {
-        return $this->middleware;
+        return $this->settingArray('middleware');
    }

    /**
     * @return string
     */
    public function getNamespace() {
-        return $this->namespace;
+        return $this->setting('namespace');
    }

    /**
@@ -144,18 +113,18 @@ abstract class RouterEntry {
    }

    /**
-     * @return mixed
+     * @return array
     */
    public function getParameters(){
-        return ($this->parameters === null) ? array() : $this->parameters;
+        return $this->setting('parameters', array());
    }

    /**
     * @param mixed $parameters
-     * @return self
+     * @return static
     */
    public function setParameters($parameters) {
-        $this->parameters = $parameters;
+        $this->settings['parameters'] = $parameters;
        return $this;
    }

@@ -163,10 +132,10 @@ abstract class RouterEntry {
     * Add regular expression parameter match
     *
     * @param array $options
-     * @return self
+     * @return static
     */
    public function where(array $options) {
-        $this->where = array_merge($this->where, $options);
+        $this->settings['where'] = array_merge($this->settings['where'], $options);
        return $this;
    }

@@ -174,10 +143,10 @@ abstract class RouterEntry {
     * Add regular expression match for url
     *
     * @param string $regex
-     * @return self
+     * @return static
     */
    public function match($regex) {
-        $this->regexMatch = $regex;
+        $this->settings['regexMatch'] = $regex;
        return $this;
    }

@@ -187,60 +156,27 @@ abstract class RouterEntry {
     * @return array
     */
    public function getMergeableSettings() {
-        $settings = $this->settings;
-
-        if(isset($settings['prefix'])) {
-            unset($settings['prefix']);
-        }
-
-        return $settings;
+        return $this->settings;
    }

    /**
     * @param array $settings
-     * @return self
+     * @return static
     */
-    public function addSettings(array $settings = null) {
-        if(is_array($settings)) {
-            $this->settings = array_merge($this->settings, $settings);
-        }
+    public function addSettings(array $settings) {
+        $this->settings = array_merge($this->settings, $settings);
        return $this;
    }

    /**
     * @param array $settings
-     * @return self
+     * @return static
     */
    public function setSettings($settings) {
        $this->settings = $settings;
-
-        if(isset($settings['prefix'])) {
-            $this->setPrefix($settings['prefix']);
-        }
-
        return $this;
    }

-    /**
-     * Dynamically access settings value
-     *
-     * @param $name
-     * @return mixed|null
-     */
-    public function __get($name) {
-        return (isset($this->settings[$name]) ? $this->settings[$name] : null);
-    }
-
-    /**
-     * Dynamicially set settings value
-     *
-     * @param string $name
-     * @param mixed|null $value
-     */
-    public function __set($name, $value = null) {
-        $this->settings[$name] = $value;
-    }
-
    protected function loadClass($name) {
        if(!class_exists($name)) {
            throw new RouterException(sprintf('Class %s does not exist', $name));
@@ -249,7 +185,7 @@ abstract class RouterEntry {
        return new $name();
    }

-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+') {
+    protected function parseParameters($route, $url, $parameterRegex = '[\w]+') {
        $parameterNames = array();
        $regex = '';
        $lastCharacter = '';
@@ -261,12 +197,6 @@ abstract class RouterEntry {

            $character = $route[$i];

-            // Skip "/" if we are at the end of a parameter
-            if($lastCharacter === '}' && $character === '/') {
-                $lastCharacter = $character;
-                continue;
-            }
-
            if($character === '{') {
                // Remove "/" and "\" from regex
                if(substr($regex, strlen($regex)-1) === '/') {
@@ -279,18 +209,23 @@ abstract class RouterEntry {
                // Check for optional parameter

                // Use custom parameter regex if it exists
-                if(is_array($this->where) && isset($this->where[$parameter])) {
-                    $parameterRegex = $this->where[$parameter];
+                if(is_array($this->setting('where')) && isset($this->settings['where'][$parameter])) {
+                    $parameterRegex = $this->settings['where'][$parameter];
                }

                if($lastCharacter === '?') {
                    $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
+                    $regex .= '(?:\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?)?';
                    $required = false;
                } else {
-                    $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
+                    $regex .= '\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?';
                }
-                $parameterNames[] = array('name' => $parameter, 'required' => $required);
+
+                $parameterNames[] = [
+                    'name' => $parameter,
+                    'required' => $required
+                ];
+
                $parameter = '';
                $isParameter = false;

@@ -307,26 +242,25 @@ abstract class RouterEntry {

        $parameterValues = array();

-        if(preg_match('/^'.$regex.'$/is', $url, $parameterValues)) {
+        if(preg_match('/^'.$regex.'\/?$/is', $url, $parameterValues)) {
+
            $parameters = array();

            $max = count($parameterNames);

-            if($max) {
-                for($i = 0; $i < $max; $i++) {
-                    $name = $parameterNames[$i];
-                    $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
+            for($i = 0; $i < $max; $i++) {
+                $name = $parameterNames[$i];
+                $parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;

-                    if($name['required'] && $parameterValue === null) {
-                        throw new RouterException('Missing required parameter ' . $name['name'], 404);
-                    }
-
-                    if(!$name['required'] && $parameterValue === null) {
-                        continue;
-                    }
-
-                    $parameters[$name['name']] = $parameterValue;
+                if($name['required'] && $parameterValue === null) {
+                    throw new RouterException('Missing required parameter ' . $name['name'], 404);
                }
+
+                if(!$name['required'] && $parameterValue === null) {
+                    continue;
+                }
+
+                $parameters[$name['name']] = $parameterValue;
            }

            return $parameters;
@@ -335,34 +269,22 @@ abstract class RouterEntry {
        return null;
    }

-    public function loadMiddleware(Request $request) {
-        if($this->getMiddleware()) {
-            if(is_array($this->getMiddleware())) {
-                foreach($this->getMiddleware() as $middleware) {
-                    $middleware = $this->loadClass($middleware);
-                    if (!($middleware instanceof IMiddleware)) {
-                        throw new RouterException($middleware . ' must be instance of Middleware');
-                    }
-
-                    /* @var $class IMiddleware */
-                    $middleware->handle($request);
-                }
-            } else {
-                $middleware = $this->loadClass($this->getMiddleware());
+    public function loadMiddleware(Request $request, RouterEntry &$route) {
+        if(count($this->getMiddleware())) {
+            foreach($this->getMiddleware() as $middleware) {
+                $middleware = $this->loadClass($middleware);
                if (!($middleware instanceof IMiddleware)) {
-                    throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
+                    throw new RouterException($middleware . ' must be instance of Middleware');
                }

                /* @var $class IMiddleware */
-                $middleware->handle($request);
+                $middleware->handle($request, $route);
            }
        }
    }

    public function renderRoute(Request $request) {
-
        if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
-
            // When the callback is a function
            call_user_func_array($this->getCallback(), $this->getParameters());
        } else {
@@ -378,7 +300,7 @@ abstract class RouterEntry {
            }

            $parameters = array_filter($this->getParameters(), function($var){
-                return !is_null($var);
+                return ($var !== null);
            });

            call_user_func_array(array($class, $method), $parameters);
@@ -393,7 +315,7 @@ abstract class RouterEntry {
     * Set allowed request methods
     *
     * @param array $methods
-     * @return self $this
+     * @return static $this
     */
    public function setRequestMethods(array $methods) {
        $this->settings['requestMethods'] = $methods;
@@ -401,27 +323,37 @@ abstract class RouterEntry {
    }

    /**
-     * Get allowed requeset methods
+     * Get allowed request methods
     *
     * @return array
     */
    public function getRequestMethods() {
-        if(!isset($this->settings['requestMethods']) || isset($this->settings['requestMethods']) && !is_array($this->settings['requestMethods'])) {
-            $value = isset($this->settings['requestMethods']) ? $this->settings['requestMethods'] : null;
-            return array($value);
-        }
-        return $this->settings['requestMethods'];
+        return $this->settingArray('requestMethods');
    }

    public function getGroup() {
-        return $this->group;
+        return $this->setting('group');
    }

    public function setGroup($group) {
-        $this->group = $group;
+        $this->settings['group'] = $group;
        return $this;
    }

+    protected function setting($name, $defaultValue = null) {
+        return isset($this->settings[$name]) ? $this->settings[$name] : $defaultValue;
+    }
+
+    protected function settingArray($name) {
+        $value = $this->setting($name);
+
+        if($value === null) {
+            return [];
+        }
+
+        return (!is_array($value)) ? array($value) : $value;
+    }
+
    abstract function matchRoute(Request $request);

 }
@@ -7,24 +7,18 @@ use Pecee\Http\Request;

 class RouterGroup extends RouterEntry {

-    public function __construct() {
-        parent::__construct();
-    }
-
    public function matchDomain(Request $request) {
-        if($this->domain !== null) {
+        if($this->setting('domain') !== null) {

-            if(is_array($this->domain)) {
+            if(is_array($this->setting('domain'))) {

-                $max = count($this->domain);
-
-                for($i = 0; $i < $max; $i++) {
-                    $domain = $this->domain[$i];
+                for($i = 0; $i < count($this->setting('domain')); $i++) {
+                    $domain = $this->settings['domain'][$i];

                    $parameters = $this->parseParameters($domain, $request->getHost(), '[^.]*');

                    if($parameters !== null) {
-                        $this->parameters = $parameters;
+                        $this->settings['parameters'] = $parameters;
                        return true;
                    }
                }
@@ -32,10 +26,10 @@ class RouterGroup extends RouterEntry {
                return false;
            }

-            $parameters = $this->parseParameters($this->domain, $request->getHost(), '[^.]*');
+            $parameters = $this->parseParameters($this->setting('domain'), $request->getHost(), '[^.]*');

            if ($parameters !== null) {
-                $this->parameters = $parameters;
+                $this->settings['parameters'] = $parameters;
                return true;
            }

@@ -47,10 +41,10 @@ class RouterGroup extends RouterEntry {

    public function renderRoute(Request $request) {
        // Check if request method is allowed
-        $hasAccess = (!$this->method);
+        $hasAccess = true;

-        if($this->method) {
-            if(is_array($this->method)) {
+        if($this->setting('method') !== null) {
+            if(is_array($this->setting('method'))) {
                $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
            } else {
                $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
@@ -76,16 +70,69 @@ class RouterGroup extends RouterEntry {
    }

    public function setExceptionHandler($class) {
-        $this->exceptionHandler = $class;
+        $this->settings['exceptionHandler'] = $class;
        return $this;
    }

    public function getExceptionHandler() {
-        return $this->exceptionHandler;
+        return $this->setting('exceptionHandler');
    }

    public function getDomain() {
-        return $this->domain;
+        return $this->setting('domain');
+    }
+
+    /**
+     * @param string $prefix
+     * @return static
+     */
+    public function setPrefix($prefix) {
+        $this->settings['prefix'] = '/' . ltrim($prefix, '/');
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->setting('prefix');
+    }
+
+    /**
+     * @param array $settings
+     * @return static
+     */
+    public function addSettings(array $settings) {
+
+        if ($this->getNamespace() !== null && isset($settings['namespace'])) {
+            unset($settings['namespace']);
+        }
+
+        // Push middleware if multiple
+        if ($this->getMiddleware() !== null && isset($settings['middleware'])) {
+
+            if (!is_array($settings['middleware'])) {
+                $settings['middleware'] = array_merge($this->getMiddleware(), array($settings['middleware']));
+            } else {
+                $settings['middleware'][] = $this->getMiddleware();
+            }
+
+            $settings['middleware'] = array_unique(array_reverse($settings['middleware']));
+
+        }
+
+        $this->settings = array_merge($this->settings, $settings);
+        return $this;
+    }
+
+    public function getMergeableSettings() {
+        $settings = $this->settings;
+
+        if(isset($settings['prefix'])) {
+            unset($settings['prefix']);
+        }
+
+        return $settings;
    }

 }
@@ -4,17 +4,14 @@ namespace Pecee\SimpleRouter;
 use Pecee\Exception\RouterException;
 use Pecee\Http\Request;

-class RouterResource extends RouterEntry {
+class RouterResource extends RouterEntry implements ILoadableRoute, IControllerRoute {

    protected $url;
    protected $controller;
-    protected $postMethod;

    public function __construct($url, $controller) {
-        parent::__construct();
        $this->url = $url;
        $this->controller = $controller;
-        $this->postMethod = strtolower(($_SERVER['REQUEST_METHOD'] != 'GET') ? 'post' : 'get');
    }

    public function renderRoute(Request $request) {
@@ -42,54 +39,54 @@ class RouterResource extends RouterEntry {

    protected function call($method, $parameters) {
        $this->setCallback($this->controller . '@' . $method);
-        $this->parameters = $parameters;
+        $this->settings['parameters'] = $parameters;
        return true;
    }

    public function matchRoute(Request $request) {
-        $url = parse_url(urldecode($request->getUri()));
-        $url = rtrim($url['path'], '/') . '/';
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

        $route = rtrim($this->url, '/') . '/{id?}/{action?}';

-        $parameters = $this->parseParameters($route, $url, '[0-9]+?');
+        $parameters = $this->parseParameters($route, $url);

        if($parameters !== null) {

            if(is_array($parameters)) {
-                $parameters = array_merge($this->parameters, $parameters);
+                $parameters = array_merge($this->settings['parameters'], $parameters);
            }

            $action = isset($parameters['action']) ? $parameters['action'] : null;
            unset($parameters['action']);

            // Delete
-            if($request->getMethod() === self::REQUEST_TYPE_DELETE && $this->postMethod === self::REQUEST_TYPE_POST) {
+            if($request->getMethod() === static::REQUEST_TYPE_DELETE && $request->getMethod() === static::REQUEST_TYPE_POST) {
                return $this->call('destroy', $parameters);
            }

            // Update
-            if(in_array($request->getMethod(), array(self::REQUEST_TYPE_PATCH, self::REQUEST_TYPE_PUT)) && $this->postMethod === self::REQUEST_TYPE_POST) {
+            if(in_array($request->getMethod(), array(static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT)) && $request->getMethod() === static::REQUEST_TYPE_POST) {
                return $this->call('update', $parameters);
            }

            // Edit
-            if(isset($action) && strtolower($action) === 'edit' && $this->postMethod === self::REQUEST_TYPE_GET) {
+            if(isset($action) && strtolower($action) === 'edit' && $request->getMethod() === static::REQUEST_TYPE_GET) {
                return $this->call('edit', $parameters);
            }

            // Create
-            if(strtolower($action) === 'create' && $request->getMethod() === self::REQUEST_TYPE_GET) {
+            if(strtolower($action) === 'create' && $request->getMethod() === static::REQUEST_TYPE_GET) {
                return $this->call('create', $parameters);
            }

            // Save
-            if($this->postMethod === self::REQUEST_TYPE_POST) {
+            if($request->getMethod() === static::REQUEST_TYPE_POST) {
                return $this->call('store', $parameters);
            }

            // Show
-            if(isset($parameters['id']) && $this->postMethod === self::REQUEST_TYPE_GET) {
+            if(isset($parameters['id']) && $request->getMethod() === static::REQUEST_TYPE_GET) {
                return $this->call('show', $parameters);
            }

@@ -109,10 +106,11 @@ class RouterResource extends RouterEntry {

    /**
     * @param string $url
+     * @return static
     */
    public function setUrl($url) {
-        $url = rtrim($url, '/') . '/';
-        $this->url = $url;
+        $this->url = rtrim($url, '/') . '/';
+        return $this;
    }

    /**
@@ -124,9 +122,11 @@ class RouterResource extends RouterEntry {

    /**
     * @param string $controller
+     * @return static
     */
    public function setController($controller) {
        $this->controller = $controller;
+        return $this;
    }

 }
@@ -2,33 +2,29 @@

 namespace Pecee\SimpleRouter;

-use Pecee\ArrayUtil;
 use Pecee\Http\Request;

-class RouterRoute extends RouterEntry {
+class RouterRoute extends RouterEntry implements ILoadableRoute {

    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)\?{0,1}}';

    protected $url;

    public function __construct($url, $callback) {
-        parent::__construct();
        $this->setUrl($url);
        $this->setCallback($callback);
-
-        $this->settings['aliases'] = array();
    }

    public function matchRoute(Request $request) {

-        $url = parse_url(urldecode($request->getUri()));
-        $url = rtrim($url['path'], '/') . '/';
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';

        // Match on custom defined regular expression
-        if($this->regexMatch) {
+        if($this->setting('regexMatch') !== null) {
            $parameters = array();
-            if(preg_match('/('.$this->regexMatch.')/is', $request->getHost() . $url, $parameters)) {
-                $this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
+            if(preg_match('/(' . $this->setting('regexMatch') . ')/is', $request->getHost() . $url, $parameters)) {
+                $this->settings['parameters'] = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
                return true;
            }
            return null;
@@ -40,18 +36,10 @@ class RouterRoute extends RouterEntry {
        $parameters = $this->parseParameters($route, $url);

        if($parameters !== null) {
-
-            if(is_array($this->parameters)) {
-                $this->parameters = array_merge($this->parameters, $parameters);
-            } else {
-                $this->parameters = $parameters;
-            }
-
+            $this->settings['parameters'] = array_merge($this->settingArray('parameters'), $parameters);
            return true;
        }

-
-
        return null;
    }

@@ -64,22 +52,23 @@ class RouterRoute extends RouterEntry {

    /**
     * @param string $url
-     * @return self
+     * @return static
     */
    public function setUrl($url) {
        $parameters = array();
        $matches = array();

-        if(preg_match_all('/'.self::PARAMETERS_REGEX_MATCH.'/is', $url, $matches)) {
+        if(preg_match_all('/' . static::PARAMETERS_REGEX_MATCH . '/is', $url, $matches)) {
            $parameters = $matches[1];
        }

        if(count($parameters)) {
-            $tmp = array();
-            foreach($parameters as $param) {
-                $tmp[$param] = null;
+
+            foreach(array_keys($parameters) as $key) {
+                $parameters[$key] = null;
            }
-            $this->parameters = $tmp;
+
+            $this->settings['parameters'] = $parameters;
        }

        $this->url = $url;
@@ -88,30 +77,51 @@ class RouterRoute extends RouterEntry {

    /**
     * Get alias for the url which can be used when getting the url route.
-     * @return string
+     * @return string|array
     */
    public function getAlias(){
-        return $this->alias;
+        return $this->setting('alias');
+    }
+
+    /**
+     * Check if route has given alias.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasAlias($name) {
+        if ($this->getAlias() !== null) {
+            if (is_array($this->getAlias())) {
+                foreach ($this->setting('alias') as $alias) {
+                    if (strtolower($alias) === strtolower($name)) {
+                        return true;
+                    }
+                }
+            }
+            return strtolower($this->getAlias()) === strtolower($name);
+        }
+
+        return false;
    }

    /**
     * Set the url alias for easier getting the url route.
-     * @param string $alias
-     * @return self
+     * @param string|array $alias
+     * @return static
     */
    public function setAlias($alias){
-        $this->alias = $alias;
+        $this->settings['alias'] = $alias;
        return $this;
    }

-    public function setSettings($settings) {
+    public function addSettings(array $settings) {

        // Change as to alias
-        if(isset($settings{'as'})) {
+        if(isset($settings['as'])) {
            $this->setAlias($settings['as']);
        }

-        return parent::setSettings($settings);
+        return parent::addSettings($settings);
    }

 }
@@ -15,13 +15,18 @@ class SimpleRouter {

    /**
     * Start/route request
-     * @param null $defaultNamespace
-     * @throws RouterException
+     * @throws \Pecee\Exception\RouterException
     */
-    public static function start($defaultNamespace = null) {
-        $router = RouterBase::getInstance();
-        $router->setDefaultNamespace($defaultNamespace);
-        $router->routeRequest();
+    public static function start() {
+        RouterBase::getInstance()->routeRequest();
+    }
+
+    /**
+     * Set default namespace for all routes
+     * @param string $defaultNamespace
+     */
+    public static function setDefaultNamespace($defaultNamespace) {
+        RouterBase::getInstance()->setDefaultNamespace($defaultNamespace);
    }

    /**
@@ -29,7 +34,7 @@ class SimpleRouter {
     * @param BaseCsrfVerifier $baseCsrfVerifier
     */
    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier) {
-        RouterBase::getInstance()->setBaseCsrfVerifier($baseCsrfVerifier);
+        RouterBase::getInstance()->setCsrfVerifier($baseCsrfVerifier);
    }

    public static function addBootManager(RouterBootManager $bootManager) {
@@ -37,47 +42,19 @@ class SimpleRouter {
    }

    public static function get($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_GET));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['get'], $url, $callback, $settings);
    }

    public static function post($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_POST));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['post'], $url, $callback, $settings);
    }

    public static function put($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_PUT, RouterRoute::REQUEST_TYPE_PATCH));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['put'], $url, $callback, $settings);
    }

    public static function delete($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_DELETE));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
+        return static::match(['delete'], $url, $callback, $settings);
    }

    public static function group($settings = array(), $callback) {
@@ -88,8 +65,7 @@ class SimpleRouter {
            $group->setSettings($settings);
        }

-        $router = RouterBase::getInstance();
-        $router->addRoute($group);
+        RouterBase::getInstance()->addRoute($group);

        return $group;
    }
@@ -98,54 +74,77 @@ class SimpleRouter {
     * Adds get + post route
     *
     * @param string $url
-     * @param function $callback
+     * @param callable $callback
     * @param array|null $settings
     * @return RouterRoute
     */
    public static function basic($url, $callback, array $settings = null) {
-        return self::match(['get', 'post'], $url, $callback, $settings);
+        return static::match(['get', 'post'], $url, $callback, $settings);
    }

    public static function match(array $requestMethods, $url, $callback, array $settings = null) {
        $route = new RouterRoute($url, $callback);
        $route->setRequestMethods($requestMethods);
-        $route->addSettings($settings);

-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+        if($settings !== null) {
+            $route->addSettings($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function all($url, $callback, array $settings = null) {
        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->addSettings($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function controller($url, $controller, array $settings = null) {
        $route = new RouterController($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->addSettings($settings);
+        }
+
+        RouterBase::getInstance()->addRoute($route);

        return $route;
    }

    public static function resource($url, $controller, array $settings = null) {
        $route = new RouterResource($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+
+        if($settings !== null) {
+            $route->addSettings($settings);
+        }
+
+        static::router()->addRoute($route);

        return $route;
    }

    public static function getRoute($controller = null, $parameters = null, $getParams = null) {
-        return RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+        return static::router()->getRoute($controller, $parameters, $getParams);
+    }
+
+    public static function request() {
+        return static::router()->getRequest();
+    }
+
+    public static function response() {
+        return static::router()->getResponse();
+    }
+
+    protected static function router() {
+        return RouterBase::getInstance();
    }

 }
@@ -0,0 +1,18 @@
+<?php
+
+class DummyController {
+
+    public function start() {
+        echo static::class . '@' .'start() OK';
+    }
+
+    public function param($params = null) {
+        $params = func_get_args();
+        echo 'Params: ' . join(', ', $params);
+    }
+
+    public function notFound() {
+        echo 'not found';
+    }
+
+}
@@ -0,0 +1,14 @@
+<?php
+
+require_once 'Exceptions/MiddlewareLoadedException.php';
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class DummyMiddleware implements IMiddleware {
+
+    public function handle(Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null) {
+       throw new MiddlewareLoadedException('Middleware loaded!');
+    }
+
+}
@@ -0,0 +1,2 @@
+<?php
+class MiddlewareLoadedException extends \Exception {}
@@ -0,0 +1,8 @@
+<?php
+class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
+
+    public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null, \Exception $error){
+        throw $error;
+    }
+
+}
@@ -0,0 +1,77 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+
+class GroupTest extends PHPUnit_Framework_TestCase  {
+
+    protected $result;
+
+    public function testGroupLoad() {
+
+        $this->result = false;
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/group'], function() {
+            $this->result = true;
+        });
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        } catch(Exception $e) {
+            echo $e->getMessage();
+        }
+
+        $this->assertTrue($this->result);
+    }
+
+    public function testNestedGroup() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/api/v1/test');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/test', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testManyRoutes() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/match');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/api'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/test', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/match', 'DummyController@start');
+
+        \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/service'], function() {
+            \Pecee\SimpleRouter\SimpleRouter::group(['prefix' => '/v1'], function() {
+                \Pecee\SimpleRouter\SimpleRouter::get('/no-match', 'DummyController@start');
+            });
+        });
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testUrls() {
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setAlias('fancy2');
+
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+        $this->assertTrue((\Pecee\SimpleRouter\SimpleRouter::getRoute('fancy1') === '/my/fancy/url/1/'));
+        $this->assertTrue((\Pecee\SimpleRouter\SimpleRouter::getRoute('fancy2') === '/my/fancy/url/2/'));
+
+    }
+
+}
@@ -0,0 +1,31 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class MiddlewareTest extends PHPUnit_Framework_TestCase  {
+
+    public function testMiddlewareFound() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->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) {
+            $found = ($e instanceof MiddlewareLoadedException);
+        }
+
+        $this->assertTrue($found);
+
+    }
+
+}
@@ -0,0 +1,116 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterRouteTest extends PHPUnit_Framework_TestCase  {
+
+
+    public function testNotFound() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->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() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testPost() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+
+        \Pecee\SimpleRouter\SimpleRouter::post('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testPut() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('put');
+
+        \Pecee\SimpleRouter\SimpleRouter::put('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+    }
+
+    public function testDelete() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('delete');
+
+        \Pecee\SimpleRouter\SimpleRouter::delete('/my/test/url', 'DummyController@start');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testMethodNotAllowed() {
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/my/test/url');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('post');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/my/test/url', 'DummyController@start');
+
+        try {
+            \Pecee\SimpleRouter\SimpleRouter::start();
+        } catch(\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+
+    }
+
+    public function testSimpleParam() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testMultiParam() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test-param1-param2');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+    public function testPathParamRegex() {
+
+        \Pecee\SimpleRouter\RouterBase::getInstance()->reset();
+        \Pecee\SimpleRouter\SimpleRouter::request()->setMethod('get');
+        \Pecee\SimpleRouter\SimpleRouter::request()->setUri('/test/path/123123');
+
+        \Pecee\SimpleRouter\SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
+        \Pecee\SimpleRouter\SimpleRouter::start();
+
+    }
+
+}
Author	SHA1	Message	Date
Simon Sessingø	ad0eceb814	Merge pull request #135 from skipperbent/v2-development Bugfixes	2016-11-16 15:32:32 +02:00
Simon Sessingø	8478899eb6	Bugfixes	2016-11-16 14:30:19 +01:00
Simon Sessingø	4bec2bc5fb	Merge pull request #133 from skipperbent/v2-development Csrf bugfixes	2016-11-15 09:46:54 +02:00
Simon Sessingø	93562bd758	Csrf bugfixes	2016-11-15 08:46:14 +01:00
Simon Sessingø	4f47463497	Merge pull request #131 from skipperbent/v2-development V2 development	2016-11-15 08:13:09 +02:00
Simon Sessingø	9c413a3c53	Bugfixes	2016-11-15 06:38:39 +01:00
Simon Sessingø	669d318a12	Documentation updates	2016-11-15 05:57:58 +01:00
Simon Sessingø	9513e38009	Fixed to unit tests	2016-11-15 05:57:04 +01:00
Simon Sessingø	a13bcd4768	Updated demo project + documentation	2016-11-15 05:48:08 +01:00
Simon Sessingø	83c73a4240	Callback, faking route and documentation updates	2016-11-15 05:44:24 +01:00
Simon Sessingø	bc14790a67	Updated documentation	2016-11-15 03:55:28 +01:00
Simon Sessingø	d5e7a13d89	Development + bugfixes	2016-11-15 03:43:26 +01:00
Simon Sessingø	e5c86c1822	Merge pull request #129 from skipperbent/v2-development Bugfixes	2016-11-15 01:12:41 +02:00
Simon Sessingø	6de0700e17	Bugfixes - Removed debugging constructor. - Updated documentation.	2016-11-15 00:11:57 +01:00
Simon Sessingø	32c305bd2c	Merge pull request #124 from skipperbent/v2-development V2 development	2016-11-08 18:22:49 +02:00
Simon Sessingø	28ffa30d3e	Development - all() in Input class now returns correct array. - all() now supports json data. - Minor bugfixes.	2016-11-08 18:21:21 +02:00
Simon Sessingø	540ebb31ac	Updated documentation	2016-11-07 05:48:02 +01:00
Simon Sessingø	48317ded7a	Updated documentation	2016-11-07 05:40:32 +01:00
Simon Sessingø	28c3370b67	Fixed group not adding multiple middlewares	2016-11-07 04:55:43 +01:00
Simon Sessingø	7ee42c98a7	Updated documentaiton	2016-11-07 04:45:18 +01:00
Simon Sessingø	8740db9582	Development - Isolated Http classes from router. - Removed getInstance from Request object - current router request should now be obtained through SimpleRouter::request(). - Fixed broken test cases. - Added test for regular expression match. - Updated documentation to reflect changes. - Added more helper examples to documentation. - Added helpers to demo-project. - Optimisations.	2016-11-07 04:40:28 +01:00
Simon Sessingø	2d57b45c7b	Fixed urls not being visible	2016-11-06 09:04:05 +01:00
Simon Sessingø	98cc8504d4	Development - Group only loads if prefix matches (if any).	2016-11-06 08:13:47 +01:00
Simon Sessingø	035a5b1629	Development - Added support for cloudflare when using getIp method in Request. - Fixed undefined variable notice in RouterBase class.	2016-11-05 23:07:14 +01:00
Simon Sessingø	832aff0358	Optimised for cli-usage	2016-10-28 07:40:51 +02:00
Simon Sessingø	43e05ad821	Minor optimisations	2016-10-27 19:15:38 +02:00
Simon Sessingø	2fd32868c2	Optimisations and bugfixes	2016-10-27 17:06:05 +02:00
Simon Sessingø	e51b72f0e0	Development - Changed from http_build_query to custom solution as it doesn't support querystrings with "%" on some php versions.	2016-10-27 16:44:35 +02:00
Simon Sessingø	3b5e2aee9d	Added credits	2016-10-20 08:37:39 +02:00
Simon Sessingø	27ba532b2d	Updated documentation	2016-10-20 08:36:50 +02:00
Simon Sessingø	a8620cbc70	Updates - Simplified exception-handling (see demo project for examples). - Optimised sample-project. - Optimised and added further unit-tests. - Optimised and bugfixes.	2016-10-20 08:31:21 +02:00
Simon Sessingø	4e054dccf5	Updated documentation	2016-10-04 02:51:37 +02:00
Simon Sessingø	e7dfbb159c	Updated documentation	2016-10-04 02:50:36 +02:00
Simon Sessingø	8c5a5327d1	Update documentation	2016-10-04 02:47:28 +02:00
Simon Sessingø	3c9a675f25	Optimised middleware load order	2016-09-28 12:29:30 +02:00
Simon Sessingø	dfccd99f2f	Automatically push middlewares if multiple in nested group.	2016-09-28 12:21:23 +02:00
Simon Sessingø	980a4e9b6a	Updated documentation and added demo-project.	2016-09-26 14:37:54 +02:00
Simon Sessingø	fab0d0641c	Allow for default parameters (including A-Z, a-z, 0-9 and "-") when parsing parameters in RouterResource.	2016-06-14 22:20:05 +02:00
Simon Sessingø	4169716f87	Bugfix - Fixed some routes with ending slash not matching on when using Ressource.	2016-06-04 18:44:33 +02:00
Simon Sessingø	53e5b5362f	Development - Enhanced regular expression used for matching parameters. - Added basic unit-tests for parameters. - Fixed typos in PHP-docs and other minor optimizations.	2016-06-04 18:20:46 +02:00
Simon Sessingø	6780b24e59	Development - Optimized the way parameters are parsed as a result, simple-router now supports routes like `/{param1}-{param2}.json`. - Replaced reg-ex for parameter-matching with `\w` which means that default parameter matching on routes now include `_` (underscore) per default. - Simplified `MiddlewareTest` class.	2016-06-04 15:12:04 +02:00
Simon Sessingø	b540c01650	Update README.md	2016-06-03 00:02:45 +02:00
Simon Sessingø	eb8832beec	Added setValue method to InputItem class.	2016-05-04 13:35:23 +02:00
Simon Sessingø	eeafcb7862	Added exist method to Input class.	2016-05-03 07:20:52 +02:00
Simon Sessingø	1a9351c690	- Fixed notifications if included in projects running in command-line where certain variables aren't available.	2016-05-01 00:02:42 +02:00
Simon Sessingø	f98e5ac59d	- Optimized handleException method in RouterBase.	2016-04-23 10:52:51 +02:00
Simon Sessingø	a2dbf4149b	- Added route to ExceptionHandler so Middlewares can be loaded.	2016-04-23 10:50:56 +02:00
Simon Sessingø	ba736b47a3	- Removed support from middlewares on each load - this should be implemented in custom Router instead. - Updated documentation to reflect how to implement Middlewares loaded on each route.	2016-04-22 15:37:27 +02:00
Simon Sessingø	6ab1200fd5	- Return $item if it's an array in get method in Input class.	2016-04-22 14:29:21 +02:00
Simon Sessingø	67a00c6800	- Optimized Input class. - Input class now returns array instead of InputItem instance when object is of type array. - Optimized key behavior in Input class. - Optimized arrayToParams method in RouterBase class. - Added getMergableSettings method to RouterGroup to avoid middleware merge; as they will already be loaded.	2016-04-22 12:55:24 +02:00
Simon Sessingø	1420203149	- Added custom ExceptionHandler example to documentation. - Fixed reference to request() helper in Input class. - Changed RouterBase handleException method to support 404-exceptions.	2016-04-21 07:16:29 +02:00
Simon Sessingø	f7af53a9af	- Optimized Input class to ensure that InputFile items are always returned as object as they contain no value.	2016-04-19 14:48:26 +02:00
Simon Sessingø	6b8351f1b8	- Input class no longer tries to search for parameter in FILE or POST if it's not a postback.	2016-04-19 02:08:14 +02:00
Simon Sessingø	eb3ddf2bf7	[OPTIMISATION] Optimized get method in Input class to trim value and return default value if empty.	2016-04-16 21:34:22 +02:00
Simon Sessingø	2afe784f47	[BUGFIX] Fixed middlewaresToLoad logic used before any routes loaded in RouterBase.	2016-04-16 13:08:32 +02:00
Simon Sessingø	94e98ad5f0	Update README.md	2016-04-16 00:01:12 +02:00
Simon Sessingø	8f24256434	Merge pull request #92 from skipperbent/feature-input Removed old input method from Request class.	2016-04-15 23:20:50 +02:00
Simon Sessingø	ec355c90b5	Removed old input method from Request class.	2016-04-15 23:20:16 +02:00
Simon Sessingø	a8633b5c51	Merge pull request #90 from skipperbent/feature-input Feature input	2016-04-15 23:12:40 +02:00
Simon Sessingø	7fdeef74d6	InputFile now inherits from InputItem	2016-04-15 23:10:49 +02:00
Simon Sessingø	17adfb8aa4	[FEATURE] Added Input classes from pecee-framework. - Updated documentation to reflect new changes.	2016-04-15 23:07:51 +02:00
Simon Sessingø	7a429cec1d	[BUGFIX] Fixed get-parameters as array (param[id]=value) causing array-to-string notice.	2016-04-14 23:52:08 +02:00
Simon Sessingø	3da7c4b446	- Fixed getIp in HttpRequest class not picking up local-ip. - Made setdefaultNamespace method chainable. - Simplified SimpleRouter class.	2016-04-11 22:37:15 +02:00
Simon Sessingø	f3ac9dc47c	[BUGFIX] Fixed notice	2016-04-09 15:38:45 +02:00
Simon Sessingø	22563671c5	[TASK] Moved group-middleware rendering to routeRequest to ensure all route-urls has been initialised. - Optimisations.	2016-04-09 15:26:18 +02:00
Simon Sessingø	491e920cfc	[BUGFIX] Fixed only match group route if prefix is set	2016-04-09 10:01:02 +02:00
Simon Sessingø	6cef099110	[TASK] Updated documentation with list of sites that uses project in production	2016-04-09 09:49:59 +02:00
Simon Sessingø	5f95290e4b	[OPTIMISATION] Optimised exception-message thrown when not using IExceptionHandler interface.	2016-04-09 09:45:39 +02:00
Simon Sessingø	7234415e24	[TASK] Made abstract ExceptionHandler class an interface. - Updated documentation to reflect new changes.	2016-04-09 09:42:57 +02:00
Simon Sessingø	257875c6f9	[TASK] Load group middleware if prefix matches - Middlewares from groups are now loaded if prefix matches. - Optimisations.	2016-04-09 09:25:41 +02:00
Simon Sessingø	9b743e6e57	[FEATURE] Added requirements (issue: #80 )	2016-04-09 08:05:18 +02:00
Simon Sessingø	457dbc5710	[BUGFIX] Fixed issue #83 - Added more tests.	2016-04-09 07:51:03 +02:00
Simon Sessingø	fc4fd0edf1	[FEATURE] Added ExceptionHandling functionality + tests. - Somehow the ExceptionHandling functionality never really get implemented and/or got lost in translation, it's back whup! - Added some basic tests for Middleware + routing.	2016-04-09 07:05:49 +02:00
Simon Sessingø	2f2c3ca3ca	[OPTIMISATIONS] Optimised code and removed unused references	2016-04-09 05:58:18 +02:00
Simon Sessingø	b34738a51a	[OPTIMISATION] Optimised CSRF-token management.	2016-04-09 05:51:27 +02:00
Simon Sessingø	975c27659c	[BUGFIX] Bugfixes and optimisations - Fixed issue causing nested groups not merging namespace correctly. - Fixed issue causing longer urls (for example: /route) to have higher priority than (/route/match) in some cases.	2016-04-07 23:16:50 +02:00
Simon Sessingø	27371dfa11	[FEATURE] Added support for multiple aliases	2016-04-07 19:33:04 +02:00
Simon Sessingø	6e102711a8	[BUGFIX] Fixed nested groups not merging settings to routes	2016-04-07 01:38:03 +02:00
Simon Sessingø	4d58fbf7b5	[TASK] Added rewrite_uri parameter to Request class	2016-03-19 19:14:07 +01:00