Merge pull request #343 from skipperbent/v2-development

Version 2.6.8.1

README.md

@@ -92,8 +92,7 @@ composer require pecee/simple-router
 
 ## Requirements
 
-- PHP 5.4 or greater
-- mcrypt extension
+- PHP 5.5 or greater
 
 ## Notes
 
@@ -756,7 +755,7 @@ If items is grouped in the html, it will return an array of items.
 **Note:** `get` will automatically trim the value and ensure that it's not empty. If it's empty the `$defaultValue` will be returned.
 
 ```php
-$value = input()->get($index, $defaultValue);
+$value = input()->get($index, $defaultValue, $methods);
 ```
 
 **Return parameter object (matches both GET, POST, FILE):**
@@ -772,7 +771,7 @@ If items is grouped in the html, it will return an array of items.
 **Note:** `getObject` will only return `$defaultValue` if the item doesn't exist. If you want `$defaultValue` to be returned if the item is empty, please use `input()->get()` instead.
 
 ```php
-$object = input()->getObject($index);
+$object = input()->getObject($index, $defaultValue = null, $methods = null);
 ```
 
 **Return specific GET parameter (where name is the name of your parameter):**
@@ -853,8 +852,8 @@ All object implements the `IInputItem` interface and will always contain these m
 Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
 
 ```php
-// Get parameter site_id or default-value 2
-$siteId = input()->get('site_id', 2);
+/* Get parameter site_id or default-value 2 from either post-value or query-string */
+$siteId = input()->get('site_id', 2, ['post', 'get']);
 ```
 
 ---

src/Pecee/Controllers/IRestController.php

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

src/Pecee/CsrfToken.php

@@ -3,66 +3,69 @@ namespace Pecee;
 
 class CsrfToken
 {
-	const CSRF_KEY = 'XSRF-TOKEN';
+    const CSRF_KEY = 'XSRF-TOKEN';
 
-	protected $token;
+    protected $token;
 
-	/**
-	 * Generate random identifier for CSRF token
-	 *
-	 * @return string
-	 */
-	public static function generateToken()
-	{
-		if (function_exists('mcrypt_create_iv')) {
-			return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
-		}
-		return bin2hex(openssl_random_pseudo_bytes(32));
-	}
+    /**
+     * Generate random identifier for CSRF token
+     *
+     * @return string
+     */
+    public static function generateToken()
+    {
+        if (function_exists('random_bytes')) {
+            return bin2hex(random_bytes(32));
+        }
 
-	/**
-	 * Validate valid CSRF token
-	 *
-	 * @param string $token
-	 * @return bool
-	 */
-	public function validate($token)
-	{
-		if ($token !== null && $this->getToken() !== null) {
-			return hash_equals($token, $this->getToken());
-		}
-		return false;
-	}
+        return bin2hex(openssl_random_pseudo_bytes(32));
+    }
 
-	/**
-	 * Set csrf token cookie
-	 *
-	 * @param $token
-	 */
-	public function setToken($token)
-	{
-		setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
-	}
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate($token)
+    {
+        if ($token !== null && $this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
 
-	/**
-	 * Get csrf token
-	 * @return string|null
-	 */
-	public function getToken()
-	{
-		if ($this->hasToken()) {
-			return $_COOKIE[static::CSRF_KEY];
-		}
-		return null;
-	}
+        return false;
+    }
 
-	/**
-	 * Returns whether the csrf token has been defined
-	 * @return bool
-	 */
-	public function hasToken()
-	{
-		return isset($_COOKIE[static::CSRF_KEY]);
-	}
+    /**
+     * Set csrf token cookie
+     *
+     * @param $token
+     */
+    public function setToken($token)
+    {
+        setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
+    }
+
+    /**
+     * Get csrf token
+     * @return string|null
+     */
+    public function getToken()
+    {
+        if ($this->hasToken()) {
+            return $_COOKIE[static::CSRF_KEY];
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns whether the csrf token has been defined
+     * @return bool
+     */
+    public function hasToken()
+    {
+        return isset($_COOKIE[static::CSRF_KEY]);
+    }
 
 }

src/Pecee/Handlers/IExceptionHandler.php

@@ -6,12 +6,12 @@ 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);
+    /**
+     * @param Request $request
+     * @param ILoadableRoute $route
+     * @param \Exception $error
+     * @return Request|null
+     */
+    public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error);
 
 }

src/Pecee/Http/Input/IInputItem.php

@@ -4,12 +4,14 @@ namespace Pecee\Http\Input;
 interface IInputItem
 {
 
-	public function getIndex();
+    public function getIndex();
 
-	public function getName();
+    public function setIndex($index);
 
-	public function getValue();
+    public function getName();
 
-	public function __toString();
+    public function setName($name);
+
+    public function __toString();
 
 }

src/Pecee/Http/Input/Input.php

@@ -5,247 +5,283 @@ use Pecee\Http\Request;
 
 class Input
 {
-	/**
-	 * @var array
-	 */
-	public $get = [];
+    /**
+     * @var array
+     */
+    public $get = [];
 
-	/**
-	 * @var array
-	 */
-	public $post = [];
+    /**
+     * @var array
+     */
+    public $post = [];
 
-	/**
-	 * @var array
-	 */
-	public $file = [];
+    /**
+     * @var array
+     */
+    public $file = [];
 
-	/**
-	 * @var Request
-	 */
-	protected $request;
+    /**
+     * @var Request
+     */
+    protected $request;
 
-	protected $invalidContentType = false;
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
 
-	protected $invalidContentTypes = [
-		'text/plain',
-		'application/x-www-form-urlencoded',
-	];
+        $this->parseInputs();
+    }
 
-	public function __construct(Request $request)
-	{
-		$this->request = $request;
+    public function parseInputs()
+    {
+        /* Parse get requests */
+        if (count($_GET) > 0) {
+            $this->get = $this->handleGetPost($_GET);
+        }
 
-		if ($request->getMethod() !== 'get') {
+        /* Parse post requests */
+        $postVars = $_POST;
 
-			$requestContentType = $request->getHeader('http-content-type');
+        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
+            parse_str(file_get_contents('php://input'), $postVars);
+        }
 
-			$max = count($this->invalidContentTypes) - 1;
+        if (count($postVars) > 0) {
+            $this->post = $this->handleGetPost($postVars);
+        }
 
-			for ($i = $max; $i >= 0; $i--) {
+        /* Parse get requests */
+        if (count($_FILES) > 0) {
+            $this->file = $this->parseFiles();
+        }
+    }
 
-				$contentType = $this->invalidContentType[$i];
+    public function parseFiles()
+    {
+        $list = [];
 
-				if (stripos($requestContentType, $contentType) === 0) {
-					$this->invalidContentType = true;
-					break;
-				}
-			}
-		}
+        foreach ($_FILES as $key => $value) {
 
-		if ($this->invalidContentType === false) {
-			$this->parseInputs();
-		}
+            // Handle array input
+            if (is_array($value['name']) === false) {
+                $values['index'] = $key;
+                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
+                continue;
+            }
 
-	}
+            $keys = [];
 
-	protected function parseInputs()
-	{
-		/* Parse get requests */
-		if (count($_GET) > 0) {
-			$this->get = $this->handleGetPost($_GET);
-		}
+            $files = $this->rearrangeFiles($value['name'], $keys, $value);
 
-		/* Parse post requests */
-		$postVars = $_POST;
+            if (isset($list[$key])) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
 
-		if (in_array($this->request->getMethod(), ['put', 'patch', 'delete']) === true) {
-			parse_str(file_get_contents('php://input'), $postVars);
-		}
+        }
 
-		if (count($postVars) > 0) {
-			$this->post = $this->handleGetPost($postVars);
-		}
+        return $list;
+    }
 
