Merge pull request #214 from skipperbent/v3-development

Optimisations

demo-project/README.md

@@ -1,100 +0,0 @@
-# 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.

demo-project/app/Controllers/ApiController.php

@@ -1,16 +0,0 @@
-<?php
-namespace Demo\Controllers;
-
-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
-		]);
-	}
-
-}

demo-project/app/Controllers/DefaultController.php

@@ -1,27 +0,0 @@
-<?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';
-	}
-
-}

demo-project/app/Handlers/CustomExceptionHandler.php

@@ -1,44 +0,0 @@
-<?php
-namespace Demo\Handlers;
-
-use Pecee\Handlers\IExceptionHandler;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
-
-class CustomExceptionHandler implements IExceptionHandler
-{
-	public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error)
-	{
-
-		/* You can use the exception handler to format errors depending on the request and type. */
-
-		if (stripos($request->getUri(), '/api') !== false) {
-
-			response()->json([
-				'error' => $error->getMessage(),
-				'code'  => $error->getCode(),
-			]);
-
-		}
-
-		/* The router will throw the NotFoundHttpException on 404 */
-		if($error instanceof NotFoundHttpException) {
-
-			/*
-			 * Render your own custom 404-view, rewrite the request to another route,
-			 * or simply return the $request object to ignore the error and continue on rendering the route.
-			 *
-			 * The code below will make the router render our page.notfound route.
-			 */
-
-			$request->setUri(url('page.notfound'));
-			return $request;
-
-		}
-
-		throw $error;
-
-	}
-
-}

demo-project/app/Middlewares/ApiVerification.php

@@ -1,18 +0,0 @@
-<?php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
-
-class ApiVerification implements IMiddleware
-{
-	public function handle(Request $request, ILoadableRoute &$route)
-	{
-		// Do authentication
-		$request->authenticated = true;
-
-		return $request;
-	}
-
-}

demo-project/app/Middlewares/CsrfVerifier.php

@@ -1,13 +0,0 @@
-<?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/*'];
-
-}

demo-project/app/Router.php

@@ -1,26 +0,0 @@
-<?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');
-
-		// Do initial stuff
-		parent::start();
-	}
-
-}

demo-project/app/helpers.php

@@ -1,44 +0,0 @@
-<?php
-use Pecee\SimpleRouter\SimpleRouter;
-
-function url($controller, $parameters = null, $getParams = null)
-{
-	SimpleRouter::getUrl($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();
-}

demo-project/app/routes.php

@@ -1,25 +0,0 @@
-<?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')->setName('home');
-
-	Router::get('/contact', 'DefaultController@contact')->setName('contact');
-
-	Router::get('/404', 'DefaultController@notFound')->setName('404');
-
-	Router::basic('/companies/{id?}', 'DefaultController@companies')->setName('companies');
-
-	// Api
-	Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function () {
-		Router::resource('/demo', 'ApiController');
-	});
-
-});

demo-project/composer.json

@@ -1,26 +0,0 @@
-{
- 	"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": "2.*"
-	},
-	"require-dev": {
-
-	},
-	"config": {
-		"preferred-install": "dist"
-	},
-    "autoload": {
-      "psr-4": {
-        "Demo\\": "app/"
-      }
-    }
-}

demo-project/public/.htaccess

@@ -1,5 +0,0 @@
-RewriteEngine on
-RewriteCond %{SCRIPT_FILENAME} !-f
-RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteCond %{SCRIPT_FILENAME} !-l
-RewriteRule ^(.*)$ index.php/$1

demo-project/public/index.php

@@ -1,7 +0,0 @@
-<?php
-
-// load composer dependencies
-require '../vendor/autoload.php';
-
-// Start the routing
-\Demo\Router::start();

src/Pecee/Controllers/IRestController.php

@@ -1,46 +1,47 @@
 <?php
 namespace Pecee\Controllers;
 
-interface IRestController {
+interface IRestController
+{
 
     /**
      * @return void
      */
-	function index();
+    public function index();
 
     /**
      * @param mixed $id
      * @return void
      */
-	function show($id);
+    public function show($id);
 
     /**
      * @return void
      */
-	function store();
+    public function store();
 
     /**
      * @return void
      */
-	function create();
+    public function create();
 
     /**
      * View
      * @param mixed $id
      * @return void
      */
-	function edit($id);
+    public function edit($id);
 
     /**
      * @param mixed $id
      * @return void
      */
-	function update($id);
+    public function update($id);
 
     /**
      * @param mixed $id
      * @return void
      */
-	function destroy($id);
+    public function destroy($id);
 
 }

src/Pecee/CsrfToken.php

@@ -14,9 +14,10 @@ class CsrfToken
      */
     public static function generateToken()
     {
-		if (function_exists('mcrypt_create_iv')) {
-			return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
+        if (function_exists('random_bytes')) {
+            return bin2hex(random_bytes(32));
         }
+
         return bin2hex(openssl_random_pseudo_bytes(32));
     }
 
@@ -31,6 +32,7 @@ class CsrfToken
         if ($token !== null && $this->getToken() !== null) {
             return hash_equals($token, $this->getToken());
         }
+
         return false;
     }
 
@@ -53,6 +55,7 @@ class CsrfToken
         if ($this->hasToken()) {
             return $_COOKIE[static::CSRF_KEY];
         }
+
         return null;
     }
 

src/Pecee/Handlers/IExceptionHandler.php

@@ -2,16 +2,14 @@
 namespace Pecee\Handlers;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 interface IExceptionHandler
 {
     /**
      * @param Request $request
-	 * @param ILoadableRoute $route
      * @param \Exception $error
      * @return Request|null
      */
-	public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error);
+    public function handleError(Request $request, \Exception $error);
 
 }

src/Pecee/Http/Input/IInputItem.php

@@ -0,0 +1,17 @@
+<?php
+namespace Pecee\Http\Input;
+
+interface IInputItem
+{
+
+    public function getIndex();
+
+    public function setIndex($index);
+
+    public function getName();
+
+    public function setName($name);
+
+    public function __toString();
+
+}

src/Pecee/Http/Input/Input.php