-		/* Parse get requests */
+    protected function rearrangeFiles(array $values, &$index, $original)
+    {
 
-		if (count($_FILES) > 0) {
+        $output = [];
 
-			$max = count($_FILES) - 1;
-			$keys = array_keys($_FILES);
+        $getItem = function ($key, $property = 'name') use ($original, $index) {
 
-			for ($i = $max; $i >= 0; $i--) {
+            $path = $original[$property];
 
-				$key = $keys[$i];
-				$value = $_FILES[$key];
+            foreach (array_values($index) as $i) {
+                $path = $path[$i];
+            }
 
-				// Handle array input
-				if (is_array($value['name']) === false) {
-					$values['index'] = $key;
-					$this->file[$key] = InputFile::createFromArray(array_merge($value, $values));
-					continue;
-				}
+            return $path[$key];
+        };
 
-				$subMax = count($value['name']) - 1;
-				$keys = array_keys($value['name']);
-				$output = [];
+        foreach ($values as $key => $value) {
 
-				for ($i = $subMax; $i >= 0; $i--) {
+            if (is_array($getItem($key)) === false) {
 
-					$output[$keys[$i]] = InputFile::createFromArray([
-						'index'    => $key,
-						'error'    => $value['error'][$keys[$i]],
-						'tmp_name' => $value['tmp_name'][$keys[$i]],
-						'type'     => $value['type'][$keys[$i]],
-						'size'     => $value['size'][$keys[$i]],
-						'name'     => $value['name'][$keys[$i]],
-					]);
+                $file = InputFile::createFromArray([
+                    'index'    => $key,
+                    '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[$key] = $output;
-			}
-		}
-	}
+                continue;
+            }
 
-	protected function handleGetPost($array)
-	{
-		$tmp = [];
+            $index[] = $key;
 
-		$max = count($array) - 1;
-		$keys = array_keys($array);
+            $files = $this->rearrangeFiles($value, $index, $original);
 
-		for ($i = $max; $i >= 0; $i--) {
+            if (isset($output[$key])) {
+                $output[$key][] = $files;
+            } else {
+                $output[$key] = $files;
+            }
 
-			$key = $keys[$i];
-			$value = $array[$key];
+        }
 
-			// Handle array input
-			if (is_array($value) === false) {
-				$tmp[$key] = new InputItem($key, $value);
-				continue;
-			}
+        return $output;
+    }
 
-			$subMax = count($value) - 1;
-			$keys = array_keys($value);
-			$output = [];
+    protected function handleGetPost(array $array)
+    {
+        $list = [];
 
-			for ($i = $subMax; $i >= 0; $i--) {
-				$output[$keys[$i]] = new InputItem($key, $value[$keys[$i]]);
-			}
+        $max = count($array) - 1;
+        $keys = array_keys($array);
 
-			$tmp[$key] = $output;
-		}
+        for ($i = $max; $i >= 0; $i--) {
 
-		return $tmp;
-	}
+            $key = $keys[$i];
+            $value = $array[$key];
 
-	public function findPost($index, $default = null)
-	{
-		return isset($this->post[$index]) ? $this->post[$index] : $default;
-	}
+            // Handle array input
+            if (is_array($value) === false) {
+                $list[$key] = new InputItem($key, $value);
+                continue;
+            }
 
-	public function findFile($index, $default = null)
-	{
-		return isset($this->file[$index]) ? $this->file[$index] : $default;
-	}
+            $output = $this->handleGetPost($value);
 
-	public function findGet($index, $default = null)
-	{
-		return isset($this->get[$index]) ? $this->get[$index] : $default;
-	}
+            $list[$key] = $output;
+        }
 
-	public function getObject($index, $default = null, $method = null)
-	{
-		$element = null;
+        return $list;
+    }
 
-		if ($method === null || strtolower($method) === 'get') {
-			$element = $this->findGet($index);
-		}
+    /**
+     * 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;
+    }
 
-		if ($element === null && $method === null || strtolower($method) === 'post') {
-			$element = $this->findPost($index);
-		}
+    /**
+     * 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;
+    }
 
-		if ($element === null && $method === null || strtolower($method) === 'file') {
-			$element = $this->findFile($index);
-		}
+    /**
+     * 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;
+    }
 
-		return ($element === null) ? $default : $element;
-	}
+    /**
+     * 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];
+        }
 
-	/**
-	 * Get input element value matching index
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @param string|null $method
-	 * @return InputItem|string
-	 */
-	public function get($index, $default = null, $method = null)
-	{
-		$input = $this->getObject($index, $default, $method);
+        $element = null;
 
-		if ($input instanceof InputItem) {
-			return (trim($input->getValue()) === '') ? $default : $input->getValue();
-		}
+        if ($methods === null || in_array('get', $methods)) {
+            $element = $this->findGet($index);
+        }
 
-		return $input;
-	}
+        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
+            $element = $this->findPost($index);
+        }
 
-	public function exists($index)
-	{
-		return ($this->getObject($index) !== null);
-	}
+        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
+            $element = $this->findFile($index);
+        }
 
-	/**
-	 * Get all get/post items
-	 * @param array|null $filter Only take items in filter
-	 * @return array
-	 */
-	public function all(array $filter = null)
-	{
-		if ($this->invalidContentType === true) {
-			return [];
-		}
+        return ($element !== null) ? $element : $defaultValue;
+    }
 
-		$output = $_POST;
+    /**
+     * Get input element value matching index
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
+     * @return InputItem|string
+     */
+    public function get($index, $defaultValue = null, $methods = null)
+    {
+        $input = $this->getObject($index, $defaultValue, $methods);
 
-		if ($this->request->getMethod() === 'post') {
+        if ($input instanceof InputItem) {
+            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
+        }
 
-			$contents = file_get_contents('php://input');
+        return $input;
+    }
 
-			if (stripos(trim($contents), '{') === 0) {
-				$output = json_decode($contents, true);
-				if ($output === false) {
-					$output = [];
-				}
-			}
-		}
+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function exists($index)
+    {
+        return ($this->getObject($index) !== null);
+    }
 
-		$output = array_merge($_GET, $output);
+    /**
+     * Get all get/post items
+     * @param array|null $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = null)
+    {
+        $output = $_GET;
 
-		if ($filter !== null) {
-			$output = array_filter($output, function ($key) use ($filter) {
-				if (in_array($key, $filter)) {
-					return true;
-				}
+        if ($this->request->getMethod() === 'post') {
 
-				return false;
-			}, ARRAY_FILTER_USE_KEY);
-		}
+            $contents = file_get_contents('php://input');
 
-		return $output;
-	}
+            if (strpos(trim($contents), '{') === 0) {
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output = array_merge($output, $post);
+                }
+            }
+        }
+
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
+    }
 
 }

src/Pecee/Http/Input/InputFile.php

@@ -3,188 +3,268 @@ namespace Pecee\Http\Input;
 
 class InputFile implements IInputItem
 {
-	public $index;
-	public $name;
-	public $size;
-	public $type;
-	public $error;
-	public $tmpName;
+    public $index;
+    public $name;
+    public $filename;
+    public $size;
+    public $type;
+    public $error;
+    public $tmpName;
 
-	public function __construct($index)
-	{
-		$this->index = $index;
+    public function __construct($index)
+    {
+        $this->index = $index;
 
-		// Make the name human friendly, by replace _ with space
-		$this->name = ucfirst(str_replace('_', ' ', $this->index));
-	}
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getIndex()
-	{
-		return $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');
+        }
 
-	/**
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
+        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
 
-	/**
-	 * @return string
-	 */
-	public function getSize()
-	{
-		return $this->size;
-	}
+        $values = array_merge([
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ], $values);
 
-	/**
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
+        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 getError()
-	{
-		return $this->error;
-	}
+    }
 
-	public function getMime()
-	{
-		return $this->getType();
-	}
+    /**
+     * @return string
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getTmpName()
-	{
-		return $this->tmpName;
-	}
+    /**
+     * Set input index
+     * @param string $index
+     * @return static $this
+     */
+    public function setIndex($index)
+    {
+        $this->index = $index;
 
-	public function getExtension()
-	{
-		return pathinfo($this->getName(), PATHINFO_EXTENSION);
-	}
+        return $this;
+    }
 
-	public function move($destination)
-	{
-		return move_uploaded_file($this->tmpName, $destination);
-	}
+    /**
+     * @return string
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
 
-	public function getContents()
-	{
-		return file_get_contents($this->tmpName);
-	}
+    /**
+     * Set file size
+     * @param int $size
+     * @return static $this
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
 
-	public function setName($name)
-	{
-		$this->name = $name;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Get mime-type of file
+     * @return string
+     */
+    public function getMime()
+    {
+        return $this->getType();
+    }
 
-	/**
-	 * Set file temp. name
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setTmpName($name)
-	{
-		$this->tmpName = $name;
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 
-		return $this;
-	}
+    /**
+     * Set type
+     * @param string $type
+     * @return static $this
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
 
-	/**
-	 * Set file size
-	 * @param int $size
-	 * @return static $this
-	 */
-	public function setSize($size)
-	{
-		$this->size = $size;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Returns extension without "."
+     *
+     * @return string
+     */
+    public function getExtension()
+    {
+        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
+    }
 
-	/**
-	 * Set type
-	 * @param string $type
-	 * @return static $this
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
+    /**
+     * Get human friendly name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 
-		return $this;
-	}
+    /**
+     * Set human friendly name.
+     * Useful for adding validation etc.
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
 
-	/**
-	 * Set error
-	 * @param int $error
-	 * @return static $this
-	 */
-	public function setError($error)
-	{
-		$this->error = (int)$error;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Set filename
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setFilename($name)
+    {
+        $this->filename = $name;
 
-	public function getValue()
-	{
-		return $this->getTmpName();
-	}
+        return $this;
+    }
 
-	public function hasError()
-	{
-		return ($this->getError() !== 0);
-	}
+    /**
+     * Get filename
+     *
+     * @return string mixed
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
 
-	/**
-	 * Create from array
-	 * @param array $values
-	 * @return static
-	 */
-	public static function createFromArray(array $values)
-	{
-		if (!isset($values['index'])) {
-			throw new \InvalidArgumentException('Index key is required');
-		}
+    /**
+     * 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);
+    }
 
-		$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);
+    /**
+     * Get file contents
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return file_get_contents($this->tmpName);
+    }
 
-		return $input;
-	}
+    /**
+     * Return true if an upload error occured.
+     *
+     * @return bool
+     */
+    public function hasError()
+    {
+        return ($this->getError() !== 0);
+    }
 
-	public function toArray()
-	{
-		return [
-			'tmp_name' => $this->tmpName,
-			'type'     => $this->type,
-			'size'     => $this->size,
-			'name'     => $this->name,
-			'error'    => $this->error,
-		];
-	}
+    /**
+     * Get upload-error code.
+     *
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Set error
+     *
+     * @param int $error
+     * @return static $this
+     */
+    public function setError($error)
+    {
+        $this->error = (int)$error;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTmpName()
+    {
+        return $this->tmpName;
+    }
+
+    /**
+     * Set file temp. name
+     * @param string $name
+     * @return static $this
+     */
+    public function setTmpName($name)
+    {
+        $this->tmpName = $name;
+
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return $this->getTmpName();
+    }
+
+    public function toArray()
+    {
+        return [
+            'tmp_name' => $this->tmpName,
+            'type'     => $this->type,
+            'size'     => $this->size,
+            'name'     => $this->filename,
+            'error'    => $this->error,
+        ];
+    }
 
-	public function __toString()
-	{
-		return $this->getValue();
-	}
 }

src/Pecee/Http/Input/InputItem.php

@@ -3,68 +3,77 @@ namespace Pecee\Http\Input;
 
 class InputItem implements IInputItem
 {
-	public $index;
-	public $name;
-	public $value;
+    public $index;
+    public $name;
+    public $value;
 
-	public function __construct($index, $value = null)
-	{
-		$this->index = $index;
-		$this->value = $value;
+    public function __construct($index, $value = null)
+    {
+        $this->index = $index;
+        $this->value = $value;
 
-		// Make the name human friendly, by replace _ with space
-		$this->name = ucfirst(str_replace('_', ' ', $this->index));
-	}
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getIndex()
-	{
-		return $this->index;
-	}
+    /**
+     * @return string
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
+    public function setIndex($index)
+    {
+        $this->index = $index;
 
-	/**
-	 * @return string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
+        return $this;
+    }
 
-	/**
-	 * Set input name
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-		return $this;
-	}
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 
-	/**
-	 * Set input value
-	 * @param string $value
-	 * @return static $this
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-		return $this;
-	}
+    /**
+     * Set input name
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
 
-	public function __toString()
-	{
-		return (string)$this->value;
-	}
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set input value
+     * @param string $value
+     * @return static $this
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
 
 }

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -8,92 +8,93 @@ use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 class BaseCsrfVerifier implements IMiddleware
 {
-	const POST_KEY = 'csrf-token';
-	const HEADER_KEY = 'X-CSRF-TOKEN';
+    const POST_KEY = 'csrf-token';
+    const HEADER_KEY = 'X-CSRF-TOKEN';
 
-	protected $except;
-	protected $csrfToken;
-	protected $token;
+    protected $except;
+    protected $csrfToken;
+    protected $token;
 
-	public function __construct()
-	{
-		$this->csrfToken = new CsrfToken();
+    public function __construct()
+    {
+        $this->csrfToken = new CsrfToken();
 
-		// Generate or get the CSRF-Token from Cookie.
-		$this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
-	}
+        // Generate or get the CSRF-Token from Cookie.
+        $this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
+    }
 
-	/**
-	 * Check if the url matches the urls in the except property
-	 * @param Request $request
-	 * @return bool
-	 */
-	protected function skip(Request $request)
-	{
-		if ($this->except === null || is_array($this->except) === false) {
-			return false;
-		}
+    /**
+     * Check if the url matches the urls in the except property
+     * @param Request $request
+     * @return bool
+     */
+    protected function skip(Request $request)
+    {
+        if ($this->except === null || is_array($this->except) === false) {
+            return false;
+        }
 
-		$max = count($this->except) - 1;
+        $max = count($this->except) - 1;
 
-		for ($i = $max; $i >= 0; $i--) {
-			$url = $this->except[$i];
+        for ($i = $max; $i >= 0; $i--) {
+            $url = $this->except[$i];
 
-			$url = rtrim($url, '/');
-			if ($url[strlen($url) - 1] === '*') {
-				$url = rtrim($url, '*');
-				$skip = (stripos($request->getUri(), $url) === 0);
-			} else {
-				$skip = ($url === rtrim($request->getUri(), '/'));
-			}
+            $url = rtrim($url, '/');
+            if ($url[strlen($url) - 1] === '*') {
+                $url = rtrim($url, '*');
+                $skip = (stripos($request->getUri(), $url) === 0);
+            } else {
+                $skip = ($url === rtrim($request->getUri(), '/'));
+            }
 
-			if ($skip === true) {
-				return true;
-			}
-		}
+            if ($skip === true) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function handle(Request $request, ILoadableRoute &$route = null)
-	{
+    public function handle(Request $request, ILoadableRoute &$route = null)
+    {
 
-		if (in_array($request->getMethod(), ['post', 'put', 'delete']) === true && $this->skip($request) === false) {
+        if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {
 
-			$token = $request->getInput()->get(static::POST_KEY, null, 'post');
+            $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 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) === false) {
-				throw new TokenMismatchException('Invalid csrf-token.');
-			}
+            if ($this->csrfToken->validate($token) === false) {
+                throw new TokenMismatchException('Invalid csrf-token.');
+            }
 
-		}
+        }
 
-	}
+    }
 
-	public function generateToken()
-	{
-		$token = $this->csrfToken->generateToken();
-		$this->csrfToken->setToken($token);
-		return $token;
-	}
+    public function generateToken()
+    {
+        $token = CsrfToken::generateToken();
+        $this->csrfToken->setToken($token);
 
-	public function hasToken()
-	{
-		if ($this->token != null) {
-			return true;
-		}
+        return $token;
+    }
 
-		return $this->csrfToken->hasToken();
-	}
+    public function hasToken()
+    {
+        if ($this->token !== null) {
+            return true;
+        }
 
-	public function getToken()
-	{
-		return $this->token;
-	}
+        return $this->csrfToken->hasToken();
+    }
+
+    public function getToken()
+    {
+        return $this->token;
+    }
 
 }

src/Pecee/Http/Middleware/IMiddleware.php

@@ -6,11 +6,11 @@ use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 interface IMiddleware
 {
-	/**
-	 * @param Request $request
-	 * @param ILoadableRoute $route
-	 * @return Request|null
-	 */
-	public function handle(Request $request, ILoadableRoute &$route);
+    /**
+     * @param Request $request
+     * @param ILoadableRoute $route
+     * @return Request|null
+     */
+    public function handle(Request $request, ILoadableRoute &$route);
 
 }

src/Pecee/Http/Request.php

@@ -5,226 +5,227 @@ use Pecee\Http\Input\Input;
 
 class Request
 {
-	protected $data = [];
-	protected $headers;
-	protected $host;
-	protected $uri;
-	protected $method;
-	protected $input;
+    protected $data = [];
+    protected $headers;
+    protected $host;
+    protected $uri;
+    protected $method;
+    protected $input;
 
-	public function __construct()
-	{
-		$this->parseHeaders();
-		$this->host = $this->getHeader('http-host');;
-		$this->uri = $this->getHeader('request-uri');
-		$this->input = new Input($this);
-		$this->method = $this->input->get('_method', strtolower($this->getHeader('request-method')));
-	}
+    public function __construct()
+    {
+        $this->parseHeaders();
+        $this->host = $this->getHeader('http-host');
+        $this->uri = $this->getHeader('request-uri');
+        $this->input = new Input($this);
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
+    }
 
-	protected function parseHeaders()
-	{
-		$this->headers = [];
+    protected function parseHeaders()
+    {
+        $this->headers = [];
 
-		$max = count($_SERVER) - 1;
-		$keys = array_keys($_SERVER);
+        $max = count($_SERVER) - 1;
+        $keys = array_keys($_SERVER);
 
-		for($i = $max; $i >= 0; $i--) {
-			$key = $keys[$i];
-			$value = $_SERVER[$key];
+        for ($i = $max; $i >= 0; $i--) {
+            $key = $keys[$i];
+            $value = $_SERVER[$key];
 
-			$this->headers[strtolower($key)] = $value;
-			$this->headers[strtolower(str_replace('_', '-', $key))] = $value;
-		}
+            $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;
-		}
+    public function isSecure()
+    {
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
+    }
 
-		return false;
-	}
+    /**
+     * @return string
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUri()
-	{
-		return $this->uri;
-	}
+    /**
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getHost()
-	{
-		return $this->host;
-	}
+    /**
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
+    /**
+     * Get http basic auth user
+     * @return string|null
+     */
+    public function getUser()
+    {
+        return $this->getHeader('php-auth-user');
+    }
 
-	/**
-	 * Get http basic auth user
-	 * @return string|null
-	 */
-	public function getUser()
-	{
-		return $this->getHeader('php-auth-user');
-	}
+    /**
+     * Get http basic auth password
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return $this->getHeader('php-auth-pw');
+    }
 
-	/**
-	 * Get http basic auth password
-	 * @return string|null
-	 */
-	public function getPassword()
-	{
-		return $this->getHeader('php-auth-pw');
-	}
+    /**
+     * Get all headers
+     * @return array
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
 
-	/**
-	 * Get all headers
-	 * @return array
-	 */
-	public function getHeaders()
-	{
-		return $this->headers;
-	}
+    /**
+     * Get id address
+     * @return string
+     */
+    public function getIp()
+    {
+        if ($this->getHeader('http-cf-connecting-ip') !== null) {
+            return $this->getHeader('http-cf-connecting-ip');
+        }
 
-	/**
-	 * Get id address
-	 * @return string
-	 */
-	public function getIp()
-	{
-		if ($this->getHeader('http-cf-connecting-ip') !== null) {
-			return $this->getHeader('http-cf-connecting-ip');
-		}
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
+            return $this->getHeader('http-x-forwarded_for');
+        }
 
-		if ($this->getHeader('http-x-forwarded-for') !== null && strlen($this->getHeader('http-x-forwarded-for'))) {
-			return $this->getHeader('http-x-forwarded_for');
-		}
+        return $this->getHeader('remote-addr');
+    }
 
-		return $this->getHeader('remote-addr');
-	}
+    /**
+     * Get referer
+     * @return string
+     */
+    public function getReferer()
+    {
+        return $this->getHeader('http-referer');
+    }
 
-	/**
-	 * Get referer
-	 * @return string
-	 */
-	public function getReferer()
-	{
-		return $this->getHeader('http-referer');
-	}
+    /**
+     * Get user agent
+     * @return string
+     */
+    public function getUserAgent()
+    {
+        return $this->getHeader('http-user-agent');
+    }
 
-	/**
-	 * Get user agent
-	 * @return string
-	 */
-	public function getUserAgent()
-	{
-		return $this->getHeader('http-user-agent');
-	}
+    /**
+     * Get header value by name
+     *
+     * @param string $name
+     * @param string|null $defaultValue
+     *
+     * @return string|null
+     */
+    public function getHeader($name, $defaultValue = null)
+    {
+        if (isset($this->headers[strtolower($name)])) {
+            return $this->headers[strtolower($name)];
+        }
 
-	/**
-	 * Get header value by name
-	 *
-	 * @param string $name
-	 * @param object|null $defaultValue
-	 *
-	 * @return string|null
-	 */
-	public function getHeader($name, $defaultValue = null)
-	{
-		if (isset($this->headers[strtolower($name)])) {
-			return $this->headers[strtolower($name)];
-		}
+        $max = count($_SERVER) - 1;
+        $keys = array_keys($_SERVER);
 
-		$max = count($_SERVER) - 1;
-		$keys = array_keys($_SERVER);
+        for ($i = $max; $i >= 0; $i--) {
 
-		for ($i = $max; $i >= 0; $i--) {
+            $key = $keys[$i];
+            $name = $_SERVER[$key];
 
-			$key = $keys[$i];
-			$name = $_SERVER[$key];
+            if ($key === $name) {
+                return $name;
+            }
+        }
 
-			if ($key === $name) {
-				return $name;
-			}
-		}
+        return $defaultValue;
+    }
 
-		return $defaultValue;
-	}
+    /**
+     * Get input class
+     * @return Input
+     */
+    public function getInput()
+    {
+        return $this->input;
+    }
 
-	/**
-	 * Get input class
-	 * @return Input
-	 */
-	public function getInput()
-	{
-		return $this->input;
-	}
+    /**
+     * Is format accepted
+     *
+     * @param string $format
+     *
+     * @return bool
+     */
+    public function isFormatAccepted($format)
+    {
+        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
+    }
 
-	/**
-	 * Is format accepted
-	 *
-	 * @param string $format
-	 *
-	 * @return bool
-	 */
-	public function isFormatAccepted($format)
-	{
-		return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
-	}
+    /**
+     * Get accept formats
+     * @return array
+     */
+    public function getAcceptFormats()
+    {
+        return explode(',', $this->getHeader('http-accept'));
+    }
 
-	/**
-	 * Get accept formats
-	 * @return array
-	 */
-	public function getAcceptFormats()
-	{
-		return explode(',', $this->getHeader('http-accept'));
-	}
+    /**
+     * @param string $uri
+     */
+    public function setUri($uri)
+    {
+        $this->uri = $uri;
+    }
 
-	/**
-	 * @param string $uri
-	 */
-	public function setUri($uri)
-	{
-		$this->uri = $uri;
-	}
+    /**
+     * @param string $host
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+    }
 
-	/**
-	 * @param string $host
-	 */
-	public function setHost($host)
-	{
-		$this->host = $host;
-	}
+    /**
+     * @param string $method
+     */
+    public function setMethod($method)
+    {
+        $this->method = $method;
+    }
 
-	/**
-	 * @param string $method
-	 */
-	public function setMethod($method)
-	{
-		$this->method = $method;
-	}
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->data);
+    }
 
-	public function __set($name, $value = null)
-	{
-		$this->data[$name] = $value;
-	}
+    public function __set($name, $value = null)
+    {
+        $this->data[$name] = $value;
+    }
 
-	public function __get($name)
-	{
-		return isset($this->data[$name]) ? $this->data[$name] : null;
-	}
+    public function __get($name)
+    {
+        return isset($this->data[$name]) ? $this->data[$name] : null;
+    }
 
 }

src/Pecee/Http/Response.php

@@ -1,118 +1,128 @@
 <?php
+
 namespace Pecee\Http;
 
 class Response
 {
-	protected $request;
+    protected $request;
 
-	public function __construct(Request $request)
-	{
-		$this->request = $request;
-	}
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
 
-	/**
-	 * Set the http status code
-	 *
-	 * @param int $code
-	 * @return static
-	 */
-	public function httpCode($code)
-	{
-		http_response_code($code);
-		return $this;
-	}
+    /**
+     * Set the http status code
+     *
+     * @param int $code
+     * @return static
+     */
+    public function httpCode($code)
+    {
+        http_response_code($code);
 
-	/**
-	 * Redirect the response
-	 *
-	 * @param string $url
-	 * @param int $httpCode
-	 */
-	public function redirect($url, $httpCode = null)
-	{
-		if ($httpCode !== null) {
-			$this->httpCode($httpCode);
-		}
+        return $this;
+    }
 
-		$this->header('location: ' . $url);
-		die();
-	}
+    /**
+     * Redirect the response
+     *
+     * @param string $url
+     * @param int $httpCode
+     */
+    public function redirect($url, $httpCode = null)
+    {
+        if ($httpCode !== null) {
+            $this->httpCode($httpCode);
+        }
 
-	public function refresh()
-	{
-		$this->redirect($this->request->getUri());
-	}
+        $this->header('location: ' . $url);
+        die();
+    }
 
-	/**
-	 * Add http authorisation
-	 * @param string $name
-	 * @return static
-	 */
-	public function auth($name = '')
-	{
-		$this->headers([
-			'WWW-Authenticate: Basic realm="' . $name . '"',
-			'HTTP/1.0 401 Unauthorized'
-		]);
-		return $this;
-	}
+    public function refresh()
+    {
+        $this->redirect($this->request->getUri());
+    }
 
-	public function cache($eTag, $lastModified = 2592000)
-	{
+    /**
+     * Add http authorisation
+     * @param string $name
+     * @return static
+     */
+    public function auth($name = '')
+    {
+        $this->headers([
+            'WWW-Authenticate: Basic realm="' . $name . '"',
+            'HTTP/1.0 401 Unauthorized',
+        ]);
 
-		$this->headers([
-			'Cache-Control: public',
-			'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
-			'Etag: ' . $eTag
-		]);
+        return $this;
+    }
 
-		$httpModified = $this->request->getHeader('http-if-modified-since');
-		$httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
+    public function cache($eTag, $lastModified = 2592000)
+    {
 
-		if ($httpModified !== null && strtotime($httpModified) == $lastModified || $httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) {
+        $this->headers([
+            'Cache-Control: public',
+            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',
+            'Etag: ' . $eTag,
+        ]);
 
-			$this->header('HTTP/1.1 304 Not Modified');
+        $httpModified = $this->request->getHeader('http-if-modified-since');
+        $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
 
-			exit();
-		}
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
 
-		return $this;
-	}
+            $this->header('HTTP/1.1 304 Not Modified');
 
-	/**
-	 * Json encode array
-	 * @param array $value
-	 */
-	public function json(array $value)
-	{
-		$this->header('Content-Type: application/json');
-		echo json_encode($value);
-		die();
-	}
+            exit();
+        }
 
-	/**
-	 * Add header to response
-	 * @param string $value
-	 * @return static
-	 */
-	public function header($value)
-	{
-		header($value);
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Add multiple headers to response
-	 * @param array $headers
-	 * @return static
-	 */
-	public function headers(array $headers)
-	{
-		$max = count($headers);
-		for($i = 0; $i < $max; $i++) {
-			$this->header($headers[$i]);
-		}
-		return $this;
-	}
+    /**
+     * Json encode
+     * @param array|\JsonSerializable $value
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws \InvalidArgumentException
+     */
+    public function json($value, $options = null, $dept = 512)
+    {
+        if (($value instanceof \JsonSerializable) === false && is_array($value) === false) {
+            throw new \InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
+        }
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
+        exit(0);
+    }
+
+    /**
+     * Add header to response
+     * @param string $value
+     * @return static
+     */
+    public function header($value)
+    {
+        header($value);
+
+        return $this;
+    }
+
+    /**
+     * Add multiple headers to response
+     * @param array $headers
+     * @return static
+     */
+    public function headers(array $headers)
+    {
+        foreach ($headers as $header) {
+            $this->header($header);
+        }
+
+        return $this;
+    }
 
 }

src/Pecee/SimpleRouter/IRouterBootManager.php

@@ -5,11 +5,11 @@ use Pecee\Http\Request;
 
 interface IRouterBootManager
 {
-	/**
-	 * Called when router loads it's routes
-	 *
-	 * @param Request $request
-	 * @return Request
-	 */
-	public function boot(Request $request);
+    /**
+     * Called when router loads it's routes
+     *
+     * @param Request $request
+     * @return Request
+     */
+    public function boot(Request $request);
 }

src/Pecee/SimpleRouter/Route/IControllerRoute.php

@@ -3,34 +3,34 @@ namespace Pecee\SimpleRouter\Route;
 
 interface IControllerRoute extends IRoute
 {
-	/**
-	 * Get controller class-name
-	 *
-	 * @return string
-	 */
-	public function getController();
+    /**
+     * Get controller class-name
+     *
+     * @return string
+     */
+    public function getController();
 
-	/**
-	 * Set controller class-name
-	 *
-	 * @param string $controller
-	 * @return static
-	 */
-	public function setController($controller);
+    /**
+     * Set controller class-name
+     *
+     * @param string $controller
+     * @return static
+     */
+    public function setController($controller);
 
-	/**
-	 * Return active method
-	 *
-	 * @return string
-	 */
-	public function getMethod();
+    /**
+     * Return active method
+     *
+     * @return string
+     */
+    public function getMethod();
 
-	/**
-	 * Set active method
-	 *
-	 * @param string $method
-	 * @return static
-	 */
-	public function setMethod($method);
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod($method);
 
 }

src/Pecee/SimpleRouter/Route/IGroupRoute.php

@@ -5,56 +5,56 @@ use Pecee\Http\Request;
 
 interface IGroupRoute extends IRoute
 {
-	/**
-	 * Method called to check if a domain matches
-	 *
-	 * @param Request $request
-	 * @return bool
-	 */
-	public function matchDomain(Request $request);
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public function matchDomain(Request $request);
 
-	/**
-	 * Set exception-handlers for group
-	 *
-	 * @param array $handlers
-	 * @return static $this
-	 */
-	public function setExceptionHandlers(array $handlers);
+    /**
+     * Set exception-handlers for group
+     *
+     * @param array $handlers
+     * @return static $this
+     */
+    public function setExceptionHandlers(array $handlers);
 
-	/**
-	 * Get exception-handlers for group
-	 *
-	 * @return array
-	 */
-	public function getExceptionHandlers();
+    /**
+     * Get exception-handlers for group
+     *
+     * @return array
+     */
+    public function getExceptionHandlers();
 
-	/**
-	 * Get domains for domain.
-	 *
-	 * @return array
-	 */
-	public function getDomains();
+    /**
+     * Get domains for domain.
+     *
+     * @return array
+     */
+    public function getDomains();
 
-	/**
-	 * Set allowed domains for group.
-	 *
-	 * @param array $domains
-	 * @return $this
-	 */
-	public function setDomains(array $domains);
+    /**
+     * Set allowed domains for group.
+     *
+     * @param array $domains
+     * @return $this
+     */
+    public function setDomains(array $domains);
 
-	/**
-	 * Set prefix that child-routes will inherit.
-	 *
-	 * @param string $prefix
-	 * @return string
-	 */
-	public function setPrefix($prefix);
+    /**
+     * Set prefix that child-routes will inherit.
+     *
+     * @param string $prefix
+     * @return string
+     */
+    public function setPrefix($prefix);
 
-	/**
-	 * Get prefix.
-	 *
-	 * @return string
-	 */
-	public function getPrefix();
+    /**
+     * Get prefix.
+     *
+     * @return string
+     */
+    public function getPrefix();
 }

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

@@ -5,50 +5,65 @@ use Pecee\Http\Request;
 
 interface ILoadableRoute extends IRoute
 {
-	/**
-	 * Find url that matches method, parameters or name.
-	 * Used when calling the url() helper.
-	 *
-	 * @param string|null $method
-	 * @param array|null $parameters
-	 * @param string|null $name
-	 * @return string
-	 */
-	public function findUrl($method = null, $parameters = null, $name = null);
+    /**
+     * Find url that matches method, parameters or name.
+     * Used when calling the url() helper.
+     *
+     * @param string|null $method
+     * @param array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl($method = null, $parameters = null, $name = null);
 
-	/**
-	 * Loads and renders middlewares-classes
-	 *
-	 * @param Request $request
-	 * @param ILoadableRoute $route
-	 */
-	public function loadMiddleware(Request $request, ILoadableRoute &$route);
+    /**
+     * Loads and renders middlewares-classes
+     *
+     * @param Request $request
+     * @param ILoadableRoute $route
+     */
+    public function loadMiddleware(Request $request, ILoadableRoute $route);
 
-	public function getUrl();
+    public function getUrl();
 
-	public function setUrl($url);
+    public function setUrl($url);
 
-	/**
-	 * Returns the provided name for the router.
-	 *
-	 * @return string
-	 */
-	public function getName();
+    /**
+     * Returns the provided name for the router.
+     *
+     * @return string
+     */
+    public function getName();
 
-	/**
-	 * Check if route has given name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasName($name);
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName($name);
 
-	/**
-	 * Sets the router name, which makes it easier to obtain the url or router at a later point.
-	 *
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setName($name);
+    /**
+     * Sets the router name, which makes it easier to obtain the url or router at a later point.
+     *
+     * @param string $name
+     * @return static $this
+     */
+    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

@@ -5,195 +5,181 @@ use Pecee\Http\Request;
 
 interface IRoute
 {
-	/**
-	 * Method called to check if a domain matches
-	 *
-	 * @param Request $request
-	 * @return bool
-	 */
-	public function matchRoute(Request $request);
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public function matchRoute(Request $request);
 
-	/**
-	 * Called when route is matched.
-	 * Returns class to be rendered.
-	 *
-	 * @param Request $request
-	 * @return object
-	 */
-	public function renderRoute(Request $request);
+    /**
+     * Called when route is matched.
+     * Returns class to be rendered.
+     *
+     * @param Request $request
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @return void
+     */
+    public function renderRoute(Request $request);
 
-	/**
-	 * Returns callback name/identifier for the current route based on the callback.
-	 * Useful if you need to get a unique identifier for the loaded route, for instance
-	 * when using translations etc.
-	 *
-	 * @return string
-	 */
-	public function getIdentifier();
+    /**
+     * Returns callback name/identifier for the current route based on the callback.
+     * Useful if you need to get a unique identifier for the loaded route, for instance
+     * when using translations etc.
+     *
+     * @return string
+     */
+    public function getIdentifier();
 
-	/**
-	 * Set allowed request methods
-	 *
-	 * @param array $methods
-	 * @return static $this
-	 */
-	public function setRequestMethods(array $methods);
+    /**
+     * Set allowed request methods
+     *
+     * @param array $methods
+     * @return static $this
+     */
+    public function setRequestMethods(array $methods);
 
-	/**
-	 * Get allowed request methods
-	 *
-	 * @return array
-	 */
-	public function getRequestMethods();
+    /**
+     * Get allowed request methods
+     *
+     * @return array
+     */
+    public function getRequestMethods();
 
-	/**
-	 * @return IRoute|null
-	 */
-	public function getParent();
+    /**
+     * @return IRoute|null
+     */
+    public function getParent();
 
-	/**
-	 * Get the group for the route.
-	 *
-	 * @return IGroupRoute|null
-	 */
-	public function getGroup();
+    /**
+     * Get the group for the route.
+     *
+     * @return IGroupRoute|null
+     */
+    public function getGroup();
 
-	/**
-	 * Set group
-	 *
-	 * @param IGroupRoute $group
-	 * @return static $this
-	 */
-	public function setGroup(IGroupRoute $group);
+    /**
+     * Set group
+     *
+     * @param IGroupRoute $group
+     * @return static $this
+     */
+    public function setGroup(IGroupRoute $group);
 
-	/**
-	 * Set parent route
-	 *
-	 * @param IRoute $parent
-	 * @return static $this
-	 */
-	public function setParent(IRoute $parent);
+    /**
+     * Set parent route
+     *
+     * @param IRoute $parent
+     * @return static $this
+     */
+    public function setParent(IRoute $parent);
 
-	/**
-	 * Set callback
-	 *
-	 * @param string $callback
-	 * @return static
-	 */
-	public function setCallback($callback);
+    /**
+     * Set callback
+     *
+     * @param string $callback
+     * @return static
+     */
+    public function setCallback($callback);
 
-	/**
-	 * @return string
-	 */
-	public function getCallback();
+    /**
+     * @return string
+     */
+    public function getCallback();
 
-	public function getMethod();
+    public function getMethod();
 
-	public function getClass();
+    public function getClass();
 
-	public function setMethod($method);
+    public function setMethod($method);
 
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setNamespace($namespace);
+    /**
+     * @param string $namespace
+     * @return static $this
+     */
+    public function setNamespace($namespace);
 
-	/**
-	 * @return string
-	 */
-	public function getNamespace();
+    /**
+     * @return string
+     */
+    public function getNamespace();
 
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setDefaultNamespace($namespace);
+    /**
+     * @param string $namespace
+     * @return static $this
+     */
+    public function setDefaultNamespace($namespace);
 
-	public function getDefaultNamespace();
+    public function getDefaultNamespace();
 
-	/**
-	 * Get regular expression match used for matching route (if defined).
-	 *
-	 * @return string
-	 */
-	public function getMatch();
+    /**
+     * Get parameter names.
+     *
+     * @return array
+     */
+    public function getWhere();
 
-	/**
-	 * Add regular expression match for the entire route.
-	 *
-	 * @param string $regex
-	 * @return static
-	 */
-	public function setMatch($regex);
+    /**
+     * Set parameter names.
+     *
+     * @param array $options
+     * @return static
+     */
+    public function setWhere(array $options);
 
-	/**
-	 * Get parameter names.
-	 *
-	 * @return array
-	 */
-	public function getWhere();
+    /**
+     * Get parameters
+     *
+     * @return array
+     */
+    public function getParameters();
 
-	/**
-	 * Set parameter names.
-	 *
-	 * @param array $options
-	 * @return static
-	 */
-	public function setWhere(array $options);
+    /**
+     * Get parameters
+     *
+     * @param array $parameters
+     * @return static $this
+     */
+    public function setParameters(array $parameters);
 
-	/**
-	 * Get parameters
-	 *
-	 * @return array
-	 */
-	public function getParameters();
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $settings
+     * @param bool $merge
+     * @return static $this
+     */
+    public function setSettings(array $settings, $merge = false);
 
-	/**
-	 * Get parameters
-	 *
-	 * @param array $parameters
-	 * @return static $this
-	 */
-	public function setParameters(array $parameters);
+    /**
+     * Export route settings to array so they can be merged with another route.
+     *
+     * @return array
+     */
+    public function toArray();
 
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $settings
-	 * @param bool $merge
-	 * @return static $this
-	 */
-	public function setSettings(array $settings, $merge = false);
+    /**
+     * Get middlewares array
+     *
+     * @return array
+     */
+    public function getMiddlewares();
 
-	/**
-	 * Export route settings to array so they can be merged with another route.
-	 *
-	 * @return array
-	 */
-	public function toArray();
+    /**
+     * Set middleware class-name
+     *
+     * @param string $middleware
+     * @return static
+     */
+    public function setMiddleware($middleware);
 
-	/**
-	 * Get middlewares array
-	 *
-	 * @return array
-	 */
-	public function getMiddlewares();
-
-	/**
-	 * Set middleware class-name
-	 *
-	 * @param string $middleware
-	 * @return static
-	 */
-	public function setMiddleware($middleware);
-
-	/**
-	 * Set middlewares array
-	 *
-	 * @param array $middlewares
-	 * @return $this
-	 */
-	public function setMiddlewares(array $middlewares);
+    /**
+     * Set middlewares array
+     *
+     * @param array $middlewares
+     * @return $this
+     */
+    public function setMiddlewares(array $middlewares);
 
 }

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -7,198 +7,245 @@ 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;
 
-	protected $url;
-	protected $name;
+    /**
+     * @var string
+     */
+    protected $name;
 
-	/**
-	 * Loads and renders middlewares-classes
-	 *
-	 * @param Request $request
-	 * @param ILoadableRoute $route
-	 * @throws HttpException
-	 */
-	public function loadMiddleware(Request $request, ILoadableRoute &$route)
-	{
-		if (count($this->getMiddlewares()) > 0) {
+    protected $regex;
 
-			$max = count($this->getMiddlewares());
+    /**
+     * Loads and renders middlewares-classes
+     *
+     * @param Request $request
+     * @param ILoadableRoute $route
+     * @throws HttpException
+     */
+    public function loadMiddleware(Request $request, ILoadableRoute $route)
+    {
+        if (count($this->getMiddlewares()) > 0) {
 
-			for ($i = 0; $i < $max; $i++) {
+            $max = count($this->getMiddlewares());
 
-				$middleware = $this->getMiddlewares()[$i];
+            for ($i = 0; $i < $max; $i++) {
 
-				$middleware = $this->loadClass($middleware);
-				if (!($middleware instanceof IMiddleware)) {
-					throw new HttpException($middleware . ' must be instance of Middleware');
-				}
+                $middleware = $this->getMiddlewares()[$i];
 
-				$middleware->handle($request, $route);
-			}
-		}
-	}
+                $middleware = $this->loadClass($middleware);
 
-	/**
-	 * Set url
-	 *
-	 * @param string $url
-	 * @return static
-	 */
-	public function setUrl($url)
-	{
-		$this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
+                if (!($middleware instanceof IMiddleware)) {
+                    throw new HttpException($middleware . ' must be instance of Middleware');
+                }
 
-		if(strpos($this->url, $this->paramModifiers[0]) !== false) {
+                $middleware->handle($request, $route);
+            }
+        }
+    }
 
-			$regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+    public function matchRegex(Request $request, $url)
+    {
 
-			if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
+        /* Match on custom defined regular expression */
 
-				$max = count($matches[1]);
+        if ($this->regex === null) {
+            return null;
+        }
 
-				for ($i = 0; $i < $max; $i++) {
-					$this->parameters[$matches[1][$i]] = null;
-				}
+        $parameters = [];
 
-			}
+        if (preg_match($this->regex, $request->getHost() . $url, $parameters) > 0) {
 
-		}
+            /* Remove global match */
+            $this->parameters = array_slice($parameters, 1);
 
-		return $this;
-	}
+            return true;
+        }
 
-	public function getUrl()
-	{
-		return $this->url;
-	}
+        return false;
+    }
 
-	/**
-	 * Find url that matches method, parameters or name.
-	 * Used when calling the url() helper.
-	 *
-	 * @param string|null $method
-	 * @param array|null $parameters
-	 * @param string|null $name
-	 * @return string
-	 */
-	public function findUrl($method = null, $parameters = null, $name = null)
-	{
-		$url = '';
+    /**
+     * Set url
+     *
+     * @param string $url
+     * @return static
+     */
+    public function setUrl($url)
+    {
+        $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
-		$parameters = (array)$parameters;
+        if (strpos($this->url, $this->paramModifiers[0]) !== false) {
 
-		if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-			$url .= '//' . $this->getGroup()->getDomains()[0];
-		}
+            $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-		$url .= $this->getUrl();
+            if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
+                $this->parameters = array_fill_keys($matches[1], null);
+            }
+        }
 
-		$params = array_merge($this->getParameters(), $parameters);
+        return $this;
+    }
 
-		/* Url that contains parameters that aren't recognized */
-		$unknownParams = [];
+    public function getUrl()
+    {
+        return $this->url;
+    }
 
-		/* Create the param string - {} */
-		$param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
+    /**
+     * Find url that matches method, parameters or name.
+     * Used when calling the url() helper.
+     *
+     * @param string|null $method
+     * @param array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl($method = null, $parameters = null, $name = null)
+    {
+        $url = $this->getUrl();
 
-		/* Create the param string with the optional symbol - {?} */
-		$param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
+        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
+            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
+        }
 
-		/* Let's parse the values of any {} parameter in the url */
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
+        $unknownParams = [];
 
-		$max = count($params);
-		$keys = array_keys($params);
+        /* Create the param string - {parameter} */
+        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
-		for ($i = 0; $i < $max; $i++) {
-			$param = $keys[$i];
-			$value = $params[$param];
+        /* Create the param string with the optional symbol - {parameter?} */
+        $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
 
-			$value = (isset($parameters[$param])) ? $parameters[$param] : $value;
+        /* Replace any {parameter} in the url with the correct value */
 
-			if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
-				$url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
-			} else {
-				$unknownParams[$param] = $value;
-			}
-		}
+        $params = $this->getParameters();
+        $max = count($params) - 1;
+        $keys = array_keys($params);
 
-		$url .= join('/', $unknownParams);
+        for ($i = $max; $i >= 0; $i--) {
+            $param = $keys[$i];
+            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
 
-		return rtrim($url, '/') . '/';
-	}
+            /* If parameter is specifically set to null - use the original-defined value */
+            if ($value === null && isset($this->originalParameters[$param])) {
+                $value = $this->originalParameters[$param];
+            }
 
-	/**
-	 * Returns the provided name for the router.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
+            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;
+            }
+        }
 
-	/**
-	 * Check if route has given name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasName($name)
-	{
-		return (strtolower($this->name) === strtolower($name));
-	}
+        $url .= join('/', $unknownParams);
 
-	/**
-	 * Sets the router name, which makes it easier to obtain the url or router at a later point.
-	 * Alias for LoadableRoute::setName().
-	 *
-	 * @see LoadableRoute::setName()
-	 * @param string|array $name
-	 * @return static
-	 */
-	public function name($name)
-	{
-		return $this->setName($name);
-	}
 
-	/**
-	 * Sets the router name, which makes it easier to obtain the url or router at a later point.
-	 *
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
 
-		return $this;
-	}
+        return rtrim($url, '/') . '/';
+    }
 
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @param bool $merge
-	 * @return static
-	 */
-	public function setSettings(array $values, $merge = false)
-	{
-		if (isset($values['as'])) {
-			if ($this->name !== null && $merge !== false) {
-				$this->setName($values['as'] . '.' . $this->name);
-			} else {
-				$this->setName($values['as']);
-			}
-		}
+    /**
+     * Returns the provided name for the router.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 
-		if (isset($values['prefix'])) {
-			$this->setUrl($values['prefix'] . $this->getUrl());
-		}
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName($name)
+    {
+        return (strtolower($this->name) === strtolower($name));
+    }
 
-		parent::setSettings($values, $merge);
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex)
+    {
+        $this->regex = $regex;
 
-		return $this;
-	}
+        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().
+     *
+     * @see LoadableRoute::setName()
+     * @param string|array $name
+     * @return static
+     */
+    public function name($name)
+    {
+        return $this->setName($name);
+    }
+
+    /**
+     * Sets the router name, which makes it easier to obtain the url or router at a later point.
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, $merge = false)
+    {
+        if (isset($values['as'])) {
+            if ($this->name !== null && $merge !== false) {
+                $this->setName($values['as'] . '.' . $this->name);
+            } else {
+                $this->setName($values['as']);
+            }
+        }
+
+        if (isset($values['prefix'])) {
+            $this->setUrl($values['prefix'] . $this->getUrl());
+        }
+
+        parent::setSettings($values, $merge);
+
+        return $this;
+    }
 
 }

src/Pecee/SimpleRouter/Route/Route.php

@@ -2,521 +2,479 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 abstract class Route implements IRoute
 {
-	const REQUEST_TYPE_GET = 'get';
-	const REQUEST_TYPE_POST = 'post';
-	const REQUEST_TYPE_PUT = 'put';
-	const REQUEST_TYPE_PATCH = 'patch';
-	const REQUEST_TYPE_OPTIONS = 'options';
-	const REQUEST_TYPE_DELETE = 'delete';
-
-	public static $requestTypes = [
-		self::REQUEST_TYPE_GET,
-		self::REQUEST_TYPE_POST,
-		self::REQUEST_TYPE_PUT,
-		self::REQUEST_TYPE_PATCH,
-		self::REQUEST_TYPE_OPTIONS,
-		self::REQUEST_TYPE_DELETE,
-	];
-
-	protected $paramModifiers = '{}';
-	protected $paramOptionalSymbol = '?';
-	protected $group;
-	protected $parent;
-	protected $callback;
-	protected $defaultNamespace;
-
-	/* Default options */
-	protected $namespace;
-	protected $regex;
-	protected $requestMethods = [];
-	protected $where = [];
-	protected $parameters = [];
-	protected $middlewares = [];
-
-	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 = $controller[1];
+    const PARAMETERS_REGEX_MATCH = '%s([\w]+)(\%s?)%s';
+
+    const REQUEST_TYPE_GET = 'get';
+    const REQUEST_TYPE_POST = 'post';
+    const REQUEST_TYPE_PUT = 'put';
+    const REQUEST_TYPE_PATCH = 'patch';
+    const REQUEST_TYPE_OPTIONS = 'options';
+    const REQUEST_TYPE_DELETE = 'delete';
 
-			if (!method_exists($class, $method)) {
-				throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-			}
-
-			$parameters = array_filter($this->getParameters(), function ($var) {
-				return ($var !== null);
-			});
-
-			call_user_func_array([$class, $method], $parameters);
-
-			return $class;
-		}
-
-		return null;
-	}
-
-	protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
-	{
-		$parameterNames = [];
-		$regex = '';
-		$lastCharacter = '';
-		$isParameter = false;
-		$parameter = '';
-
-		for ($i = 0; $i < strlen($route); $i++) {
-
-			$character = $route[$i];
-
-			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];
-				}
-
-				if ($lastCharacter === '?') {
-					$parameter = substr($parameter, 0, strlen($parameter) - 1);
-					$regex .= '(?:\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?)?';
-					$required = false;
-				} else {
-					$regex .= '\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?';
-				}
-
-				$parameterNames[] = [
-					'name'     => $parameter,
-					'required' => $required,
-				];
-
-				$parameter = '';
-				$isParameter = false;
-			} elseif ($isParameter) {
-				$parameter .= $character;
-			} elseif ($character === '/') {
-				$regex .= '\\' . $character;
-			} else {
-				$regex .= str_replace('.', '\\.', $character);
-			}
-
-			$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 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
-	 * when using translations etc.
-	 *
-	 * @return string
-	 */
-	public function getIdentifier()
-	{
-		if (strpos($this->callback, '@') !== false) {
-			return $this->callback;
-		}
-
-		return 'function_' . md5($this->callback);
-	}
-
-	/**
-	 * Set allowed request methods
-	 *
-	 * @param array $methods
-	 * @return static $this
-	 */
-	public function setRequestMethods(array $methods)
-	{
-		$this->requestMethods = $methods;
-
-		return $this;
-	}
-
-	/**
-	 * Get allowed request methods
-	 *
-	 * @return array
-	 */
-	public function getRequestMethods()
-	{
-		return $this->requestMethods;
-	}
-
-	/**
-	 * @return IRoute|null
-	 */
-	public function getParent()
-	{
-		return $this->parent;
-	}
-
-	/**
-	 * Get the group for the route.
-	 *
-	 * @return IGroupRoute|null
-	 */
-	public function getGroup()
-	{
-		return $this->group;
-	}
-
-	/**
-	 * Set group
-	 *
-	 * @param IGroupRoute $group
-	 * @return static $this
-	 */
-	public function setGroup(IGroupRoute $group)
-	{
-		$this->group = $group;
-
-		return $this;
-	}
-
-	/**
-	 * Set parent route
-	 *
-	 * @param IRoute $parent
-	 * @return static $this
-	 */
-	public function setParent(IRoute $parent)
-	{
-		$this->parent = $parent;
-
-		return $this;
-	}
-
-	/**
-	 * Set callback
-	 *
-	 * @param string $callback
-	 * @return static
-	 */
-	public function setCallback($callback)
-	{
-		$this->callback = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getCallback()
-	{
-		return $this->callback;
-	}
-
-	public function getMethod()
-	{
-		if (strpos($this->callback, '@') !== false) {
-			$tmp = explode('@', $this->callback);
-
-			return $tmp[1];
-		}
-
-		return null;
-	}
-
-	public function getClass()
-	{
-		if (strpos($this->callback, '@') !== false) {
-			$tmp = explode('@', $this->callback);
-
-			return $tmp[0];
-		}
-
-		return null;
-	}
-
-	public function setMethod($method)
-	{
-		$this->callback = sprintf('%s@%s', $this->getClass(), $method);
-
-		return $this;
-	}
-
-	public function setClass($class)
-	{
-		$this->callback = sprintf('%s@%s', $class, $this->getMethod());
-
-		return $this;
-	}
-
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setNamespace($namespace)
-	{
-		$this->namespace = $namespace;
-
-		return $this;
-	}
-
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setDefaultNamespace($namespace)
-	{
-		$this->defaultNamespace = $namespace;
-
-		return $this;
-	}
-
-	public function getDefaultNamespace()
-	{
-		return $this->defaultNamespace;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getNamespace()
-	{
-		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.
-	 *
-	 * @return array
-	 */
-	public function toArray()
-	{
-		$values = [];
-
-		if ($this->namespace !== null) {
-			$values['namespace'] = $this->namespace;
-		}
-
-		if (count($this->requestMethods) > 0) {
-			$values['method'] = $this->requestMethods;
-		}
-
-		if (count($this->where) > 0) {
-			$values['where'] = $this->where;
-		}
-
-		if (count($this->parameters) > 0) {
-			$values['parameters'] = $this->parameters;
-		}
-
-		if (count($this->middlewares) > 0) {
-			$values['middleware'] = $this->middlewares;
-		}
-
-		return $values;
-	}
-
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @param bool $merge
-	 * @return static $this
-	 */
-	public function setSettings(array $values, $merge = false)
-	{
-		if (isset($values['namespace']) && $this->namespace === null) {
-			$this->setNamespace($values['namespace']);
-		}
-
-		if (isset($values['method'])) {
-			$this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
-		}
-
-		if (isset($values['where'])) {
-			$this->setWhere(array_merge($this->where, (array)$values['where']));
-		}
-
-		if (isset($values['parameters'])) {
-			$this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
-		}
-
-		// Push middleware if multiple
-		if (isset($values['middleware'])) {
-			$this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get parameter names.
-	 *
-	 * @return array
-	 */
-	public function getWhere()
-	{
-		return $this->where;
-	}
-
-	/**
-	 * Set parameter names.
-	 *
-	 * @param array $options
-	 * @return static
-	 */
-	public function setWhere(array $options)
-	{
-		$this->where = $options;
-
-		return $this;
-	}
-
-	/**
-	 * Add regular expression parameter match.
-	 * Alias for LoadableRoute::where()
-	 *
-	 * @see LoadableRoute::where()
-	 * @param array $options
-	 * @return static
-	 */
-	public function where(array $options)
-	{
-		return $this->where($options);
-	}
-
-	/**
-	 * Get parameters
-	 *
-	 * @return array
-	 */
-	public function getParameters()
-	{
-		return $this->parameters;
-	}
-
-	/**
-	 * Get parameters
-	 *
-	 * @param array $parameters
-	 * @return static $this
-	 */
-	public function setParameters(array $parameters)
-	{
-		$this->parameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * Set middleware class-name
-	 *
-	 * @param string $middleware
-	 * @return static
-	 */
-	public function setMiddleware($middleware)
-	{
-		$this->middlewares[] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * Set middlewares array
-	 *
-	 * @param array $middlewares
-	 * @return $this
-	 */
-	public function setMiddlewares(array $middlewares)
-	{
-		$this->middlewares = $middlewares;
-
-		return $this;
-	}
-
-	/**
-	 * @return string|array
-	 */
-	public function getMiddlewares()
-	{
-		return $this->middlewares;
-	}
+    public static $requestTypes = [
+        self::REQUEST_TYPE_GET,
+        self::REQUEST_TYPE_POST,
+        self::REQUEST_TYPE_PUT,
+        self::REQUEST_TYPE_PATCH,
+        self::REQUEST_TYPE_OPTIONS,
+        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;
+    protected $parent;
+    protected $callback;
+    protected $defaultNamespace;
+
+    /* Default options */
+    protected $namespace;
+    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())) {
+
+            /* 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 = $controller[1];
+
+            if (method_exists($class, $method) === false) {
+                throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
+            }
+
+            $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);
+        }
+    }
+
+    protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
+    {
+        $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 = '';
+
+                if ($key < (count($parameters[1]))) {
+
+                    $name = $parameters[1][$key];
+                    $regex = isset($this->where[$name]) ? $this->where[$name] : $parameterRegex;
+                    $regex = sprintf('\-?\/?(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
+
+                }
+
+                $urlParts[$key] = preg_quote($t, '/') . $regex;
+            }
+
+            $urlRegex = join('', $urlParts);
+
+        } else {
+            $urlRegex = preg_quote($route, '/');
+        }
+
+        if (preg_match('/^' . $urlRegex . '(\/?)$/is', $url, $matches) > 0) {
+
+            $values = [];
+
+            /* Only take matched parameters with name */
+            foreach ($parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+            }
+
+            return $values;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns callback name/identifier for the current route based on the callback.
+     * Useful if you need to get a unique identifier for the loaded route, for instance
+     * when using translations etc.
+     *
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        if (strpos($this->callback, '@') !== false) {
+            return $this->callback;
+        }
+
+        return 'function_' . md5($this->callback);
+    }
+
+    /**
+     * Set allowed request methods
+     *
+     * @param array $methods
+     * @return static $this
+     */
+    public function setRequestMethods(array $methods)
+    {
+        $this->requestMethods = $methods;
+
+        return $this;
+    }
+
+    /**
+     * Get allowed request methods
+     *
+     * @return array
+     */
+    public function getRequestMethods()
+    {
+        return $this->requestMethods;
+    }
+
+    /**
+     * @return IRoute|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get the group for the route.
+     *
+     * @return IGroupRoute|null
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    /**
+     * Set group
+     *
+     * @param IGroupRoute $group
+     * @return static $this
+     */
+    public function setGroup(IGroupRoute $group)
+    {
+        $this->group = $group;
+
+        return $this;
+    }
+
+    /**
+     * Set parent route
+     *
+     * @param IRoute $parent
+     * @return static $this
+     */
+    public function setParent(IRoute $parent)
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Set callback
+     *
+     * @param string $callback
+     * @return static
+     */
+    public function setCallback($callback)
+    {
+        $this->callback = $callback;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCallback()
+    {
+        return $this->callback;
+    }
+
+    public function getMethod()
+    {
+        if (strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+
+            return $tmp[1];
+        }
+
+        return null;
+    }
+
+    public function getClass()
+    {
+        if (strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+
+            return $tmp[0];
+        }
+
+        return null;
+    }
+
+    public function setMethod($method)
+    {
+        $this->callback = sprintf('%s@%s', $this->getClass(), $method);
+
+        return $this;
+    }
+
+    public function setClass($class)
+    {
+        $this->callback = sprintf('%s@%s', $class, $this->getMethod());
+
+        return $this;
+    }
+
+    /**
+     * @param string $namespace
+     * @return static $this
+     */
+    public function setNamespace($namespace)
+    {
+        $this->namespace = $namespace;
+
+        return $this;
+    }
+
+    /**
+     * @param string $namespace
+     * @return static $this
+     */
+    public function setDefaultNamespace($namespace)
+    {
+        $this->defaultNamespace = $namespace;
+
+        return $this;
+    }
+
+    public function getDefaultNamespace()
+    {
+        return $this->defaultNamespace;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
+    }
+
+    /**
+     * Export route settings to array so they can be merged with another route.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $values = [];
+
+        if ($this->namespace !== null) {
+            $values['namespace'] = $this->namespace;
+        }
+
+        if (count($this->requestMethods) > 0) {
+            $values['method'] = $this->requestMethods;
+        }
+
+        if (count($this->where) > 0) {
+            $values['where'] = $this->where;
+        }
+
+        if (count($this->middlewares) > 0) {
+            $values['middleware'] = $this->middlewares;
+        }
+
+        return $values;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static $this
+     */
+    public function setSettings(array $values, $merge = false)
+    {
+        if ($this->namespace === null && isset($values['namespace'])) {
+            $this->setNamespace($values['namespace']);
+        }
+
+        if (isset($values['method'])) {
+            $this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
+        }
+
+        if (isset($values['where'])) {
+            $this->setWhere(array_merge($this->where, (array)$values['where']));
+        }
+
+        if (isset($values['parameters'])) {
+            $this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
+        }
+
+        // Push middleware if multiple
+        if (isset($values['middleware'])) {
+            $this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get parameter names.
+     *
+     * @return array
+     */
+    public function getWhere()
+    {
+        return $this->where;
+    }
+
+    /**
+     * Set parameter names.
+     *
+     * @param array $options
+     * @return static
+     */
+    public function setWhere(array $options)
+    {
+        $this->where = $options;
+
+        return $this;
+    }
+
+    /**
+     * Add regular expression parameter match.
+     * Alias for LoadableRoute::where()
+     *
+     * @see LoadableRoute::where()
+     * @param array $options
+     * @return static
+     */
+    public function where(array $options)
+    {
+        return $this->setWhere($options);
+    }
+
+    /**
+     * Get parameters
+     *
+     * @return array
+     */
+    public function getParameters()
+    {
+        /* 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);
+    }
+
+    /**
+     * Get parameters
+     *
+     * @param array $parameters
+     * @return static $this
+     */
+    public function setParameters(array $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;
+    }
+
+    /**
+     * Set middleware class-name
+     *
+     * @param string $middleware
+     * @return static
+     */
+    public function setMiddleware($middleware)
+    {
+        $this->middlewares[] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * Set middlewares array
+     *
+     * @param array $middlewares
+     * @return $this
+     */
+    public function setMiddlewares(array $middlewares)
+    {
+        $this->middlewares = $middlewares;
+
+        return $this;
+    }
+
+    /**
+     * @return string|array
+     */
+    public function getMiddlewares()
+    {
+        return $this->middlewares;
+    }
 
 }

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -2,203 +2,182 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class RouteController extends LoadableRoute implements IControllerRoute
 {
-	protected $defaultMethod = 'index';
-	protected $controller;
-	protected $method;
-	protected $names = [];
+    protected $defaultMethod = 'index';
+    protected $controller;
+    protected $method;
+    protected $names = [];
 
-	public function __construct($url, $controller)
-	{
-		$this->setUrl($url);
-		$this->setName(trim(str_replace('/', '.', $url), '/'));
-		$this->controller = $controller;
-	}
+    public function __construct($url, $controller)
+    {
+        $this->setUrl($url);
+        $this->setName(trim(str_replace('/', '.', $url), '/'));
+        $this->controller = $controller;
+    }
 
-	/**
-	 * Check if route has given name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasName($name)
-	{
-		if ($this->name === null) {
-			return false;
-		}
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName($name)
+    {
+        if ($this->name === null) {
+            return false;
+        }
 
-		/* Remove method/type */
-		if (stripos($name, '.') !== false) {
-			$method = substr($name, strrpos($name, '.') + 1);
-			$newName = substr($name, 0, strrpos($name, '.'));
+        /* Remove method/type */
+        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)) {
-				return true;
-			}
-		}
+            if (in_array($method, $this->names, false) === true && strtolower($this->name) === strtolower($newName)) {
+                return true;
+            }
+        }
 
-		return parent::hasName($name);
-	}
+        return parent::hasName($name);
+    }
 
-	public function findUrl($method = null, $parameters = null, $name = null)
-	{
+    /**
+     * @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 (strpos($name, '.') !== false) {
+            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
+            if ($found !== false) {
+                $method = $found;
+            }
+        }
 
-		if (stripos($name, '.') !== false) {
-			$found = array_search(substr($name, strrpos($name, '.') + 1), $this->names);
-			if ($found !== false) {
-				$method = $found;
-			}
-		}
+        $url = '';
+        $parameters = (array)$parameters;
 
-		$url = '';
+        if ($method !== null) {
 
-		$parameters = (array)$parameters;
+            /* Remove requestType from method-name, if it exists */
+            foreach (static::$requestTypes as $requestType) {
 
-		/* Remove requestType from method-name, if it exists */
-		if ($method !== null) {
-			$max = count(static::$requestTypes);
+                if (stripos($method, $requestType) === 0) {
+                    $method = substr($method, strlen($requestType));
+                    break;
+                }
+            }
 
-			for ($i = 0; $i < $max; $i++) {
+            $method .= '/';
+        }
 
-				$requestType = static::$requestTypes[$i];
+        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
+            $url .= '//' . $this->getGroup()->getDomains()[0];
+        }
 
-				if (stripos($method, $requestType) === 0) {
-					$method = substr($method, strlen($requestType));
-					break;
-				}
-			}
-			$method .= '/';
-		}
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
 
-		if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-			$url .= '//' . $this->getGroup()->getDomains()[0];
-		}
+        return '/' . trim($url, '/') . '/';
+    }
 
-		$url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
+    public function matchRoute(Request $request)
+    {
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';
 
-		return '/' . trim($url, '/') . '/';
-	}
+        /* Match global regular-expression for route */
+        if ($this->matchRegex($request, $url) === true) {
+            return true;
+        }
 
-	public function renderRoute(Request $request)
-	{
-		if ($this->getCallback() !== null && is_callable($this->getCallback())) {
+        if (stripos($url, $this->url) === 0 && strtolower($url) === strtolower($this->url)) {
 
-			// 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];
+            $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
 
-			$class = $this->loadClass($className);
-			$method = $request->getMethod() . ucfirst($controller[1]);
+            $path = explode('/', $strippedUrl);
 
-			if (!method_exists($class, $method)) {
-				throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-			}
+            if (count($path) > 0) {
 
-			call_user_func_array([$class, $method], $this->getParameters());
+                $method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
+                $this->method = $method;
 
-			return $class;
-		}
+                $this->parameters = array_slice($path, 1);
 
-		return null;
-	}
+                // Set callback
+                $this->setCallback($this->controller . '@' . $this->method);
 
-	public function matchRoute(Request $request)
-	{
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
+                return true;
+            }
+        }
 
-		if (strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
+        return false;
+    }
 
-			$strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
+    /**
+     * Get controller class-name.
+     *
+     * @return string
+     */
+    public function getController()
+    {
+        return $this->controller;
+    }
 
-			$path = explode('/', $strippedUrl);
+    /**
+     * Get controller class-name.
+     *
+     * @param string $controller
+     * @return static
+     */
+    public function setController($controller)
+    {
+        $this->controller = $controller;
 
-			if (count($path) > 0) {
+        return $this;
+    }
 
-				$method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
-				$this->method = $method;
+    /**
+     * Return active method
+     *
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
 
-				array_shift($path);
-				$this->parameters = $path;
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod($method)
+    {
+        $this->method = $method;
 
-				// Set callback
-				$this->setCallback($this->controller . '@' . $this->method);
+        return $this;
+    }
 
-				return true;
-			}
-		}
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, $merge = false)
+    {
+        if (isset($values['names'])) {
+            $this->names = $values['names'];
+        }
 
-		return null;
-	}
+        parent::setSettings($values, $merge);
 
-	/**
-	 * Get controller class-name.
-	 *
-	 * @return string
-	 */
-	public function getController()
-	{
-		return $this->controller;
-	}
-
-	/**
-	 * Get controller class-name.
-	 *
-	 * @param string $controller
-	 * @return static
-	 */
-	public function setController($controller)
-	{
-		$this->controller = $controller;
-
-		return $this;
-	}
-
-	/**
-	 * Return active method
-	 *
-	 * @return string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Set active method
-	 *
-	 * @param string $method
-	 * @return static
-	 */
-	public function setMethod($method)
-	{
-		$this->method = $method;
-
-		return $this;
-	}
-
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @param bool $merge
-	 * @return static
-	 */
-	public function setSettings(array $values, $merge = false)
-	{
-		if (isset($values['names'])) {
-			$this->names = $values['names'];
-		}
-
-		parent::setSettings($values, $merge);
-
-		return $this;
-	}
+        return $this;
+    }
 
 }

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -5,177 +5,178 @@ use Pecee\Http\Request;
 
 class RouteGroup extends Route implements IGroupRoute
 {
-	protected $prefix;
-	protected $name;
-	protected $domains = [];
-	protected $exceptionHandlers = [];
+    protected $prefix;
+    protected $name;
+    protected $domains = [];
+    protected $exceptionHandlers = [];
 
-	/**
-	 * Method called to check if a domain matches
-	 *
-	 * @param Request $request
-	 * @return bool
-	 */
-	public function matchDomain(Request $request)
-	{
-		if (count($this->domains) > 0) {
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public function matchDomain(Request $request)
+    {
+        if (count($this->domains) === 0) {
+            return true;
+        }
 
-			$max = count($this->domains);
+        foreach ($this->domains as $domain) {
 
-			for ($i = 0; $i < $max; $i++) {
+            $parameters = $this->parseParameters($domain, $request->getHost(), '.*');
 
-				$domain = $this->domains[$i];
-				$parameters = $this->parseParameters($domain, $request->getHost(), '.*');
+            if ($parameters !== null && count($parameters) > 0) {
 
-				if ($parameters !== null) {
-					$this->parameters = $parameters;
+                $this->parameters = $parameters;
 
-					return true;
-				}
-			}
+                return true;
+            }
+        }
 
-			return false;
-		}
+        return false;
+    }
 
-		return true;
-	}
+    /**
+     * Method called to check if route matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public function matchRoute(Request $request)
+    {
+        /* Skip if prefix doesn't match */
+        if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
+            return false;
+        }
 
-	/**
-	 * Method called to check if route matches
-	 *
-	 * @param Request $request
-	 * @return bool
-	 */
-	public function matchRoute(Request $request)
-	{
-		// Skip if prefix doesn't match
-		if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
-			return false;
-		}
+        return $this->matchDomain($request);
+    }
 
-		return $this->matchDomain($request);
-	}
+    /**
+     * Set exception-handlers for group
+     *
+     * @param array $handlers
+     * @return static $this
+     */
+    public function setExceptionHandlers(array $handlers)
+    {
+        $this->exceptionHandlers = $handlers;
 
-	/**
-	 * Set exception-handlers for group
-	 *
-	 * @param array $handlers
-	 * @return static $this
-	 */
-	public function setExceptionHandlers(array $handlers)
-	{
-		$this->exceptionHandlers = $handlers;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Get exception-handlers for group
+     *
+     * @return array
+     */
+    public function getExceptionHandlers()
+    {
+        return $this->exceptionHandlers;
+    }
 
-	/**
-	 * Get exception-handlers for group
-	 *
-	 * @return array
-	 */
-	public function getExceptionHandlers()
-	{
-		return $this->exceptionHandlers;
-	}
+    /**
+     * Get allowed domains for domain.
+     *
+     * @return array
+     */
+    public function getDomains()
+    {
+        return $this->domains;
+    }
 
-	/**
-	 * Get allowed domains for domain.
-	 *
-	 * @return array
-	 */
-	public function getDomains()
-	{
-		return $this->domains;
-	}
+    /**
+     * Set allowed domains for group.
+     *
+     * @param array $domains
+     * @return $this
+     */
+    public function setDomains(array $domains)
+    {
+        $this->domains = $domains;
 
-	/**
-	 * Set allowed domains for group.
-	 *
-	 * @param array $domains
-	 * @return $this
-	 */
-	public function setDomains(array $domains)
-	{
-		$this->domains = $domains;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * @param string $prefix
+     * @return static
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = '/' . trim($prefix, '/');
 
-	/**
-	 * @param string $prefix
-	 * @return static
-	 */
-	public function setPrefix($prefix)
-	{
-		$this->prefix = '/' . trim($prefix, '/');
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Set prefix that child-routes will inherit.
+     *
+     * @return string
+     */
+    public function getPrefix()
+    {
+        return $this->prefix;
+    }
 
-	/**
-	 * Set prefix that child-routes will inherit.
-	 *
-	 * @return string
-	 */
-	public function getPrefix()
-	{
-		return $this->prefix;
-	}
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, $merge = false)
+    {
 
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @param bool $merge
-	 * @return static
-	 */
-	public function setSettings(array $values, $merge = false)
-	{
+        if (isset($values['prefix'])) {
+            $this->setPrefix($values['prefix'] . $this->prefix);
+        }
 
-		if (isset($values['prefix'])) {
-			$this->setPrefix($values['prefix'] . $this->prefix);
-		}
+        if (isset($values['exceptionHandler'])) {
+            $this->setExceptionHandlers((array)$values['exceptionHandler']);
+        }
 
-		if (isset($values['exceptionHandler'])) {
-			$this->setExceptionHandlers((array)$values['exceptionHandler']);
-		}
+        if (isset($values['domain'])) {
+            $this->setDomains((array)$values['domain']);
+        }
 
-		if (isset($values['domain'])) {
-			$this->setDomains((array)$values['domain']);
-		}
+        if (isset($values['as'])) {
+            if ($this->name !== null && $merge !== false) {
+                $this->name = $values['as'] . '.' . $this->name;
+            } else {
+                $this->name = $values['as'];
+            }
+        }
 
-		if (isset($values['as'])) {
-			if ($this->name !== null && $merge !== false) {
-				$this->name = $values['as'] . '.' . $this->name;
-			} else {
-				$this->name = $values['as'];
-			}
-		}
+        parent::setSettings($values, $merge);
 
-		parent::setSettings($values, $merge);
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Export route settings to array so they can be merged with another route.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $values = [];
 
-	/**
-	 * Export route settings to array so they can be merged with another route.
-	 *
-	 * @return array
-	 */
-	public function toArray()
-	{
-		$values = [];
+        if ($this->prefix !== null) {
+            $values['prefix'] = $this->getPrefix();
+        }
 
-		if ($this->prefix !== null) {
-			$values['prefix'] = $this->getPrefix();
-		}
+        if ($this->name !== null) {
+            $values['as'] = $this->name;
+        }
 
-		if ($this->name !== null) {
-			$values['as'] = $this->name;
-		}
+        if (count($this->parameters) > 0) {
+            $values['parameters'] = $this->parameters;
+        }
 
-		return array_merge($values, parent::toArray());
-	}
+        return array_merge($values, parent::toArray());
+    }
 
 }

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -2,202 +2,218 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class RouteResource extends LoadableRoute implements IControllerRoute
 {
-	protected $urls = [
-		'index'   => '',
-		'create'  => 'create',
-		'store'   => '',
-		'show'    => '',
-		'edit'    => 'edit',
-		'update'  => '',
-		'destroy' => '',
-	];
-	protected $names = [];
-	protected $controller;
+    protected $urls = [
+        'index'   => '',
+        'create'  => 'create',
+        'store'   => '',
+        'show'    => '',
+        'edit'    => 'edit',
+        'update'  => '',
+        'destroy' => '',
+    ];
 
-	public function __construct($url, $controller)
-	{
-		$this->setUrl($url);
-		$this->controller = $controller;
-		$this->setName(trim(str_replace('/', '.', $url), '/'));
-	}
+    protected $methodNames = [
+        'index'   => 'index',
+        'create'  => 'create',
+        'store'   => 'store',
+        'show'    => 'show',
+        'edit'    => 'edit',
+        'update'  => 'update',
+        'destroy' => 'destroy',
+    ];
 
-	/**
-	 * Check if route has given name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasName($name)
-	{
-		if ($this->name === null) {
-			return false;
-		}
+    protected $names = [];
+    protected $controller;
 
-		if (strtolower($this->name) === strtolower($name)) {
-			return true;
-		}
+    public function __construct($url, $controller)
+    {
+        $this->setUrl($url);
+        $this->controller = $controller;
+        $this->setName(trim(str_replace('/', '.', $url), '/'));
+    }
 
-		/* Remove method/type */
-		if (stripos($name, '.') !== false) {
-			$name = substr($name, 0, strrpos($name, '.'));
-		}
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName($name)
+    {
+        if ($this->name === null) {
+            return false;
+        }
 
-		return (strtolower($this->name) === strtolower($name));
-	}
+        if (strtolower($this->name) === strtolower($name)) {
+            return true;
+        }
 
-	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], '/') . '/';
-		}
+        /* Remove method/type */
+        if (strpos($name, '.') !== false) {
+            $name = substr($name, 0, strrpos($name, '.'));
+        }
 
-		return $this->url;
-	}
+        return (strtolower($this->name) === strtolower($name));
+    }
 
-	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]);
+    public function findUrl($method = null, $parameters = null, $name = null)
+    {
+        $method = array_search($name, $this->names, false);
+        if ($method !== false) {
+            return rtrim($this->url . $this->urls[$method], '/') . '/';
+        }
 
-			if (!method_exists($class, $method)) {
-				throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-			}
+        return $this->url;
+    }
 
-			call_user_func_array([$class, $method], $this->getParameters());
+    protected function call($method)
+    {
+        $this->setCallback($this->controller . '@' . $method);
 
-			return $class;
-		}
+        return true;
+    }
 
-		return null;
-	}
+    public function matchRoute(Request $request)
+    {
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';
 
-	protected function call($method, $parameters)
-	{
-		$this->setCallback($this->controller . '@' . $method);
-		$this->parameters = $parameters;
+        /* Match global regular-expression for route */
+        $domainMatch = $this->matchRegex($request, $url);
+        if ($domainMatch !== null) {
+            return $domainMatch;
+        }
 
-		return true;
-	}
+        $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
-	public function matchRoute(Request $request)
-	{
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
+        $parameters = $this->parseParameters($route, $url);
+        if ($parameters === null) {
+            return false;
+        }
 
-		$route = rtrim($this->url, '/') . '/{id?}/{action?}';
+        $this->parameters = (array)$parameters;
 
-		$parameters = $this->parseParameters($route, $url);
+        $action = isset($this->parameters['action']) ? $this->parameters['action'] : null;
+        unset($this->parameters['action']);
 
-		if ($parameters !== null) {
+        $method = $request->getMethod();
 
-			$parameters = array_merge($this->parameters, (array)$parameters);
+        // Delete
+        if ($method === static::REQUEST_TYPE_DELETE && isset($this->parameters['id'])) {
+            return $this->call($this->methodNames['destroy']);
+        }
 
-			$action = isset($parameters['action']) ? $parameters['action'] : null;
-			unset($parameters['action']);
+        // Update
+        if (isset($this->parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false)) {
+            return $this->call($this->methodNames['update']);
+        }
 
-			$method = $request->getMethod();
+        // Edit
+        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id']) && strtolower($action) === 'edit') {
+            return $this->call($this->methodNames['edit']);
+        }
 
-			// Delete
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_DELETE) {
-				return $this->call('destroy', $parameters);
-			}
+        // Create
+        if ($method === static::REQUEST_TYPE_GET && strtolower($action) === 'create') {
+            return $this->call($this->methodNames['create']);
+        }
 
-			// Update
-			if (isset($parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT])) {
-				return $this->call('update', $parameters);
-			}
+        // Save
+        if ($method === static::REQUEST_TYPE_POST) {
+            return $this->call($this->methodNames['store']);
+        }
 