@@ -6,194 +6,257 @@ use Pecee\Http\Request;
 class Input
 {
     /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
      */
-	public $get;
+    public $get = [];
 
     /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
      */
-	public $post;
+    public $post = [];
 
     /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
      */
-	public $file;
+    public $file = [];
 
     /**
      * @var Request
      */
     protected $request;
 
-	protected $invalidContentType = false;
-
-	protected $invalidContentTypes = [
-		'text/plain',
-		'application/x-www-form-urlencoded',
-	];
-
     public function __construct(Request $request)
     {
         $this->request = $request;
 
-		$this->post = new InputCollection();
-		$this->get = new InputCollection();
-		$this->file = new InputCollection();
-
-		if ($request->getMethod() !== 'get') {
-
-			$requestContentType = $request->getHeader('http-content-type');
-
-			$max = count($this->invalidContentTypes) - 1;
-
-			for ($i = $max; $i >= 0; $i--) {
-
-				$contentType = $this->invalidContentType[$i];
-
-				if (stripos($requestContentType, $contentType) === 0) {
-					$this->invalidContentType = true;
-					break;
-				}
-			}
-		}
-
-		if ($this->invalidContentType === false) {
         $this->parseInputs();
     }
-	}
 
-	protected function parseInputs()
+    public function parseInputs()
     {
         /* Parse get requests */
-
         if (count($_GET) > 0) {
-
-			$max = count($_GET) - 1;
-			$keys = array_keys($_GET);
-
-			for ($i = $max; $i >= 0; $i--) {
-
-				$key = $keys[$i];
-				$value = $_GET[$key];
-
-				$this->get->{$key} = new InputItem($key, $value);
-			}
-
+            $this->get = $this->handleGetPost($_GET);
         }
 
         /* Parse post requests */
-
         $postVars = $_POST;
 
-		if (in_array($this->request->getMethod(), ['put', 'patch', 'delete']) === true) {
+        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
             parse_str(file_get_contents('php://input'), $postVars);
         }
 
         if (count($postVars) > 0) {
-
-			$max = count($postVars) - 1;
-			$keys = array_keys($postVars);
-
-			for ($i = $max; $i >= 0; $i--) {
-
-				$key = $keys[$i];
-				$value = $postVars[$key];
-
-				$this->post->{strtolower($key)} = new InputItem($key, $value);
-			}
-
+            $this->post = $this->handleGetPost($postVars);
         }
 
         /* Parse get requests */
-
         if (count($_FILES) > 0) {
+            $this->file = $this->parseFiles();
+        }
+    }
 
-			$max = count($_FILES) - 1;
-			$keys = array_keys($_FILES);
+    public function parseFiles()
+    {
+        $list = [];
 
-			for ($i = $max; $i >= 0; $i--) {
-
-				$key = $keys[$i];
-				$value = $_FILES[$key];
+        foreach ($_FILES as $key => $value) {
 
             // Handle array input
             if (is_array($value['name']) === false) {
                 $values['index'] = $key;
-					$this->file->{strtolower($key)} = InputFile::createFromArray($values);
+                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
                 continue;
             }
 
-				$output = new InputCollection();
+            $keys = [];
 
-				foreach ($value['name'] as $k => $val) {
+            $files = $this->rearrangeFiles($value['name'], $keys, $value);
 
-					$output->{$k} = InputFile::createFromArray([
+            if (isset($list[$key])) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
+
+        }
+
+        return $list;
+    }
+
+    protected function rearrangeFiles(array $values, &$index, $original)
+    {
+
+        $output = [];
+
+        $getItem = function ($key, $property = 'name') use ($original, $index) {
+
+            $path = $original[$property];
+
+            $fileValues = array_values($index);
+
+            foreach ($fileValues as $i) {
+                $path = $path[$i];
+            }
+
+            return $path[$key];
+        };
+
+        foreach ($values as $key => $value) {
+
+            if (is_array($getItem($key)) === false) {
+
+                $file = InputFile::createFromArray([
                     'index'    => $key,
-						'error'    => $value['error'][$k],
-						'tmp_name' => $value['tmp_name'][$k],
-						'type'     => $value['type'][$k],
-						'size'     => $value['size'][$k],
-						'name'     => $value['name'][$k],
+                    'error'    => $getItem($key, 'error'),
+                    'tmp_name' => $getItem($key, 'tmp_name'),
+                    'type'     => $getItem($key, 'type'),
+                    'size'     => $getItem($key, 'size'),
+                    'filename' => $getItem($key, 'name'),
                 ]);
 
+                if (isset($output[$key])) {
+                    $output[$key][] = $file;
+                } else {
+                    $output[$key] = $file;
                 }
 
-				$this->file->{strtolower($key)} = $output;
+                continue;
             }
+
+            $index[] = $key;
+
+            $files = $this->rearrangeFiles($value, $index, $original);
+
+            if (isset($output[$key])) {
+                $output[$key][] = $files;
+            } else {
+                $output[$key] = $files;
             }
 
         }
 
-	public function getObject($index, $default = null)
+        return $output;
+    }
+
+    protected function handleGetPost(array $array)
     {
-		$key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[') + 1, strpos($index, ']') - strlen($index)) : null;
-		$index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
+        $list = [];
 
-		$element = $this->get->findFirst($index);
+        $max = count($array) - 1;
+        $keys = array_keys($array);
 
-		if ($element !== null) {
-			return ($key !== null) ? $element[$key] : $element;
+        for ($i = $max; $i >= 0; $i--) {
+
+            $key = $keys[$i];
+            $value = $array[$key];
+
+            // Handle array input
+            if (is_array($value) === false) {
+                $list[$key] = new InputItem($key, $value);
+                continue;
             }
 
-		if ($this->request->getMethod() !== 'get') {
+            $output = $this->handleGetPost($value);
 
-			$element = $this->post->findFirst($index);
-			if ($element !== null) {
-				return ($key !== null) ? $element[$key] : $element;
+            $list[$key] = $output;
         }
 
-			$element = $this->file->findFirst($index);
-			if ($element !== null) {
-				return ($key !== null) ? $element[$key] : $element;
-			}
+        return $list;
     }
 
-		return $default;
+    /**
+     * Find post-value by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findPost($index, $defaultValue = null)
+    {
+        return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
+    }
+
+    /**
+     * Find file by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputFile|string
+     */
+    public function findFile($index, $defaultValue = null)
+    {
+        return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
+    }
+
+    /**
+     * Find parameter/query-string by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findGet($index, $defaultValue = null)
+    {
+        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
+    }
+
+    /**
+     * Get input object
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
+     * @return IInputItem|string
+     */
+    public function getObject($index, $defaultValue = null, $methods = null)
+    {
+        if ($methods !== null && is_string($methods) === true) {
+            $methods = [$methods];
+        }
+
+        $element = null;
+
+        if ($methods === null || in_array('get', $methods)) {
+            $element = $this->findGet($index);
+        }
+
+        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
+            $element = $this->findPost($index);
+        }
+
+        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
+            $element = $this->findFile($index);
+        }
+
+        return ($element !== null) ? $element : $defaultValue;
     }
 
     /**
      * Get input element value matching index
      *
      * @param string $index
-	 * @param string|null $default
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
      * @return InputItem|string
      */
-	public function get($index, $default = null)
+    public function get($index, $defaultValue = null, $methods = null)
     {
-		$item = $this->getObject($index);
+        $input = $this->getObject($index, $defaultValue, $methods);
 
-		if ($item !== null) {
-
-			if ($item instanceof InputCollection || $item instanceof InputFile) {
-				return $item;
+        if ($input instanceof InputItem) {
+            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
         }
 
-			return (!is_array($item->getValue()) && trim($item->getValue()) === '') ? $default : $item;
-		}
-
-		return $default;
+        return $input;
     }
 
+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @return bool
+     */
     public function exists($index)
     {
         return ($this->getObject($index) !== null);
@@ -206,17 +269,13 @@ class Input
      */
     public function all(array $filter = null)
     {
-		if ($this->invalidContentType === true) {
-			return [];
-		}
-
         $output = $_POST;
 
         if ($this->request->getMethod() === 'post') {
 
             $contents = file_get_contents('php://input');
 
-			if (stripos(trim($contents), '{') === 0) {
+            if (strpos(trim($contents), '{') === 0) {
                 $output = json_decode($contents, true);
                 if ($output === false) {
                     $output = [];
@@ -228,11 +287,7 @@ class Input
 
         if ($filter !== null) {
             $output = array_filter($output, function ($key) use ($filter) {
-				if (in_array($key, $filter)) {
-					return true;
-				}
-
-				return false;
+                return (in_array($key, $filter) === true);
             }, ARRAY_FILTER_USE_KEY);
         }
 

src/Pecee/Http/Input/InputCollection.php

@@ -1,91 +0,0 @@
-<?php
-namespace Pecee\Http\Input;
-
-class InputCollection implements \IteratorAggregate
-{
-	protected $data = [];
-
-	/**
-	 * Search for input element matching index.
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return InputItem|mixed
-	 */
-	public function findFirst($index, $default = null)
-	{
-		if (count($this->data) > 0) {
-
-			if (isset($this->data[$index])) {
-				return $this->data[$index];
-			}
-
-			foreach ($this->data as $key => $input) {
-				if (strtolower($index) === strtolower($key)) {
-					return $input;
-				}
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Get input element value matching index
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return string|null
-	 */
-	public function get($index, $default = null)
-	{
-		$input = $this->findFirst($index);
-
-		if ($input !== null && trim($input->getValue()) !== '') {
-			return $input->getValue();
-		}
-
-		return $default;
-	}
-
-	/**
-	 * @param string $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);
-	}
-
-}

src/Pecee/Http/Input/InputFile.php

@@ -1,13 +1,76 @@
 <?php
 namespace Pecee\Http\Input;
 
-class InputFile extends InputItem
+class InputFile implements IInputItem
 {
+    public $index;
+    public $name;
+    public $filename;
     public $size;
     public $type;
     public $error;
     public $tmpName;
 
+    public function __construct($index)
+    {
+        $this->index = $index;
+
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+    }
+
+    /**
+     * Create from array
+     *
+     * @param array $values
+     * @throws \InvalidArgumentException
+     * @return static
+     */
+    public static function createFromArray(array $values)
+    {
+        if (!isset($values['index'])) {
+            throw new \InvalidArgumentException('Index key is required');
+        }
+
+        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
+
+        $values = array_merge([
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ], $values);
+
+        return (new static($values['index']))
+            ->setError($values['error'])
+            ->setSize($values['size'])
+            ->setType($values['type'])
+            ->setTmpName($values['tmp_name'])
+            ->setFilename($values['name']);
+
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    /**
+     * Set input index
+     * @param string $index
+     * @return static $this
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
+
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -16,6 +79,27 @@ class InputFile extends InputItem
         return $this->size;
     }
 
+    /**
+     * Set file size
+     * @param int $size
+     * @return static $this
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Get mime-type of file
+     * @return string
+     */
+    public function getMime()
+    {
+        return $this->getType();
+    }
+
     /**
      * @return string
      */
@@ -25,6 +109,108 @@ class InputFile extends InputItem
     }
 
     /**
+     * Set type
+     * @param string $type
+     * @return static $this
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Returns extension without "."
+     *
+     * @return string
+     */
+    public function getExtension()
+    {
+        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
+    }
+
+    /**
+     * Get human friendly name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set human friendly name.
+     * Useful for adding validation etc.
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Set filename
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setFilename($name)
+    {
+        $this->filename = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get filename
+     *
+     * @return string mixed
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Move the uploaded temporary file to it's new home
+     *
+     * @param string $destination
+     * @return bool
+     */
+    public function move($destination)
+    {
+        return move_uploaded_file($this->tmpName, $destination);
+    }
+
+    /**
+     * Get file contents
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return file_get_contents($this->tmpName);
+    }
+
+    /**
+     * Return true if an upload error occured.
+     *
+     * @return bool
+     */
+    public function hasError()
+    {
+        return ($this->getError() !== 0);
+    }
+
+    /**
+     * Get upload-error code.
+     *
      * @return string
      */
     public function getError()
@@ -32,9 +218,17 @@ class InputFile extends InputItem
         return $this->error;
     }
 
-	public function getMime()
+    /**
+     * Set error
+     *
+     * @param int $error
+     * @return static $this
+     */
+    public function setError($error)
     {
-		return $this->getType();
+        $this->error = (int)$error;
+
+        return $this;
     }
 
     /**
@@ -45,21 +239,6 @@ class InputFile extends InputItem
         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);
-	}
-
     /**
      * Set file temp. name
      * @param string $name
@@ -68,78 +247,22 @@ class InputFile extends InputItem
     public function setTmpName($name)
     {
         $this->tmpName = $name;
+
         return $this;
     }
 
-	/**
-	 * Set file size
-	 * @param int $size
-	 * @return static $this
-	 */
-	public function setSize($size)
-	{
-		$this->size = $size;
-		return $this;
-	}
-
-	/**
-	 * Set type
-	 * @param string $type
-	 * @return static $this
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-		return $this;
-	}
-
-	/**
-	 * Set error
-	 * @param int $error
-	 * @return static $this
-	 */
-	public function setError($error)
-	{
-		$this->error = (int)$error;
-		return $this;
-	}
-
-	public function getValue()
+    public function __toString()
     {
         return $this->getTmpName();
     }
 
-	public function hasError() {
-		return ($this->getError() !== 0);
-	}
-
-	/**
-	 * Create from array
-	 * @param array $values
-	 * @return static
-	 */
-	public static function createFromArray(array $values)
+    public function toArray()
     {
-		if(!isset($values['index'])) {
-			throw new \InvalidArgumentException('Index key is required');
-		}
-
-		$input = new static($values['index']);
-		$input->setError((isset($values['error']) ? $values['error'] : null));
-		$input->setName((isset($values['name']) ? $values['name'] : null));
-		$input->setSize((isset($values['size']) ? $values['size'] : null));
-		$input->setType((isset($values['type']) ? $values['type'] : null));
-		$input->setTmpName((isset($values['tmp_name']) ? $values['tmp_name'] : null));
-
-		return $input;
-	}
-
-	public function toArray() {
         return [
             'tmp_name' => $this->tmpName,
             'type'     => $this->type,
             'size'     => $this->size,
-			'name' => $this->name,
+            'name'     => $this->filename,
             'error'    => $this->error,
         ];
     }

src/Pecee/Http/Input/InputItem.php

@@ -1,7 +1,7 @@
 <?php
 namespace Pecee\Http\Input;
 
-class InputItem
+class InputItem implements IInputItem
 {
     public $index;
     public $name;
@@ -16,6 +16,21 @@ class InputItem
         $this->name = ucfirst(str_replace('_', ' ', $this->index));
     }
 
+    /**
+     * @return string
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+
+    public function setIndex($index)
+    {
+        $this->index = $index;
+
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -24,6 +39,18 @@ class InputItem
         return $this->name;
     }
 
+    /**
+     * Set input name
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -32,25 +59,6 @@ class InputItem
         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
@@ -59,6 +67,7 @@ class InputItem
     public function setValue($value)
     {
         $this->value = $value;
+
         return $this;
     }
 

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -4,7 +4,6 @@ namespace Pecee\Http\Middleware;
 use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 class BaseCsrfVerifier implements IMiddleware
 {
@@ -20,7 +19,7 @@ class BaseCsrfVerifier implements IMiddleware
         $this->csrfToken = new CsrfToken();
 
         // Generate or get the CSRF-Token from Cookie.
-		$this->token = (!$this->hasToken()) ? $this->generateToken() : $this->csrfToken->getToken();
+        $this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
     }
 
     /**
@@ -34,7 +33,11 @@ class BaseCsrfVerifier implements IMiddleware
             return false;
         }
 
-		foreach ($this->except as $url) {
+        $max = count($this->except) - 1;
+
+        for ($i = $max; $i >= 0; $i--) {
+            $url = $this->except[$i];
+
             $url = rtrim($url, '/');
             if ($url[strlen($url) - 1] === '*') {
                 $url = rtrim($url, '*');
@@ -43,7 +46,7 @@ class BaseCsrfVerifier implements IMiddleware
                 $skip = ($url === rtrim($request->getUri(), '/'));
             }
 
-			if ($skip) {
+            if ($skip === true) {
                 return true;
             }
         }
@@ -51,19 +54,19 @@ class BaseCsrfVerifier implements IMiddleware
         return false;
     }
 
-	public function handle(Request $request, ILoadableRoute &$route = null)
+    public function handle(Request $request)
     {
 
-		if ($request->getMethod() !== 'get' && !$this->skip($request)) {
+        if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {
 
-			$token = $request->getInput()->post->get(static::POST_KEY);
+            $token = $request->getInput()->get(static::POST_KEY, null, 'post');
 
             // If the token is not posted, check headers for valid x-csrf-token
             if ($token === null) {
                 $token = $request->getHeader(static::HEADER_KEY);
             }
 
-			if (!$this->csrfToken->validate($token)) {
+            if ($this->csrfToken->validate($token) === false) {
                 throw new TokenMismatchException('Invalid csrf-token.');
             }
 
@@ -73,14 +76,15 @@ class BaseCsrfVerifier implements IMiddleware
 
     public function generateToken()
     {
-		$token = $this->csrfToken->generateToken();
+        $token = CsrfToken::generateToken();
         $this->csrfToken->setToken($token);
+
         return $token;
     }
 
     public function hasToken()
     {
-		if ($this->token != null) {
+        if ($this->token !== null) {
             return true;
         }
 

src/Pecee/Http/Middleware/IMiddleware.php

@@ -2,15 +2,13 @@
 namespace Pecee\Http\Middleware;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 interface IMiddleware
 {
     /**
      * @param Request $request
-	 * @param ILoadableRoute $route
      * @return Request|null
      */
-	public function handle(Request $request, ILoadableRoute &$route);
+    public function handle(Request $request);
 
 }

src/Pecee/Http/Request.php

@@ -2,6 +2,9 @@
 namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\IRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
 
 class Request
 {
@@ -12,33 +15,46 @@ class Request
     protected $method;
     protected $input;
 
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;
+    protected $rewriteUrl;
+
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $loadedRoute;
+
     public function __construct()
     {
         $this->parseHeaders();
-		$this->host = $this->getHeader('http-host');;
+        $this->host = $this->getHeader('http-host');
         $this->uri = $this->getHeader('request-uri');
-		$this->method = strtolower($this->getHeader('request-method'));
         $this->input = new Input($this);
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
     }
 
     protected function parseHeaders()
     {
         $this->headers = [];
 
-		foreach ($_SERVER as $name => $value) {
-			$this->headers[strtolower($name)] = $value;
-			$this->headers[strtolower(str_replace('_', '-', $name))] = $value;
+        $max = count($_SERVER) - 1;
+        $keys = array_keys($_SERVER);
+
+        for ($i = $max; $i >= 0; $i--) {
+            $key = $keys[$i];
+            $value = $_SERVER[$key];
+
+            $this->headers[strtolower($key)] = $value;
+            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
         }
 
     }
 
     public function isSecure()
     {
-		if ($this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443) {
-			return true;
-		}
-
-		return false;
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
     }
 
     /**
@@ -102,7 +118,7 @@ class Request
             return $this->getHeader('http-cf-connecting-ip');
         }
 
-		if ($this->getHeader('http-x-forwarded-for') !== null && strlen($this->getHeader('http-x-forwarded-for'))) {
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
             return $this->getHeader('http-x-forwarded_for');
         }
 
@@ -131,7 +147,7 @@ class Request
      * Get header value by name
      *
      * @param string $name
-	 * @param object|null $defaultValue
+     * @param string|null $defaultValue
      *
      * @return string|null
      */
@@ -211,6 +227,91 @@ class Request
         $this->method = $method;
     }
 
+    /**
+     * Set rewrite route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setRewriteRoute(ILoadableRoute $route)
+    {
+        $this->rewriteRoute = $route;
+
+        return $this;
+    }
+
+    /**
+     * Get rewrite route
+     *
+     * @return IRoute|null
+     */
+    public function getRewriteRoute()
+    {
+        return $this->rewriteRoute;
+    }
+
+    /**
+     * Get rewrite url
+     *
+     * @return string
+     */
+    public function getRewriteUrl()
+    {
+        return $this->rewriteUrl;
+    }
+
+    /**
+     * Set rewrite url
+     *
+     * @param string $rewriteUrl
+     * @return static
+     */
+    public function setRewriteUrl($rewriteUrl)
+    {
+        $this->rewriteUrl = $rewriteUrl;
+
+        return $this;
+    }
+
+    /**
+     * Set rewrite callback
+     * @param string $callback
+     * @return static
+     */
+    public function setRewriteCallback($callback)
+    {
+        $this->rewriteRoute = new RouteUrl($this->uri, $callback);
+
+        return $this;
+    }
+
+    /**
+     * Get loaded route
+     * @return ILoadableRoute|null
+     */
+    public function getLoadedRoute()
+    {
+        return $this->loadedRoute;
+    }
+
+    /**
+     * Set loaded route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setLoadedRoute(ILoadableRoute $route)
+    {
+        $this->loadedRoute = $route;
+
+        return $this;
+    }
+
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->data);
+    }
+
     public function __set($name, $value = null)
     {
         $this->data[$name] = $value;

src/Pecee/Http/Response.php

@@ -19,6 +19,7 @@ class Response
     public function httpCode($code)
     {
         http_response_code($code);
+
         return $this;
     }
 
@@ -52,8 +53,9 @@ class Response
     {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
-			'HTTP/1.0 401 Unauthorized'
+            'HTTP/1.0 401 Unauthorized',
         ]);
+
         return $this;
     }
 
@@ -62,14 +64,14 @@ class Response
 
         $this->headers([
             'Cache-Control: public',
-			'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
-			'Etag: ' . $eTag
+            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',
+            'Etag: ' . $eTag,
         ]);
 
         $httpModified = $this->request->getHeader('http-if-modified-since');
         $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
 
-		if ($httpModified !== null && strtotime($httpModified) == $lastModified || $httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) {
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
 
             $this->header('HTTP/1.1 304 Not Modified');
 
@@ -98,6 +100,7 @@ class Response
     public function header($value)
     {
         header($value);
+
         return $this;
     }
 
@@ -108,10 +111,10 @@ class Response
      */
     public function headers(array $headers)
     {
-		$max = count($headers);
-		for($i = 0; $i < $max; $i++) {
-			$this->header($headers[$i]);
+        foreach ($headers as $header) {
+            $this->header($header);
         }
+
         return $this;
     }
 

src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php

@@ -3,4 +3,5 @@ namespace Pecee\SimpleRouter\Exceptions;
 
 class NotFoundHttpException extends HttpException
 {
+
 }

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

@@ -20,9 +20,8 @@ interface ILoadableRoute extends IRoute
      * Loads and renders middlewares-classes
      *
      * @param Request $request
-	 * @param ILoadableRoute $route
      */
-	public function loadMiddleware(Request $request, ILoadableRoute &$route);
+    public function loadMiddleware(Request $request);
 
     public function getUrl();
 
@@ -51,4 +50,19 @@ interface ILoadableRoute extends IRoute
      */
     public function setName($name);
 
+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch();
+
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex);
+
 }

src/Pecee/SimpleRouter/Route/IRoute.php

@@ -8,17 +8,19 @@ interface IRoute
     /**
      * Method called to check if a domain matches
      *
+     * @param string $route
      * @param Request $request
      * @return bool
      */
-	public function matchRoute(Request $request);
+    public function matchRoute($route, Request $request);
 
     /**
      * Called when route is matched.
      * Returns class to be rendered.
      *
      * @param Request $request
-	 * @return object
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @return void
      */
     public function renderRoute(Request $request);
 
@@ -112,21 +114,6 @@ interface IRoute
 
     public function getDefaultNamespace();
 
-	/**
-	 * Get regular expression match used for matching route (if defined).
-	 *
-	 * @return string
-	 */
-	public function getMatch();
-
-	/**
-	 * Add regular expression match for the entire route.
-	 *
-	 * @param string $regex
-	 * @return static
-	 */
-	public function setMatch($regex);
-
     /**
      * Get parameter names.
      *

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -7,19 +7,25 @@ use Pecee\SimpleRouter\Exceptions\HttpException;
 
 abstract class LoadableRoute extends Route implements ILoadableRoute
 {
-	const PARAMETERS_REGEX_MATCH = '%s([\w\-\_]*?)\%s{0,1}%s';
-
+    /**
+     * @var string
+     */
     protected $url;
+
+    /**
+     * @var string
+     */
     protected $name;
 
+    protected $regex;
+
     /**
      * Loads and renders middlewares-classes
      *
      * @param Request $request
-	 * @param ILoadableRoute $route
      * @throws HttpException
      */
-	public function loadMiddleware(Request $request, ILoadableRoute &$route)
+    public function loadMiddleware(Request $request)
     {
         if (count($this->getMiddlewares()) > 0) {
 
@@ -30,15 +36,38 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                 $middleware = $this->getMiddlewares()[$i];
 
                 $middleware = $this->loadClass($middleware);
+
                 if (!($middleware instanceof IMiddleware)) {
                     throw new HttpException($middleware . ' must be instance of Middleware');
                 }
 
-				$middleware->handle($request, $route);
+                $middleware->handle($request);
             }
         }
     }
 
+    public function matchRegex(Request $request, $url)
+    {
+
+        /* Match on custom defined regular expression */
+
+        if ($this->regex === null) {
+            return null;
+        }
+
+        $parameters = [];
+
+        if (preg_match($this->regex, $request->getHost() . $url, $parameters) > 0) {
+
+            /* Remove global match */
+            $this->parameters = array_slice($parameters, 1);
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Set url
      *
@@ -54,15 +83,8 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
             if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
-
-				$max = count($matches[1]);
-
-				for ($i = 0; $i < $max; $i++) {
-					$this->parameters[$matches[1][$i]] = null;
+                $this->parameters = array_fill_keys($matches[1], null);
             }
-
-			}
-
         }
 
         return $this;
@@ -84,39 +106,38 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      */
     public function findUrl($method = null, $parameters = null, $name = null)
     {
-		$url = '';
-
-		$parameters = (array)$parameters;
+        $url = $this->getUrl();
 
         if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-			$url .= '//' . $this->getGroup()->getDomains()[0];
+            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
         }
 
-		$url .= $this->getUrl();
-
-		$params = array_merge($this->getParameters(), $parameters);
-
-		/* Url that contains parameters that aren't recognized */
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
         $unknownParams = [];
 
-		/* Create the param string - {} */
+        /* Create the param string - {parameter} */
         $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
-		/* Create the param string with the optional symbol - {?} */
+        /* Create the param string with the optional symbol - {parameter?} */
         $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
 
-		/* Let's parse the values of any {} parameter in the url */
+        /* Replace any {parameter} in the url with the correct value */
 
-		$max = count($params);
+        $params = $this->getParameters();
+        $max = count($params) - 1;
         $keys = array_keys($params);
 
-		for ($i = 0; $i < $max; $i++) {
+        for ($i = $max; $i >= 0; $i--) {
             $param = $keys[$i];
-			$value = $params[$param];
+            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
 
-			$value = (isset($parameters[$param])) ? $parameters[$param] : $value;
+            /* If parameter is specifically set to null - use the original-defined value */
+            if ($value === null && isset($this->originalParameters[$param])) {
+                $value = $this->originalParameters[$param];
+            }
 
             if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
+                /* Add parameter to the correct position */
                 $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
             } else {
                 $unknownParams[$param] = $value;
@@ -125,6 +146,8 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
         $url .= join('/', $unknownParams);
 
+
+
         return rtrim($url, '/') . '/';
     }
 
@@ -149,6 +172,29 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return (strtolower($this->name) === strtolower($name));
     }
 
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex)
+    {
+        $this->regex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch()
+    {
+        return $this->regex;
+    }
+
     /**
      * Sets the router name, which makes it easier to obtain the url or router at a later point.
      * Alias for LoadableRoute::setName().

src/Pecee/SimpleRouter/Route/Route.php

@@ -2,11 +2,12 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 abstract class Route implements IRoute
 {
+    const PARAMETERS_REGEX_MATCH = '%s([\w]+)(\%s?)%s';
+
     const REQUEST_TYPE_GET = 'get';
     const REQUEST_TYPE_POST = 'post';
     const REQUEST_TYPE_PUT = 'put';
@@ -23,6 +24,13 @@ abstract class Route implements IRoute
         self::REQUEST_TYPE_DELETE,
     ];
 
+    /**
+     * If enabled parameters containing null-value
+     * will not be passed along to the callback.
+     *
+     * @var bool
+     */
+    protected $filterEmptyParams = false;
     protected $paramModifiers = '{}';
     protected $paramOptionalSymbol = '?';
     protected $group;
@@ -32,12 +40,21 @@ abstract class Route implements IRoute
 
     /* Default options */
     protected $namespace;
-	protected $regex;
     protected $requestMethods = [];
     protected $where = [];
     protected $parameters = [];
+    protected $originalParameters = [];
     protected $middlewares = [];
 
+    protected function loadClass($name)
+    {
+        if (class_exists($name) === false) {
+            throw new NotFoundHttpException(sprintf('Class %s does not exist', $name), 404);
+        }
+
+        return new $name();
+    }
+
     public function renderRoute(Request $request)
     {
         if ($this->getCallback() !== null && is_callable($this->getCallback())) {
@@ -54,115 +71,68 @@ abstract class Route implements IRoute
             $class = $this->loadClass($className);
             $method = $controller[1];
 
-			if (!method_exists($class, $method)) {
+            if (method_exists($class, $method) === false) {
                 throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
             }
 
-			$parameters = array_filter($this->getParameters(), function ($var) {
+            $parameters = $this->getParameters();
+
+            /* Filter parameters with null-value */
+
+            if ($this->filterEmptyParams === true) {
+                $parameters = array_filter($parameters, function ($var) {
                     return ($var !== null);
                 });
-
-			call_user_func_array([$class, $method], $parameters);
-
-			return $class;
             }
 
-		return null;
+            call_user_func_array([$class, $method], $parameters);
+        }
     }
 
     protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
     {
-		$parameterNames = [];
+        $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+
+        if (preg_match_all('/' . $regex . '/is', $route, $parameters)) {
+
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/is', rtrim($route, '/'));
+
+            foreach ($urlParts as $key => $t) {
+
                 $regex = '';
-		$lastCharacter = '';
-		$isParameter = false;
-		$parameter = '';
 
-		for ($i = 0; $i < strlen($route); $i++) {
+                if ($key < (count($parameters[1]))) {
 
-			$character = $route[$i];
+                    $name = $parameters[1][$key];
+                    $regex = isset($this->where[$name]) ? $this->where[$name] : $parameterRegex;
+                    $regex = sprintf('\-?\/?(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
 
-			if ($character === '{') {
-				/* Remove "/" and "\" from regex */
-				if (substr($regex, strlen($regex) - 1) === '/') {
-					$regex = substr($regex, 0, strlen($regex) - 2);
                 }
 
-				$isParameter = true;
-			} elseif ($isParameter && $character === '}') {
-				$required = true;
-
-				/* Check for optional parameter and use custom parameter regex if it exists */
-				if (is_array($this->where) === true && isset($this->where[$parameter])) {
-					$parameterRegex = $this->where[$parameter];
+                $urlParts[$key] = preg_quote($t, '/') . $regex;
             }
 
-				if ($lastCharacter === '?') {
-					$parameter = substr($parameter, 0, strlen($parameter) - 1);
-					$regex .= '(?:\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?)?';
-					$required = false;
+            $urlRegex = join('', $urlParts);
+
         } else {
-					$regex .= '\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?';
+            $urlRegex = preg_quote($route, '/');
         }
 
-				$parameterNames[] = [
-					'name'     => $parameter,
-					'required' => $required,
-				];
+        if (preg_match('/^' . $urlRegex . '(\/?)$/is', $url, $matches) > 0) {
 
-				$parameter = '';
-				$isParameter = false;
-			} elseif ($isParameter) {
-				$parameter .= $character;
-			} elseif ($character === '/') {
-				$regex .= '\\' . $character;
-			} else {
-				$regex .= str_replace('.', '\\.', $character);
+            $values = [];
+
+            /* Only take matched parameters with name */
+            foreach ($parameters[1] as $name) {
+                $values[$name] = isset($matches[$name]) ? $matches[$name] : null;
             }
 
-			$lastCharacter = $character;
-		}
-
-		$parameterValues = [];
-
-		if (preg_match('/^' . $regex . '\/?$/is', $url, $parameterValues)) {
-
-			$parameters = [];
-
-			$max = count($parameterNames);
-
-			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 HttpException('Missing required parameter ' . $name['name'], 404);
-				}
-
-				if ($name['required'] === false && $parameterValue === null) {
-					continue;
-				}
-
-				$parameters[$name['name']] = $parameterValue;
-			}
-
-			return $parameters;
+            return $values;
         }
 
         return null;
     }
 
-	protected function loadClass($name)
-	{
-		if (!class_exists($name)) {
-			throw new NotFoundHttpException(sprintf('Class %s does not exist', $name), 404);
-		}
-
-		return new $name();
-	}
-
     /**
      * 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
@@ -338,29 +308,6 @@ abstract class Route implements IRoute
         return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
     }
 
-	/**
-	 * Add regular expression match for the entire route.
-	 *
-	 * @param string $regex
-	 * @return static
-	 */
-	public function setMatch($regex)
-	{
-		$this->regex = $regex;
-
-		return $this;
-	}
-
-	/**
-	 * Get regular expression match used for matching route (if defined).
-	 *
-	 * @return string
-	 */
-	public function getMatch()
-	{
-		return $this->regex;
-	}
-
     /**
      * Export route settings to array so they can be merged with another route.
      *
@@ -382,10 +329,6 @@ abstract class Route implements IRoute
             $values['where'] = $this->where;
         }
 
-		if (count($this->parameters) > 0) {
-			$values['parameters'] = $this->parameters;
-		}
-
         if (count($this->middlewares) > 0) {
             $values['middleware'] = $this->middlewares;
         }
@@ -402,7 +345,7 @@ abstract class Route implements IRoute
      */
     public function setSettings(array $values, $merge = false)
     {
-		if (isset($values['namespace']) && $this->namespace === null) {
+        if ($this->namespace === null && isset($values['namespace'])) {
             $this->setNamespace($values['namespace']);
         }
 
@@ -459,7 +402,7 @@ abstract class Route implements IRoute
      */
     public function where(array $options)
     {
-		return $this->where($options);
+        return $this->setWhere($options);
     }
 
     /**
@@ -469,7 +412,14 @@ abstract class Route implements IRoute
      */
     public function getParameters()
     {
-		return $this->parameters;
+        /* Sort the parameters after the user-defined param order, if any */
+        $parameters = [];
+
+        if (count($this->originalParameters) > 0) {
+            $parameters = $this->originalParameters;
+        }
+
+        return array_merge($parameters, $this->parameters);
     }
 
     /**
@@ -480,7 +430,15 @@ abstract class Route implements IRoute
      */
     public function setParameters(array $parameters)
     {
-		$this->parameters = $parameters;
+        /*
+         * If this is the first time setting parameters we store them so we
+         * later can organize the array, in case somebody tried to sort the array.
+         */
+        if (count($parameters) > 0 && count($this->originalParameters) === 0) {
+            $this->originalParameters = $parameters;
+        }
+
+        $this->parameters = array_merge($this->parameters, $parameters);
 
         return $this;
     }

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -2,7 +2,6 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class RouteController extends LoadableRoute implements IControllerRoute
 {
@@ -31,11 +30,11 @@ class RouteController extends LoadableRoute implements IControllerRoute
         }
 
         /* Remove method/type */
-		if (stripos($name, '.') !== false) {
+        if (strpos($name, '.') !== false) {
             $method = substr($name, strrpos($name, '.') + 1);
             $newName = substr($name, 0, strrpos($name, '.'));
 
-			if (strtolower($this->name) === strtolower($newName) && in_array($method, $this->names)) {
+            if (in_array($method, $this->names, false) === true && strtolower($this->name) === strtolower($newName)) {
                 return true;
             }
         }
@@ -43,28 +42,35 @@ class RouteController extends LoadableRoute implements IControllerRoute
         return parent::hasName($name);
     }
 
+    /**
+     * @param string|null $method
+     * @param string|array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
     public function findUrl($method = null, $parameters = null, $name = null)
     {
-
-		if (stripos($name, '.') !== false) {
-			$found = array_search(substr($name, strrpos($name, '.') + 1), $this->names);
+        if (strpos($name, '.') !== false) {
+            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
             if ($found !== false) {
                 $method = $found;
             }
         }
 
         $url = '';
-
         $parameters = (array)$parameters;
 
-		/* Remove requestType from method-name, if it exists */
         if ($method !== null) {
+
+            /* Remove requestType from method-name, if it exists */
             foreach (static::$requestTypes as $requestType) {
+
                 if (stripos($method, $requestType) === 0) {
                     $method = substr($method, strlen($requestType));
                     break;
                 }
             }
+
             $method .= '/';
         }
 
@@ -77,38 +83,17 @@ class RouteController extends LoadableRoute implements IControllerRoute
         return '/' . trim($url, '/') . '/';
     }
 
-	public function renderRoute(Request $request)
+    public function matchRoute($url, Request $request)
     {
-		if ($this->getCallback() !== null && is_callable($this->getCallback())) {
-
-			// When the callback is a function
-			call_user_func_array($this->getCallback(), $this->getParameters());
-		} else {
-			// When the callback is a method
-			$controller = explode('@', $this->getCallback());
-			$className = $this->getNamespace() . '\\' . $controller[0];
-
-			$class = $this->loadClass($className);
-			$method = $request->getMethod() . ucfirst($controller[1]);
-
-			if (!method_exists($class, $method)) {
-				throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-			}
-
-			call_user_func_array([$class, $method], $this->getParameters());
-
-			return $class;
-		}
-
-		return null;
-	}
-
-	public function matchRoute(Request $request)
-	{
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
         $url = rtrim($url, '/') . '/';
 
-		if (strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
+        /* Match global regular-expression for route */
+        if ($this->matchRegex($request, $url) === true) {
+            return true;
+        }
+
+        if (stripos($url, $this->url) === 0 && strtolower($url) === strtolower($this->url)) {
 
             $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
 
@@ -119,8 +104,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
                 $method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
                 $this->method = $method;
 
-				array_shift($path);
-				$this->parameters = $path;
+                $this->parameters = array_slice($path, 1);
 
                 // Set callback
                 $this->setCallback($this->controller . '@' . $this->method);
@@ -129,7 +113,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
             }
         }
 
-		return null;
+        return false;
     }
 
     /**

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -18,12 +18,16 @@ class RouteGroup extends Route implements IGroupRoute
      */
     public function matchDomain(Request $request)
     {
-		if (count($this->domains) > 0) {
+        if (count($this->domains) === 0) {
+            return true;
+        }
+
         foreach ($this->domains as $domain) {
 
             $parameters = $this->parseParameters($domain, $request->getHost(), '.*');
 
-				if ($parameters !== null) {
+            if ($parameters !== null && count($parameters) > 0) {
+
                 $this->parameters = $parameters;
 
                 return true;
@@ -33,19 +37,17 @@ class RouteGroup extends Route implements IGroupRoute
         return false;
     }
 
-		return true;
-	}
-
     /**
      * Method called to check if route matches
      *
+     * @param string $url
      * @param Request $request
      * @return bool
      */
-	public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
     {
-		// Skip if prefix doesn't match
-		if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
+        /* Skip if prefix doesn't match */
+        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
             return false;
         }
 
@@ -171,6 +173,10 @@ class RouteGroup extends Route implements IGroupRoute
             $values['as'] = $this->name;
         }
 
+        if (count($this->parameters) > 0) {
+            $values['parameters'] = $this->parameters;
+        }
+
         return array_merge($values, parent::toArray());
     }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -2,7 +2,6 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class RouteResource extends LoadableRoute implements IControllerRoute
 {
@@ -15,6 +14,17 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         'update'  => '',
         'destroy' => '',
     ];
+
+    protected $methodNames = [
+        'index'   => 'index',
+        'create'  => 'create',
+        'store'   => 'store',
+        'show'    => 'show',
+        'edit'    => 'edit',
+        'update'  => 'update',
+        'destroy' => 'destroy',
+    ];
+
     protected $names = [];
     protected $controller;
 
@@ -42,7 +52,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         }
 
         /* Remove method/type */
-		if (stripos($name, '.') !== false) {
+        if (strpos($name, '.') !== false) {
             $name = substr($name, 0, strrpos($name, '.'));
         }
 
@@ -51,99 +61,78 @@ class RouteResource extends LoadableRoute implements IControllerRoute
 
     public function findUrl($method = null, $parameters = null, $name = null)
     {
-		$method = array_search($name, $this->names);
-		if ($method !== false) {
-			return rtrim($this->url . $this->urls[$method], '/') . '/';
+        $url = array_search($name, $this->names, false);
+        if ($url !== false) {
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
         }
 
         return $this->url;
     }
 
-	public function renderRoute(Request $request)
-	{
-		if ($this->getCallback() !== null && is_callable($this->getCallback())) {
-			// When the callback is a function
-			call_user_func_array($this->getCallback(), $this->getParameters());
-		} else {
-			// When the callback is a method
-			$controller = explode('@', $this->getCallback());
-			$className = $this->getNamespace() . '\\' . $controller[0];
-			$class = $this->loadClass($className);
-			$method = strtolower($controller[1]);
-
-			if (!method_exists($class, $method)) {
-				throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-			}
-
-			call_user_func_array([$class, $method], $this->getParameters());
-
-			return $class;
-		}
-
-		return null;
-	}
-
-	protected function call($method, $parameters)
+    protected function call($method)
     {
         $this->setCallback($this->controller . '@' . $method);
-		$this->parameters = $parameters;
 
         return true;
     }
 
-	public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
     {
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
         $url = rtrim($url, '/') . '/';
 
+        /* Match global regular-expression for route */
+        $domainMatch = $this->matchRegex($request, $url);
+        if ($domainMatch !== null) {
+            return $domainMatch;
+        }
+
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
         $parameters = $this->parseParameters($route, $url);
+        if ($parameters === null) {
+            return false;
+        }
 
-		if ($parameters !== null) {
+        $this->parameters = (array)$parameters;
 
-			$parameters = array_merge($this->parameters, (array)$parameters);
-
-			$action = isset($parameters['action']) ? $parameters['action'] : null;
-			unset($parameters['action']);
+        $action = isset($this->parameters['action']) ? $this->parameters['action'] : null;
+        unset($this->parameters['action']);
 
         $method = $request->getMethod();
 
         // Delete
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_DELETE) {
-				return $this->call('destroy', $parameters);
+        if ($method === static::REQUEST_TYPE_DELETE && isset($this->parameters['id'])) {
+            return $this->call($this->methodNames['destroy']);
         }
 
         // Update
-			if (isset($parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT])) {
-				return $this->call('update', $parameters);
+        if (isset($this->parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false)) {
+            return $this->call($this->methodNames['update']);
         }
 
         // Edit
-			if (isset($parameters['id']) && strtolower($action) === 'edit' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('edit', $parameters);
+        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id']) && strtolower($action) === 'edit') {
+            return $this->call($this->methodNames['edit']);
         }
 
         // Create
-			if (strtolower($action) === 'create' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('create', $parameters);
+        if ($method === static::REQUEST_TYPE_GET && strtolower($action) === 'create') {
+            return $this->call($this->methodNames['create']);
         }
 
         // Save
         if ($method === static::REQUEST_TYPE_POST) {
-				return $this->call('store', $parameters);
+            return $this->call($this->methodNames['store']);
         }
 
         // Show
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('show', $parameters);
+        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id'])) {
+            return $this->call($this->methodNames['show']);
         }
 
         // Index
-			return $this->call('index', $parameters);
-		}
-
-		return null;
+        return $this->call($this->methodNames['index']);
     }
 
     /**
@@ -182,6 +171,29 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return $this;
     }
 
+    /**
+     * Define custom method name for resource controller
+     *
+     * @param array $names
+     * @return static $this
+     */
+    public function setMethodNames(array $names)
+    {
+        $this->methodNames = $names;
+
+        return $this;
+    }
+
+    /**
+     * Get method names
+     *
+     * @return array $this
+     */
+    public function getMethodNames()
+    {
+        return $this->methodNames;
+    }
+
     /**
      * Merge with information from another route.
      *
@@ -195,6 +207,10 @@ class RouteResource extends LoadableRoute implements IControllerRoute
             $this->names = $values['names'];
         }
 
+        if (isset($values['methods'])) {
+            $this->methodNames = $values['methods'];
+        }
+
         parent::setSettings($values, $merge);
 
         return $this;

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -11,35 +11,27 @@ class RouteUrl extends LoadableRoute
         $this->setCallback($callback);
     }
 
-	public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
     {
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
         $url = rtrim($url, '/') . '/';
 
-		// Match on custom defined regular expression
-		if ($this->regex !== null) {
-			$parameters = [];
-			if (preg_match('/(' . $this->regex . ')/is', $request->getHost() . $url, $parameters)) {
-				$this->parameters = (array)$parameters[0];
+        /* Match global regular-expression for route */
+        $domainMatch = $this->matchRegex($request, $url);
+        if ($domainMatch !== null) {
+            return $domainMatch;
+        }
+
+        /* Make regular expression based on route */
+        $parameters = $this->parseParameters($this->url, $url);
+        if ($parameters === null) {
+            return false;
+        }
+
+        $this->setParameters($parameters);
 
         return true;
-			}
 
-			return null;
-		}
-
-		// Make regular expression based on route
-		$route = rtrim($this->url, '/') . '/';
-
-		$parameters = $this->parseParameters($route, $url);
-
-		if ($parameters !== null) {
-			$this->parameters = array_merge($this->parameters, $parameters);
-
-			return true;
-		}
-
-		return null;
     }
 
 }

src/Pecee/SimpleRouter/Router.php

@@ -69,24 +69,6 @@ class Router
      */
     protected $exceptionHandlers;
 
-	/**
-	 * The current loaded route
-	 * @var ILoadableRoute|null
-	 */
-	protected $loadedRoute;
-
-	/**
-	 * List over route changes (to avoid endless-looping)
-	 * @var array
-	 */
-	protected $routeRewrites = [];
-
-	/**
-	 * If the route has been rewritten/changed this property will contain the original url.
-	 * @var string
-	 */
-	protected $originalUrl;
-
     /**
      * Get current router instance
      * @return static
@@ -100,7 +82,7 @@ class Router
         return static::$instance;
     }
 
-	public function __construct()
+    protected function __construct()
     {
         $this->reset();
     }
@@ -137,12 +119,29 @@ class Router
         return $route;
     }
 
+    /**
+     * Process added routes.
+     *
+     * @param array $routes
+     * @param IGroupRoute|null $group
+     * @param IRoute|null $parent
+     * @throws NotFoundHttpException
+     */
     protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
     {
         // Loop through each route-request
-		/* @var $route IRoute */
-		foreach ($routes as $route) {
+        $max = count($routes) - 1;
 
+        $exceptionHandlers = [];
+
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
+        /* @var $route IRoute */
+        for ($i = $max; $i >= 0; $i--) {
+
+            $route = $routes[$i];
+
+            /* @var $route IGroupRoute */
             if ($route instanceof IGroupRoute) {
 
                 $group = $route;
@@ -153,11 +152,11 @@ class Router
                     $route->renderRoute($this->request);
                     $this->processingRoute = false;
 
-					if ($route->matchRoute($this->request)) {
+                    if ($route->matchRoute($url, $this->request) === true) {
 
                         /* Add exception handlers */
                         if (count($route->getExceptionHandlers()) > 0) {
-							$this->exceptionHandlers = array_merge($route->getExceptionHandlers(), $this->exceptionHandlers);
+                            $exceptionHandlers += $route->getExceptionHandlers();
                         }
 
                     }
@@ -168,7 +167,6 @@ class Router
 
                 /* Add the parent group */
                 $route->setGroup($group);
-
             }
 
             if ($parent !== null) {
@@ -197,69 +195,72 @@ class Router
                 $this->processRoutes($stack, $route, $group);
             }
         }
+
+        $this->exceptionHandlers = array_unique(array_merge($exceptionHandlers, $this->exceptionHandlers));
     }
 
     public function routeRequest($rewrite = false)
     {
-		$this->loadedRoute = null;
         $routeNotAllowed = false;
 
         try {
 
+            if ($rewrite === false) {
+
                 /* Initialize boot-managers */
                 if (count($this->bootManagers) > 0) {
 
                     $max = count($this->bootManagers) - 1;
 
                     /* @var $manager IRouterBootManager */
-				for ($i = 0; $i < $max; $i++) {
-
+                    for ($i = $max; $i >= 0; $i--) {
                         $manager = $this->bootManagers[$i];
-
-					$this->request = $manager->boot($this->request);
-
-					if (!($this->request instanceof Request)) {
-						throw new HttpException('Bootmanager "' . get_class($manager) . '" must return instance of ' . Request::class, 500);
+                        $manager->boot($this->request);
                     }
                 }
-			}
-
-			if ($rewrite === false) {
 
                 /* Loop through each route-request */
                 $this->processRoutes($this->routes);
 
                 if ($this->csrfVerifier !== null) {
 
-					// Verify csrf token for request
+                    /* Verify csrf token for request */
                     $this->csrfVerifier->handle($this->request);
                 }
-
-				$this->originalUrl = $this->request->getUri();
             }
 
-			$max = count($this->processedRoutes);
+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
 
-			/* @var $route IRoute */
-			for ($i = 0; $i < $max; $i++) {
+            $max = count($this->processedRoutes) - 1;
+
+            /* @var $route ILoadableRoute */
+            for ($i = $max; $i >= 0; $i--) {
 
                 $route = $this->processedRoutes[$i];
 
                 /* If the route matches */
-				if ($route->matchRoute($this->request)) {
+                if ($route->matchRoute($url, $this->request) === true) {
 
                     /* Check if request method matches */
-					if (count($route->getRequestMethods()) > 0 && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
+                    if (count($route->getRequestMethods()) > 0 && in_array($this->request->getMethod(), $route->getRequestMethods(), false) === false) {
                         $routeNotAllowed = true;
                         continue;
                     }
 
-					$this->loadedRoute = $route;
-					$this->loadedRoute->loadMiddleware($this->request, $this->loadedRoute);
+                    $route->loadMiddleware($this->request);
 
-					/* If the request has changed, we reinitialize the router */
-					if ($this->request->getUri() !== $this->originalUrl && !in_array($this->request->getUri(), $this->routeRewrites)) {
-						$this->routeRewrites[] = $this->request->getUri();
+                    if ($this->request->getRewriteRoute() !== null) {
+                        $this->request->getRewriteRoute()->renderRoute($this->request);
+
+                        return;
+                    }
+
+                    /* If the request has changed */
+                    $rewriteUrl = $this->request->getRewriteUrl();
+
+                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                        unset($this->processedRoutes[$i]);
+                        $this->processedRoutes = array_values($this->processedRoutes);
                         $this->routeRequest(true);
 
                         return;
@@ -267,8 +268,8 @@ class Router
 
                     /* Render route */
                     $routeNotAllowed = false;
-					$this->request->setUri($this->originalUrl);
-					$this->loadedRoute->renderRoute($this->request);
+                    $this->request->setLoadedRoute($route);
+                    $route->renderRoute($this->request);
 
                     break;
                 }
@@ -282,37 +283,47 @@ class Router
             $this->handleException(new HttpException('Route or method not allowed', 403));
         }
 
-		if ($this->loadedRoute === null) {
+        if ($this->request->getLoadedRoute() === null) {
             $this->handleException(new NotFoundHttpException('Route not found: ' . $this->request->getUri(), 404));
         }
     }
 
     protected function handleException(\Exception $e)
     {
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
         $max = count($this->exceptionHandlers);
 
         /* @var $handler IExceptionHandler */
         for ($i = 0; $i < $max; $i++) {
 
             $handler = $this->exceptionHandlers[$i];
-
             $handler = new $handler();
 
-			if (!($handler instanceof IExceptionHandler)) {
+            if (($handler instanceof IExceptionHandler) === false) {
                 throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
             }
 
-			$request = $handler->handleError($this->request, $this->loadedRoute, $e);
+            if ($handler->handleError($this->request, $e) !== null) {
+
+                if ($this->request->getRewriteRoute() !== null) {
+                    $this->request->getRewriteRoute()->renderRoute($this->request);
+
+                    return;
+                }
+
+                $rewriteUrl = $this->request->getRewriteUrl();
 
                 /* If the request has changed */
-			if ($request !== null && $this->request->getUri() !== $this->originalUrl && !in_array($request->getUri(), $this->routeRewrites)) {
-				$this->request = $request;
-				$this->routeRewrites[] = $request->getUri();
+                if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                    unset($this->exceptionHandlers[$i]);
+                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
                     $this->routeRequest(true);
 
                     return;
                 }
             }
+        }
 
         throw $e;
     }
@@ -341,10 +352,10 @@ class Router
      */
     public function findRoute($name)
     {
-		$max = count($this->processedRoutes);
+        $max = count($this->processedRoutes) - 1;
 
         /* @var $route ILoadableRoute */
-		for ($i = 0; $i < $max; $i++) {
+        for ($i = $max; $i >= 0; $i--) {
 
             $route = $this->processedRoutes[$i];
 
@@ -371,7 +382,7 @@ class Router
             if (strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && !is_callable($route->getCallback())) {
 
                 /* Check if the entire callback is matching */
-				if (strtolower($route->getCallback()) === strtolower($name) || strpos($route->getCallback(), $name) === 0) {
+                if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
                     return $route;
                 }
 
@@ -400,6 +411,7 @@ class Router
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
+     * @throws \InvalidArgumentException
      * @return string
      */
     public function getUrl($name = null, $parameters = null, $getParams = null)
@@ -418,12 +430,15 @@ class Router
         /* Return current route if no options has been specified */
         if ($name === null && $parameters === null) {
             $url = rtrim(parse_url($this->request->getUri(), PHP_URL_PATH), '/');
+
             return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
         }
 
+        $loadedRoute = $this->request->getLoadedRoute();
+
         /* If nothing is defined and a route is loaded we use that */
-		if ($name === null && $this->loadedRoute !== null) {
-			return $this->loadedRoute->findUrl($this->loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+        if ($name === null && $loadedRoute !== null) {
+            return $loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
         }
 
         /* We try to find a match on the given name */
@@ -434,15 +449,15 @@ class Router
         }
 
         /* Using @ is most definitely a controller@method or alias@method */
-		if (stripos($name, '@') !== false) {
+        if (strpos($name, '@') !== false) {
             list($controller, $method) = explode('@', $name);
 
             /* Loop through all the routes to see if we can find a match */
 
-			$max = count($this->processedRoutes);
+            $max = count($this->processedRoutes) - 1;
 
             /* @var $route ILoadableRoute */
-			for ($i = 0; $i < $max; $i++) {
+            for ($i = $max; $i >= 0; $i--) {
 
                 $route = $this->processedRoutes[$i];
 
@@ -461,6 +476,7 @@ class Router
 
         /* No result so we assume that someone is using a hardcoded url and join everything together. */
         $url = trim(join('/', array_merge((array)$name, (array)$parameters)), '/');
+
         return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
     }
 
@@ -531,13 +547,4 @@ class Router
         return $this;
     }
 
-	/**
-	 * Get loaded route
-	 * @return ILoadableRoute|null
-	 */
-	public function getLoadedRoute()
-	{
-		return $this->loadedRoute;
-	}
-
 }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -309,6 +309,7 @@ class SimpleRouter
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
+     * @throws \Exception
      * @return string
      */
     public static function getUrl($name = null, $parameters = null, $getParams = null)

test/Dummy/DummyMiddleware.php

@@ -1,12 +1,11 @@
 <?php
 require_once 'Exceptions/MiddlewareLoadedException.php';
 
-use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 
-class DummyMiddleware implements IMiddleware
+class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
 {
-	public function handle(Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route)
+	public function handle(Request $request)
 	{
 		throw new MiddlewareLoadedException('Middleware loaded!');
 	}

test/Dummy/Exceptions/ExceptionHandlerException.php

@@ -0,0 +1,4 @@
+<?php
+class ExceptionHandlerException extends \Exception
+{
+}

test/Dummy/Handler/ExceptionHandler.php

@@ -2,9 +2,9 @@
 
 class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
 	{
-		throw $error;
+	    echo $error->getMessage();
 	}
 
 }

test/Dummy/Handler/TestExceptionHandlerFirst.php

@@ -0,0 +1,13 @@
+<?php
+
+class TestExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+	    echo 'ExceptionHandler 1 loaded' . chr(10);
+
+		$request->setUri('/');
+		return $request;
+	}
+
+}

test/Dummy/Handler/TestExceptionHandlerSecond.php

@@ -0,0 +1,13 @@
+<?php
+
+class TestExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        echo 'ExceptionHandler 2 loaded' . chr(10);
+
+        $request->setUri('/');
+        return $request;
+	}
+
+}

test/Dummy/Handler/TestExceptionHandlerThird.php

@@ -0,0 +1,12 @@
+<?php
+
+class TestExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        echo 'ExceptionHandler 3 loaded' . chr(10);
+
+		throw new ExceptionHandlerException('All good!', 666);
+	}
+
+}

test/MiddlewareTest.php

@@ -10,6 +10,8 @@ class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
     public function testMiddlewareFound()
     {
+        $this->setExpectedException('MiddlewareLoadedException');
+
         SimpleRouter::router()->reset();
         SimpleRouter::request()->setMethod('get');
         SimpleRouter::request()->setUri('/my/test/url');
@@ -18,15 +20,22 @@ class MiddlewareTest extends PHPUnit_Framework_TestCase
             SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
         });
 
-		$found = false;
-
-		try {
         SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof MiddlewareLoadedException);
     }
 
-		$this->assertTrue($found);
+    public function testNestedMiddlewareLoad()
+    {
+        $this->setExpectedException('MiddlewareLoadedException');
+
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/my/test/url');
+
+        SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
+            SimpleRouter::get('/my/test/url', 'DummyController@start');
+        });
+
+        SimpleRouter::start();
     }
 
 }

test/RouterRouteTest.php

@@ -2,34 +2,75 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
+require_once 'Dummy/Handler/TestExceptionHandlerFirst.php';
+require_once 'Dummy/Handler/TestExceptionHandlerSecond.php';
+require_once 'Dummy/Handler/TestExceptionHandlerThird.php';
 
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException as NotFoundHttpException;
+use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase
 {
     protected $result = false;
 
-	public function testNotFound()
+    public function testMultiParam()
     {
         SimpleRouter::router()->reset();
         SimpleRouter::request()->setMethod('get');
         SimpleRouter::request()->setUri('/test-param1-param2');
 
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/non-existing-path', 'DummyController@start');
-		});
+        SimpleRouter::get('/test-{param1}-{param2}', function($param1, $param2) {
 
-		$found = false;
-
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof NotFoundHttpException && $e->getCode() == 404);
+            if($param1 === 'param1' && $param2 === 'param2') {
+                $this->result = true;
             }
 
-		$this->assertTrue($found);
+        });
+
+        SimpleRouter::start();
+
+        $this->assertTrue($this->result);
+
+    }
+
+    /**
+     * Redirects to another route through 3 exception handlers.
+     *
+     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
+     * the exceptionhandler is asking the router to reload.
+     *
+     * That means that the exceptionhandler is loaded again, but this time
+     * the router ignores the same rewrite-route to avoid loop - loads
+     * the second which have same behavior and is also ignored before
+     * throwing the final Exception in ExceptionHandler 3.
+     *
+     * So this tests:
+     * 1. If ExceptionHandlers loads
+     * 2. If ExceptionHandlers load in the correct order
+     * 3. If ExceptionHandlers can rewrite the page on error
+     * 4. If the router can avoid redirect-loop due to developer has started loop.
+     * 5. And finally if we reaches the last exception-handler and that the correct
+     *    exception-type is being thrown.
+     */
+    public function testNotFound()
+    {
+        $this->setExpectedException('ExceptionHandlerException');
+
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/test-param1-param2');
+
+        SimpleRouter::group(['exceptionHandler' => ['TestExceptionHandlerFirst', 'TestExceptionHandlerSecond']], function () {
+
+            SimpleRouter::group(['exceptionHandler' => 'TestExceptionHandlerThird'], function () {
+
+                SimpleRouter::get('/non-existing-path', 'DummyController@start');
+
+            });
+        });
+
+        SimpleRouter::start();
     }
 
     public function testGet()
@@ -97,16 +138,6 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
         SimpleRouter::start();
     }
 
-	public function testMultiParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
-
-		SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
-		SimpleRouter::start();
-	}
-
     public function testPathParamRegex()
     {
         SimpleRouter::router()->reset();

test/RouterUrlTest.php

@@ -10,7 +10,8 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
 {
     protected $result = false;
 
-	protected function getUrl($name = null, $parameters = null, array $getParams = []) {
+    protected function getUrl($name = null, $parameters = null, array $getParams = [])
+    {
         return SimpleRouter::getUrl($name, $parameters, $getParams);
     }
 
@@ -98,4 +99,16 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
 
     }
 
+    public function testRegEx()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/my/custom-path');
+
+        SimpleRouter::get('/my/{path}', 'DummyController@start')->where(['path' => '[a-zA-Z\-]+']);
+
+        SimpleRouter::start();
+
+    }
+
 }