-			// Edit
-			if (isset($parameters['id']) && strtolower($action) === 'edit' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('edit', $parameters);
-			}
+        // Show
+        if ($method === static::REQUEST_TYPE_GET && isset($this->parameters['id'])) {
+            return $this->call($this->methodNames['show']);
+        }
 
-			// Create
-			if (strtolower($action) === 'create' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('create', $parameters);
-			}
+        // Index
+        return $this->call($this->methodNames['index']);
+    }
 
-			// Save
-			if ($method === static::REQUEST_TYPE_POST) {
-				return $this->call('store', $parameters);
-			}
+    /**
+     * @return string
+     */
+    public function getController()
+    {
+        return $this->controller;
+    }
 
-			// Show
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('show', $parameters);
-			}
+    /**
+     * @param string $controller
+     * @return static
+     */
+    public function setController($controller)
+    {
+        $this->controller = $controller;
 
-			// Index
-			return $this->call('index', $parameters);
-		}
+        return $this;
+    }
 
-		return null;
-	}
+    public function setName($name)
+    {
+        $this->name = $name;
 
-	/**
-	 * @return string
-	 */
-	public function getController()
-	{
-		return $this->controller;
-	}
+        $this->names = [
+            'index'   => $this->name . '.index',
+            'create'  => $this->name . '.create',
+            'store'   => $this->name . '.store',
+            'show'    => $this->name . '.show',
+            'edit'    => $this->name . '.edit',
+            'update'  => $this->name . '.update',
+            'destroy' => $this->name . '.destroy',
+        ];
 
-	/**
-	 * @param string $controller
-	 * @return static
-	 */
-	public function setController($controller)
-	{
-		$this->controller = $controller;
+        return $this;
+    }
 
-		return $this;
-	}
+    /**
+     * Define custom method name for resource controller
+     *
+     * @param array $names
+     * @return static $this
+     */
+    public function setMethodNames(array $names)
+    {
+        $this->methodNames = $names;
 
-	public function setName($name)
-	{
-		$this->name = $name;
+        return $this;
+    }
 
-		$this->names = [
-			'index'   => $this->name . '.index',
-			'create'  => $this->name . '.create',
-			'store'   => $this->name . '.store',
-			'show'    => $this->name . '.show',
-			'edit'    => $this->name . '.edit',
-			'update'  => $this->name . '.update',
-			'destroy' => $this->name . '.destroy',
-		];
+    /**
+     * Get method names
+     *
+     * @return array $this
+     */
+    public function getMethodNames()
+    {
+        return $this->methodNames;
+    }
 
-		return $this;
-	}
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, $merge = false)
+    {
+        if (isset($values['names'])) {
+            $this->names = $values['names'];
+        }
 
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @param bool $merge
-	 * @return static
-	 */
-	public function setSettings(array $values, $merge = false)
-	{
-		if (isset($values['names'])) {
-			$this->names = $values['names'];
-		}
+        if (isset($values['methods'])) {
+            $this->methodNames = $values['methods'];
+        }
 
-		parent::setSettings($values, $merge);
+        parent::setSettings($values, $merge);
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -5,45 +5,33 @@ use Pecee\Http\Request;
 
 class RouteUrl extends LoadableRoute
 {
-	public function __construct($url, $callback)
-	{
-		$this->setUrl($url);
-		$this->setCallback($callback);
-	}
+    public function __construct($url, $callback)
+    {
+        $this->setUrl($url);
+        $this->setCallback($callback);
+    }
 
-	public function matchRoute(Request $request)
-	{
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
+    public function matchRoute(Request $request)
+    {
+        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = rtrim($url, '/') . '/';
 
-		// Match on custom defined regular expression
-		if ($this->regex !== null) {
-			$parameters = [];
-			if (preg_match($this->regex, $request->getHost() . $url, $parameters)) {
-				/* Remove global match */
-				if(count($parameters) > 1) {
-					array_shift($parameters);
-					$this->parameters = $parameters;
-				}
+        /* Match global regular-expression for route */
+        $domainMatch = $this->matchRegex($request, $url);
+        if ($domainMatch !== null) {
+            return $domainMatch;
+        }
 
-				return true;
-			}
+        /* Make regular expression based on route */
+        $parameters = $this->parseParameters($this->url, $url);
+        if ($parameters === null) {
+            return false;
+        }
 
-			return null;
-		}
+        $this->setParameters($parameters);
 
-		// Make regular expression based on route
-		$route = rtrim($this->url, '/') . '/';
+        return true;
 
-		$parameters = $this->parseParameters($route, $url);
-
-		if ($parameters !== null) {
-			$this->parameters = array_merge($this->parameters, $parameters);
-
-			return true;
-		}
-
-		return null;
-	}
+    }
 
 }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -21,354 +21,355 @@ use Pecee\SimpleRouter\Route\RouteUrl;
 
 class SimpleRouter
 {
-	/**
-	 * Default namespace added to all routes
-	 * @var string
-	 */
-	protected static $defaultNamespace;
+    /**
+     * Default namespace added to all routes
+     * @var string
+     */
+    protected static $defaultNamespace;
 
-	/**
-	 * The response object
-	 * @var Response
-	 */
-	protected static $response;
+    /**
+     * The response object
+     * @var Response
+     */
+    protected static $response;
 
-	/**
-	 * Start/route request
-	 *
-	 * @throws HttpException
-	 * @throws NotFoundHttpException
-	 */
-	public static function start()
-	{
-		static::router()->routeRequest();
-	}
+    /**
+     * Start/route request
+     *
+     * @throws HttpException
+     * @throws NotFoundHttpException
+     */
+    public static function start()
+    {
+        static::router()->routeRequest();
+    }
 
-	/**
-	 * Set default namespace which will be prepended to all routes.
-	 *
-	 * @param string $defaultNamespace
-	 */
-	public static function setDefaultNamespace($defaultNamespace)
-	{
-		static::$defaultNamespace = $defaultNamespace;
-	}
+    /**
+     * Set default namespace which will be prepended to all routes.
+     *
+     * @param string $defaultNamespace
+     */
+    public static function setDefaultNamespace($defaultNamespace)
+    {
+        static::$defaultNamespace = $defaultNamespace;
+    }
 
-	/**
-	 * Base CSRF verifier
-	 *
-	 * @param BaseCsrfVerifier $baseCsrfVerifier
-	 */
-	public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
-	{
-		static::router()->setCsrfVerifier($baseCsrfVerifier);
-	}
+    /**
+     * Base CSRF verifier
+     *
+     * @param BaseCsrfVerifier $baseCsrfVerifier
+     */
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    {
+        static::router()->setCsrfVerifier($baseCsrfVerifier);
+    }
 
-	/**
-	 * Boot managers allows you to alter the routes before the routing occurs.
-	 * Perfect if you want to load pretty-urls from a file or database.
-	 *
-	 * @param IRouterBootManager $bootManager
-	 */
-	public static function addBootManager(IRouterBootManager $bootManager)
-	{
-		static::router()->addBootManager($bootManager);
-	}
+    /**
+     * Boot managers allows you to alter the routes before the routing occurs.
+     * Perfect if you want to load pretty-urls from a file or database.
+     *
+     * @param IRouterBootManager $bootManager
+     */
+    public static function addBootManager(IRouterBootManager $bootManager)
+    {
+        static::router()->addBootManager($bootManager);
+    }
 
-	/**
-	 * Route the given url to your callback on GET request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function get($url, $callback, array $settings = null)
-	{
-		return static::match(['get'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on GET request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function get($url, $callback, array $settings = null)
+    {
+        return static::match(['get'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Route the given url to your callback on POST request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function post($url, $callback, array $settings = null)
-	{
-		return static::match(['post'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on POST request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function post($url, $callback, array $settings = null)
+    {
+        return static::match(['post'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Route the given url to your callback on PUT request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function put($url, $callback, array $settings = null)
-	{
-		return static::match(['put'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on PUT request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function put($url, $callback, array $settings = null)
+    {
+        return static::match(['put'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Route the given url to your callback on PATCH request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function patch($url, $callback, array $settings = null)
-	{
-		return static::match(['patch'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on PATCH request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function patch($url, $callback, array $settings = null)
+    {
+        return static::match(['patch'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Route the given url to your callback on OPTIONS request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function options($url, $callback, array $settings = null)
-	{
-		return static::match(['options'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on OPTIONS request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function options($url, $callback, array $settings = null)
+    {
+        return static::match(['options'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Route the given url to your callback on DELETE request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function delete($url, $callback, array $settings = null)
-	{
-		return static::match(['delete'], $url, $callback, $settings);
-	}
+    /**
+     * Route the given url to your callback on DELETE request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function delete($url, $callback, array $settings = null)
+    {
+        return static::match(['delete'], $url, $callback, $settings);
+    }
 
-	/**
-	 * Groups allows for encapsulating routes with special settings.
-	 *
-	 * @param array $settings
-	 * @param \Closure $callback
-	 * @throws \InvalidArgumentException
-	 * @return RouteGroup
-	 */
-	public static function group(array $settings = [], \Closure $callback)
-	{
-		$group = new RouteGroup();
-		$group->setCallback($callback);
-		$group->setSettings($settings);
+    /**
+     * Groups allows for encapsulating routes with special settings.
+     *
+     * @param array $settings
+     * @param \Closure $callback
+     * @throws \InvalidArgumentException
+     * @return RouteGroup
+     */
+    public static function group(array $settings = [], \Closure $callback)
+    {
+        $group = new RouteGroup();
+        $group->setCallback($callback);
+        $group->setSettings($settings);
 
-		if (is_callable($callback) === false) {
-			throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
-		}
+        if (is_callable($callback) === false) {
+            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        }
 
-		static::router()->addRoute($group);
+        static::router()->addRoute($group);
 
-		return $group;
-	}
+        return $group;
+    }
 
-	/**
-	 * Alias for the form method
-	 *
-	 * @param string $url
-	 * @param callable $callback
-	 * @param array|null $settings
-	 * @see SimpleRouter::form
-	 * @return RouteUrl
-	 */
-	public static function basic($url, $callback, array $settings = null)
-	{
-		return static::match(['get', 'post'], $url, $callback, $settings);
-	}
+    /**
+     * Alias for the form method
+     *
+     * @param string $url
+     * @param callable $callback
+     * @param array|null $settings
+     * @see SimpleRouter::form
+     * @return RouteUrl
+     */
+    public static function basic($url, $callback, array $settings = null)
+    {
+        return static::match(['get', 'post'], $url, $callback, $settings);
+    }
 
-	/**
-	 * This type will route the given url to your callback on the provided request methods.
-	 * Route the given url to your callback on POST and GET request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @see SimpleRouter::form
-	 * @return RouteUrl
-	 */
-	public static function form($url, $callback, array $settings = null)
-	{
-		return static::match(['get', 'post'], $url, $callback, $settings);
-	}
+    /**
+     * This type will route the given url to your callback on the provided request methods.
+     * Route the given url to your callback on POST and GET request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @see SimpleRouter::form
+     * @return RouteUrl
+     */
+    public static function form($url, $callback, array $settings = null)
+    {
+        return static::match(['get', 'post'], $url, $callback, $settings);
+    }
 
-	/**
-	 * This type will route the given url to your callback on the provided request methods.
-	 *
-	 * @param array $requestMethods
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function match(array $requestMethods, $url, $callback, array $settings = null)
-	{
-		$route = new RouteUrl($url, $callback);
-		$route->setRequestMethods($requestMethods);
-		$route = static::addDefaultNamespace($route);
+    /**
+     * This type will route the given url to your callback on the provided request methods.
+     *
+     * @param array $requestMethods
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function match(array $requestMethods, $url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
+        $route->setRequestMethods($requestMethods);
+        $route = static::addDefaultNamespace($route);
 
-		if ($settings !== null) {
-			$route->setSettings($settings);
-		}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		static::router()->addRoute($route);
+        static::router()->addRoute($route);
 
-		return $route;
-	}
+        return $route;
+    }
 
-	/**
-	 * This type will route the given url to your callback and allow any type of request method
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouteUrl
-	 */
-	public static function all($url, $callback, array $settings = null)
-	{
-		$route = new RouteUrl($url, $callback);
-		$route = static::addDefaultNamespace($route);
+    /**
+     * This type will route the given url to your callback and allow any type of request method
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function all($url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
+        $route = static::addDefaultNamespace($route);
 
-		if ($settings !== null) {
-			$route->setSettings($settings);
-		}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		static::router()->addRoute($route);
+        static::router()->addRoute($route);
 
-		return $route;
-	}
+        return $route;
+    }
 
-	/**
-	 * This route will route request from the given url to the controller.
-	 *
-	 * @param string $url
-	 * @param string $controller
-	 * @param array|null $settings
-	 * @return RouteController
-	 */
-	public static function controller($url, $controller, array $settings = null)
-	{
-		$route = new RouteController($url, $controller);
-		$route = static::addDefaultNamespace($route);
+    /**
+     * This route will route request from the given url to the controller.
+     *
+     * @param string $url
+     * @param string $controller
+     * @param array|null $settings
+     * @return RouteController
+     */
+    public static function controller($url, $controller, array $settings = null)
+    {
+        $route = new RouteController($url, $controller);
+        $route = static::addDefaultNamespace($route);
 
-		if ($settings !== null) {
-			$route->setSettings($settings);
-		}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		static::router()->addRoute($route);
+        static::router()->addRoute($route);
 
-		return $route;
-	}
+        return $route;
+    }
 
-	/**
-	 * This type will route all REST-supported requests to different methods in the provided controller.
-	 *
-	 * @param string $url
-	 * @param string $controller
-	 * @param array|null $settings
-	 * @return RouteResource
-	 */
-	public static function resource($url, $controller, array $settings = null)
-	{
-		$route = new RouteResource($url, $controller);
+    /**
+     * This type will route all REST-supported requests to different methods in the provided controller.
+     *
+     * @param string $url
+     * @param string $controller
+     * @param array|null $settings
+     * @return RouteResource
+     */
+    public static function resource($url, $controller, array $settings = null)
+    {
+        $route = new RouteResource($url, $controller);
 
-		if ($settings !== null) {
-			$route->setSettings($settings);
-		}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		static::router()->addRoute($route);
+        static::router()->addRoute($route);
 
-		return $route;
-	}
+        return $route;
+    }
 
-	/**
-	 * Get url for a route by using either name/alias, class or method name.
-	 *
-	 * The name parameter supports the following values:
-	 * - Route name
-	 * - Controller/resource name (with or without method)
-	 * - Controller class name
-	 *
-	 * When searching for controller/resource by name, you can use this syntax "route.name@method".
-	 * You can also use the same syntax when searching for a specific controller-class "MyController@home".
-	 * If no arguments is specified, it will return the url for the current loaded route.
-	 *
-	 * @param string|null $name
-	 * @param string|array|null $parameters
-	 * @param array|null $getParams
-	 * @return string
-	 */
-	public static function getUrl($name = null, $parameters = null, $getParams = null)
-	{
-		return static::router()->getUrl($name, $parameters, $getParams);
-	}
+    /**
+     * Get url for a route by using either name/alias, class or method name.
+     *
+     * The name parameter supports the following values:
+     * - Route name
+     * - Controller/resource name (with or without method)
+     * - Controller class name
+     *
+     * When searching for controller/resource by name, you can use this syntax "route.name@method".
+     * You can also use the same syntax when searching for a specific controller-class "MyController@home".
+     * If no arguments is specified, it will return the url for the current loaded route.
+     *
+     * @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)
+    {
+        return static::router()->getUrl($name, $parameters, $getParams);
+    }
 
-	/**
-	 * Get the request
-	 *
-	 * @return \Pecee\Http\Request
-	 */
-	public static function request()
-	{
-		return static::router()->getRequest();
-	}
+    /**
+     * Get the request
+     *
+     * @return \Pecee\Http\Request
+     */
+    public static function request()
+    {
+        return static::router()->getRequest();
+    }
 
-	/**
-	 * Get the response object
-	 *
-	 * @return Response
-	 */
-	public static function response()
-	{
-		if (static::$response === null) {
-			static::$response = new Response(static::request());
-		}
+    /**
+     * Get the response object
+     *
+     * @return Response
+     */
+    public static function response()
+    {
+        if (static::$response === null) {
+            static::$response = new Response(static::request());
+        }
 
-		return static::$response;
-	}
+        return static::$response;
+    }
 
-	/**
-	 * Returns the router instance
-	 *
-	 * @return Router
-	 */
-	public static function router()
-	{
-		return Router::getInstance();
-	}
+    /**
+     * Returns the router instance
+     *
+     * @return Router
+     */
+    public static function router()
+    {
+        return Router::getInstance();
+    }
 
-	/**
-	 * Prepends the default namespace to all new routes added.
-	 *
-	 * @param IRoute $route
-	 * @return IRoute
-	 */
-	protected static function addDefaultNamespace(IRoute $route)
-	{
-		if (static::$defaultNamespace !== null) {
-			$namespace = static::$defaultNamespace;
+    /**
+     * Prepends the default namespace to all new routes added.
+     *
+     * @param IRoute $route
+     * @return IRoute
+     */
+    protected static function addDefaultNamespace(IRoute $route)
+    {
+        if (static::$defaultNamespace !== null) {
+            $namespace = static::$defaultNamespace;
 
-			if ($route->getNamespace() !== null) {
-				$namespace .= '\\' . $route->getNamespace();
-			}
+            if ($route->getNamespace() !== null) {
+                $namespace .= '\\' . $route->getNamespace();
+            }
 
-			$route->setDefaultNamespace($namespace);
-		}
+            $route->setDefaultNamespace($namespace);
+        }
 
-		return $route;
-	}
+        return $route;
+    }
 
 }

test/Dummy/Exceptions/ExceptionHandlerException.php

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

test/Dummy/Handler/ExceptionHandler.php

@@ -4,7 +4,7 @@ class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \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, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \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, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \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, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
+	{
+        echo 'ExceptionHandler 3 loaded' . chr(10);
+
+		throw new ExceptionHandlerException('All good!', 666);
+	}
+
+}

test/GroupTest.php

@@ -7,89 +7,89 @@ use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class GroupTest extends PHPUnit_Framework_TestCase
 {
-	protected $result;
+    protected $result;
 
-	public function testGroupLoad()
-	{
-		$this->result = false;
+    public function testGroupLoad()
+    {
+        $this->result = false;
 
-		SimpleRouter::group(['prefix' => '/group'], function () {
-			$this->result = true;
-		});
+        SimpleRouter::group(['prefix' => '/group'], function () {
+            $this->result = true;
+        });
 
-		try {
-			SimpleRouter::start();
-		} catch (Exception $e) {
-			// ignore RouteNotFound exception
-		}
+        try {
+            SimpleRouter::start();
+        } catch (Exception $e) {
+            // ignore RouteNotFound exception
+        }
 
-		$this->assertTrue($this->result);
-	}
+        $this->assertTrue($this->result);
+    }
 
-	public function testNestedGroup()
-	{
+    public function testNestedGroup()
+    {
 
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/api/v1/test');
-		SimpleRouter::request()->setMethod('get');
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/api/v1/test');
+        SimpleRouter::request()->setMethod('get');
 
-		SimpleRouter::group(['prefix' => '/api'], function () {
+        SimpleRouter::group(['prefix' => '/api'], function () {
 
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
+            SimpleRouter::group(['prefix' => '/v1'], function () {
+                SimpleRouter::get('/test', 'DummyController@start');
+            });
 
-		});
+        });
 
-		SimpleRouter::start();
-	}
+        SimpleRouter::start();
+    }
 
-	public function testManyRoutes()
-	{
+    public function testManyRoutes()
+    {
 
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/match');
-		SimpleRouter::request()->setMethod('get');
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/match');
+        SimpleRouter::request()->setMethod('get');
 
-		SimpleRouter::group(['prefix' => '/api'], function () {
+        SimpleRouter::group(['prefix' => '/api'], function () {
 
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
+            SimpleRouter::group(['prefix' => '/v1'], function () {
+                SimpleRouter::get('/test', 'DummyController@start');
+            });
 
-		});
+        });
 
-		SimpleRouter::get('/my/match', 'DummyController@start');
+        SimpleRouter::get('/my/match', 'DummyController@start');
 
-		SimpleRouter::group(['prefix' => '/service'], function () {
+        SimpleRouter::group(['prefix' => '/service'], function () {
 
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/no-match', 'DummyController@start');
-			});
+            SimpleRouter::group(['prefix' => '/v1'], function () {
+                SimpleRouter::get('/no-match', 'DummyController@start');
+            });
 
-		});
+        });
 
-		SimpleRouter::start();
-	}
+        SimpleRouter::start();
+    }
 
-	public function testUrls()
-	{
+    public function testUrls()
+    {
 
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/fancy/url/1');
-		SimpleRouter::request()->setMethod('get');
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/fancy/url/1');
+        SimpleRouter::request()->setMethod('get');
 
-		// Test array name
-		SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
+        // Test array name
+        SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
 
-		// Test method name
-		SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setName('fancy2');
+        // Test method name
+        SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setName('fancy2');
 
-		SimpleRouter::start();
+        SimpleRouter::start();
 
-		$this->assertEquals('/my/fancy/url/1/', SimpleRouter::getUrl('fancy1'));
-		$this->assertEquals('/my/fancy/url/2/', SimpleRouter::getUrl('fancy2'));
+        $this->assertEquals('/my/fancy/url/1/', SimpleRouter::getUrl('fancy1'));
+        $this->assertEquals('/my/fancy/url/2/', SimpleRouter::getUrl('fancy2'));
 
-	}
+    }
 
 }

test/MiddlewareTest.php

@@ -8,25 +8,34 @@ use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
-	public function testMiddlewareFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/my/test/url');
+    public function testMiddlewareFound()
+    {
+        $this->setExpectedException('MiddlewareLoadedException');
 
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
-		});
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/my/test/url');
 
-		$found = false;
+        SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+            SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+        });
 
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof MiddlewareLoadedException);
-		}
+        SimpleRouter::start();
+    }
 
-		$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,140 +2,171 @@
 
 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;
+    protected $result = false;
 
-	public function testNotFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
+    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;
+            if($param1 === 'param1' && $param2 === 'param2') {
+                $this->result = true;
+            }
 
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof NotFoundHttpException && $e->getCode() == 404);
-		}
+        });
 
-		$this->assertTrue($found);
-	}
+        SimpleRouter::start();
 
-	public function testGet()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('get');
+        $this->assertTrue($this->result);
 
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+    }
 
-	public function testPost()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
+    /**
+     * 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::post('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/test-param1-param2');
 
-	public function testPut()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('put');
+        SimpleRouter::group(['exceptionHandler' => ['TestExceptionHandlerFirst', 'TestExceptionHandlerSecond']], function () {
 
-		SimpleRouter::put('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+            SimpleRouter::group(['exceptionHandler' => 'TestExceptionHandlerThird'], function () {
 
-	public function testDelete()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('delete');
+                SimpleRouter::get('/non-existing-path', 'DummyController@start');
 
-		SimpleRouter::delete('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+            });
+        });
 
-	public function testMethodNotAllowed()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
+        SimpleRouter::start();
+    }
 
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
+    public function testGet()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/test/url');
+        SimpleRouter::request()->setMethod('get');
 
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$this->assertEquals(403, $e->getCode());
-		}
-	}
+        SimpleRouter::get('/my/test/url', 'DummyController@start');
+        SimpleRouter::start();
+    }
 
-	public function testSimpleParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1');
+    public function testPost()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/test/url');
+        SimpleRouter::request()->setMethod('post');
 
-		SimpleRouter::get('/test-{param1}', 'DummyController@param');
-		SimpleRouter::start();
-	}
+        SimpleRouter::post('/my/test/url', 'DummyController@start');
+        SimpleRouter::start();
+    }
 
-	public function testMultiParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
+    public function testPut()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/test/url');
+        SimpleRouter::request()->setMethod('put');
 
-		SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
-		SimpleRouter::start();
-	}
+        SimpleRouter::put('/my/test/url', 'DummyController@start');
+        SimpleRouter::start();
+    }
 
-	public function testPathParamRegex()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test/path/123123');
+    public function testDelete()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/test/url');
+        SimpleRouter::request()->setMethod('delete');
 
-		SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
-		SimpleRouter::start();
-	}
+        SimpleRouter::delete('/my/test/url', 'DummyController@start');
+        SimpleRouter::start();
+    }
 
-	public function testDomainRoute()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test');
-		SimpleRouter::request()->setHost('hello.world.com');
+    public function testMethodNotAllowed()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setUri('/my/test/url');
+        SimpleRouter::request()->setMethod('post');
 
-		$this->result = false;
+        SimpleRouter::get('/my/test/url', 'DummyController@start');
 
-		SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
-			SimpleRouter::get('/test', function ($subdomain = null) {
-				$this->result = ($subdomain === 'hello');
-			});
-		});
+        try {
+            SimpleRouter::start();
+        } catch (\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+    }
 
-		SimpleRouter::start();
+    public function testSimpleParam()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/test-param1');
 
-		$this->assertTrue($this->result);
+        SimpleRouter::get('/test-{param1}', 'DummyController@param');
+        SimpleRouter::start();
+    }
 
-	}
+    public function testPathParamRegex()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/test/path/123123');
+
+        SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
+        SimpleRouter::start();
+    }
+
+    public function testDomainRoute()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/test');
+        SimpleRouter::request()->setHost('hello.world.com');
+
+        $this->result = false;
+
+        SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            SimpleRouter::get('/test', function ($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });
+
+        SimpleRouter::start();
+
+        $this->assertTrue($this->result);
+
+    }
 
 }

test/RouterUrlTest.php

@@ -8,94 +8,107 @@ use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {
-	protected $result = false;
+    protected $result = false;
 
-	protected function getUrl($name = null, $parameters = null, array $getParams = []) {
-		return SimpleRouter::getUrl($name, $parameters, $getParams);
-	}
+    protected function getUrl($name = null, $parameters = null, array $getParams = [])
+    {
+        return SimpleRouter::getUrl($name, $parameters, $getParams);
+    }
 
-	public function testUrls()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/');
+    public function testUrls()
+    {
+        SimpleRouter::router()->reset();
+        SimpleRouter::request()->setMethod('get');
+        SimpleRouter::request()->setUri('/');
 
-		// Match normal route on alias
-		SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
+        // Match normal route on alias
+        SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
 
-		SimpleRouter::get('/about', 'DummyController@about');
+        SimpleRouter::get('/about', 'DummyController@about');
 
-		SimpleRouter::group(['prefix' => '/admin', 'as' => 'admin'], function() {
+        SimpleRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
 
-			// Match route with prefix on alias
-			SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'home']);
+            // Match route with prefix on alias
+            SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'home']);
 
-			// Match controller with prefix and alias
-			SimpleRouter::controller('/users', 'DummyController', ['as' => 'users']);
+            // Match controller with prefix and alias
+            SimpleRouter::controller('/users', 'DummyController', ['as' => 'users']);
 
-			// Match controller with prefix and NO alias
-			SimpleRouter::controller('/pages', 'DummyController');
+            // Match controller with prefix and NO alias
+            SimpleRouter::controller('/pages', 'DummyController');
 
-		});
+        });
 
-		SimpleRouter::group(['prefix' => 'api', 'as' => 'api'], function() {
+        SimpleRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
 
-			// Match resource controller
-			SimpleRouter::resource('phones', 'DummyController');
+            // Match resource controller
+            SimpleRouter::resource('phones', 'DummyController');
 
-		});
+        });
 
-		SimpleRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+        SimpleRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
 
-		// Match controller with no prefix and no alias
-		SimpleRouter::controller('/cats', 'CatsController');
+        // Match controller with no prefix and no alias
+        SimpleRouter::controller('/cats', 'CatsController');
 
-		// Pretend to load page
-		SimpleRouter::start();
+        // Pretend to load page
+        SimpleRouter::start();
 
-		$this->assertEquals('/gadgets/iphoneinfo/', $this->getUrl('gadgets.iphone'));
+        $this->assertEquals('/gadgets/iphoneinfo/', $this->getUrl('gadgets.iphone'));
 
-		$this->assertEquals('/api/phones/create/', $this->getUrl('api.phones.create'));
+        $this->assertEquals('/api/phones/create/', $this->getUrl('api.phones.create'));
 
-		// Should match /
-		$this->assertEquals('/', $this->getUrl('home'));
+        // Should match /
+        $this->assertEquals('/', $this->getUrl('home'));
 
-		// Should match /about/
-		$this->assertEquals('/about/', $this->getUrl('DummyController@about'));
+        // Should match /about/
+        $this->assertEquals('/about/', $this->getUrl('DummyController@about'));
 
-		// Should match /admin/
-		$this->assertEquals('/admin/', $this->getUrl('DummyController@start'));
+        // Should match /admin/
+        $this->assertEquals('/admin/', $this->getUrl('DummyController@start'));
 
-		// Should match /admin/
-		$this->assertEquals('/admin/', $this->getUrl('admin.home'));
+        // Should match /admin/
+        $this->assertEquals('/admin/', $this->getUrl('admin.home'));
 
-		// Should match /admin/2/
-		$this->assertEquals('/admin/2/', $this->getUrl('admin.home', ['id' => 2]));
+        // Should match /admin/2/
+        $this->assertEquals('/admin/2/', $this->getUrl('admin.home', ['id' => 2]));
 
-		// Should match /admin/users/
-		$this->assertEquals('/admin/users/', $this->getUrl('admin.users'));
+        // Should match /admin/users/
+        $this->assertEquals('/admin/users/', $this->getUrl('admin.users'));
 
-		// Should match /admin/users/home/
-		$this->assertEquals('/admin/users/home/', $this->getUrl('admin.users@home'));
+        // Should match /admin/users/home/
+        $this->assertEquals('/admin/users/home/', $this->getUrl('admin.users@home'));
 
-		// Should match /cats/
-		$this->assertEquals('/cats/', $this->getUrl('CatsController'));
+        // Should match /cats/
+        $this->assertEquals('/cats/', $this->getUrl('CatsController'));
 
-		// Should match /cats/view/
-		$this->assertEquals('/cats/view/', $this->getUrl('CatsController', 'view'));
+        // Should match /cats/view/
+        $this->assertEquals('/cats/view/', $this->getUrl('CatsController', 'view'));
 
-		// Should match /cats/view/
-		//$this->assertEquals('/cats/view/', $this->getUrl('CatsController', ['view']));
+        // Should match /cats/view/
+        //$this->assertEquals('/cats/view/', $this->getUrl('CatsController', ['view']));
 
-		// Should match /cats/view/666
-		$this->assertEquals('/cats/view/666/', $this->getUrl('CatsController@getView', ['666']));
+        // Should match /cats/view/666
+        $this->assertEquals('/cats/view/666/', $this->getUrl('CatsController@getView', ['666']));
 
-		// Should match /funny/man/
-		$this->assertEquals('/funny/man/', $this->getUrl('/funny/man'));
+        // Should match /funny/man/
+        $this->assertEquals('/funny/man/', $this->getUrl('/funny/man'));
 
-		// Should match /?jackdaniels=true&cola=yeah
-		$this->assertEquals('/?jackdaniels=true&cola=yeah', $this->getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+        // Should match /?jackdaniels=true&cola=yeah
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', $this->getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
 
-	}
+    }
+
+    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();
+
+    }
 
 }