Merge pull request #279 from skipperbent/v3-development

V3 development

.gitignore

@@ -1,4 +1,3 @@
 .idea
 composer.lock
-vendor/
+vendor/
-demo-project/vendor

composer.json

@@ -1,26 +1,35 @@
 {
- 	"name": "pecee/simple-router",
+  "name": "pecee/simple-router",
- 	"description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
+  "description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
- 	"keywords": [ "router", "routing", "laravel", "pecee" ],
+  "keywords": [
-	"license": "MIT",
+    "router",
-	"support": {
+    "router",
-			"source": "https://github.com/skipperbent/simple-php-router/issues"
+    "routing",
-    },
+    "route",
-	"authors": [
+    "simple-php-router",
-    	{
+    "laravel",
-        	 "name": "Simon Sessingø",
+    "pecee",
-           	 "email": "simon.sessingoe@gmail.com"
+    "php"
-        }
+  ],
-	],
+  "license": "MIT",
-	"require": {
+  "support": {
-		"php": ">=5.4.0"
+    "source": "https://github.com/skipperbent/simple-php-router/issues"
-    },
+  },
-    "require-dev": {
+  "authors": [
-        "phpunit/phpunit": "4.7.7"
+    {
-    },
+      "name": "Simon Sessingø",
-    "autoload": {
+      "email": "simon.sessingoe@gmail.com"
-        "psr-4": {
-            "Pecee\\": "src/Pecee/"
-        }
     }
+  ],
+  "require": {
+    "php": ">=5.4.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "4.7.7"
+  },
+  "autoload": {
+    "psr-4": {
+      "Pecee\\": "src/Pecee/"
+    }
+  }
 }

demo-project/README.md

@@ -1,100 +0,0 @@
-# Simple PHP router demo project
-
-This project is here to give you a basic understanding of how to setup and using simple-php-router.
-
-Please note that this demo-project only covers how to integrate the `simple-php-router` in a project without a framework. If you are using some sort of PHP framework in your project the implementation might vary.
-
-**What we won't cover:**
-
-- How to setup a solution that fits your need. This is a basic demo to help you get started.
-- Understanding of MVC; including Controllers, Middlewares or ExceptionHandlers.
-- How to integrate into third party frameworks.
-
-**What we cover:**
-
-- How to get up and running fast - from scratch.
-- How to get ExceptionHandlers, Middlewares and Controllers working.
-- How to setup your webservers.
-
-## Installation
-
-- Navigate to the `demo-project` folder in terminal and run `composer update` to install the latest version.
-- Point your webserver to `demo-project/public`.
-
-### Setting up Nginx
-
-If you are using Nginx please make sure that url-rewriting is enabled.
-
-You can easily enable url-rewriting by adding the following configuration for the Nginx configuration-file for the demo-project.
-
-```
-location / {
-    try_files $uri $uri/ /index.php?$query_string;
-}
-```
-
-### Setting up Apache
-
-Nothing special is required for Apache to work. We've include the `.htaccess` file in the `public` folder. If rewriting is not working for you, please check that the `mod_rewrite` module (htaccess support) is enabled in the Apache configuration.
-
-## Folder structure
-
-| Folder        | Description |
-| ------------- |-------------|
-| app            |Contains projects-specific PHP classes|
-| public         |Public folder which are accessible through the web.|
-
-## Notes
-
-The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality. 
-This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
-
-In this project we also use our custom router-class to autoload the `routes.php` file from our custom location (`app/routes.php`).
-
-Please check the `routes.php` file in `demo-project/app` for all the urls/rules available in the project.
-
-### CSRF-verifier
-
-For the purpose of this demo, we've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`. This will ensure that CSRF form-checks are not applied when calling our demo api url.
-
-### Exception handlers
-
-The included `CustomExceptionHandler` class returns a very basic json response for errors received on calls to `/api/*` or otherwise just a simple formatted error response.
-
-### Middlewares
-
-`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the `ApiController` class. We've added this class to demonstrate that you can use middlewares to ensure that the user has the correct authentication - before router loads the controller itself.
-
-### Urls
-
-Please see `routes.php` for all routes and rules.
-
-| URL        |
-| ------------- |
-| /             |
-| /api/demo       |
-| /companies       |
-| /companies/[id]  |
-| /contact         |
-
-## The MIT License (MIT)
-
-Copyright (c) 2016 Simon Sessingø / simple-php-router
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

demo-project/app/Controllers/ApiController.php

@@ -1,16 +0,0 @@
-<?php
-namespace Demo\Controllers;
-
-class ApiController
-{
-	public function index()
-	{
-		// The variable authenticated is set to true in the ApiVerification middleware class.
-		header('content-type: application/json');
-
-		echo json_encode([
-			'authenticated' => request()->authenticated
-		]);
-	}
-
-}

demo-project/app/Controllers/DefaultController.php

@@ -1,27 +0,0 @@
-<?php
-namespace Demo\Controllers;
-
-class DefaultController
-{
-	public function index()
-	{
-		// implement
-		echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
-	}
-
-	public function contact()
-	{
-		echo 'DefaultController -> contact';
-	}
-
-	public function companies($id = null)
-	{
-		echo 'DefaultController -> companies -> id: ' . $id;
-	}
-
-	public function notFound()
-	{
-		echo 'Page not found';
-	}
-
-}

demo-project/app/Handlers/CustomExceptionHandler.php

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

demo-project/app/Middlewares/ApiVerification.php

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

demo-project/app/Middlewares/CsrfVerifier.php

@@ -1,13 +0,0 @@
-<?php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\BaseCsrfVerifier;
-
-class CsrfVerifier extends BaseCsrfVerifier
-{
-	/**
-	 * CSRF validation will be ignored on the following urls.
-	 */
-	protected $except = ['/api/*'];
-
-}

demo-project/app/Router.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Custom router which handles default middlewares, default exceptions and things
- * that should be happen before and after the router is initialised.
- */
-namespace Demo;
-
-use Pecee\SimpleRouter\SimpleRouter;
-
-class Router extends SimpleRouter
-{
-	public static function start($defaultNamespace = null)
-	{
-		// Load our helpers
-		require_once 'helpers.php';
-
-		// Load our custom routes
-		require_once 'routes.php';
-
-		parent::setDefaultNamespace('\Demo');
-
-		// Do initial stuff
-		parent::start();
-	}
-
-}

demo-project/app/helpers.php

@@ -1,44 +0,0 @@
-<?php
-use Pecee\SimpleRouter\SimpleRouter;
-
-function url($controller, $parameters = null, $getParams = null)
-{
-	SimpleRouter::getUrl($controller, $parameters, $getParams);
-}
-
-/**
- * Get current csrf-token
- * @return null|string
- */
-function csrf_token()
-{
-	$token = new \Pecee\CsrfToken();
-	return $token->getToken();
-}
-
-/**
- * Get request object
- * @return \Pecee\Http\Request
- */
-function request()
-{
-	return SimpleRouter::request();
-}
-
-/**
- * Get response object
- * @return \Pecee\Http\Response
- */
-function response()
-{
-	return SimpleRouter::response();
-}
-
-/**
- * Get input class
- * @return \Pecee\Http\Input\Input
- */
-function input()
-{
-	return SimpleRouter::request()->getInput();
-}

demo-project/app/routes.php

@@ -1,25 +0,0 @@
-<?php
-/**
- * This file contains all the routes for the project
- */
-
-use Demo\Router;
-
-Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
-
-Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function () {
-
-	Router::get('/', 'DefaultController@index')->setName('home');
-
-	Router::get('/contact', 'DefaultController@contact')->setName('contact');
-
-	Router::get('/404', 'DefaultController@notFound')->setName('404');
-
-	Router::basic('/companies/{id?}', 'DefaultController@companies')->setName('companies');
-
-	// Api
-	Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function () {
-		Router::resource('/demo', 'ApiController');
-	});
-
-});

demo-project/composer.json

@@ -1,26 +0,0 @@
-{
- 	"name": "pecee/simple-router-demo",
- 	"description": "Simple router demo project",
- 	"keywords": [
-		"simple-router",
-		"php",
-		"php-simple-router"
-	],
-	"license": "MIT",
-	"type": "project",
-	"require": {
-		"php": ">=5.4.0",
-		"pecee/simple-router": "2.*"
-	},
-	"require-dev": {
-
-	},
-	"config": {
-		"preferred-install": "dist"
-	},
-    "autoload": {
-      "psr-4": {
-        "Demo\\": "app/"
-      }
-    }
-}

demo-project/public/.htaccess

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

demo-project/public/index.php

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

helpers.php

@@ -0,0 +1,66 @@
+<?php
+
+use Pecee\SimpleRouter\SimpleRouter as Router;
+
+/**
+ * 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
+ */
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return Router::getUrl($name, $parameters, $getParams);
+}
+
+/**
+ * @return \Pecee\Http\Response
+ */
+function response()
+{
+    return Router::response();
+}
+
+/**
+ * @return \Pecee\Http\Request
+ */
+function request()
+{
+    return Router::request();
+}
+
+/**
+ * Get input class
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param string|array|null $methods Default method
+ * @return \Pecee\Http\Input\Input|string
+ */
+function input($index = null, $defaultValue = null, $methods = null)
+{
+    if ($index !== null) {
+        return request()->getInput()->get($index, $defaultValue, $methods);
+    }
+
+    return request()->getInput();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
+}

src/Pecee/Controllers/IResourceController.php

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

src/Pecee/Controllers/IRestController.php

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

src/Pecee/CsrfToken.php

@@ -3,66 +3,77 @@ namespace Pecee;
 
 class CsrfToken
 {
-	const CSRF_KEY = 'XSRF-TOKEN';
+    const CSRF_KEY = 'CSRF-TOKEN';
 
-	protected $token;
+    protected $token;
 
-	/**
+    /**
-	 * Generate random identifier for CSRF token
+     * Generate random identifier for CSRF token
-	 *
+     *
-	 * @return string
+     * @throws \RuntimeException
-	 */
+     * @return string
-	public static function generateToken()
+     */
-	{
+    public static function generateToken()
-		if (function_exists('mcrypt_create_iv')) {
+    {
-			return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
+        if (function_exists('random_bytes')) {
-		}
+            return bin2hex(random_bytes(32));
-		return bin2hex(openssl_random_pseudo_bytes(32));
+        }
-	}
 
-	/**
+        $isSourceStrong = false;
-	 * 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;
-	}
 
-	/**
+        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
-	 * Set csrf token cookie
+        if ($isSourceStrong === false || $random === false) {
-	 *
+            throw new \RuntimeException('IV generation failed');
-	 * @param $token
+        }
-	 */
-	public function setToken($token)
-	{
-		setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
-	}
 
-	/**
+        return $random;
-	 * 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
+     * Validate valid CSRF token
-	 * @return bool
+     *
-	 */
+     * @param string $token
-	public function hasToken()
+     * @return bool
-	{
+     */
-		return isset($_COOKIE[static::CSRF_KEY]);
+    public function validate($token)
-	}
+    {
+        if ($token !== null && $this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
+
+        return false;
+    }
+
+    /**
+     * 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() === true) {
+            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/CallbackExceptionHandler.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Pecee\Handlers;
+
+use Pecee\Http\Request;
+
+/**
+ * Class CallbackExceptionHandler
+ *
+ * Class is used to create callbacks which are fired when an exception is reached.
+ * This allows for easy handling 404-exception etc. without creating an custom ExceptionHandler.
+ *
+ * @package Pecee\Handlers
+ */
+class CallbackExceptionHandler implements IExceptionHandler
+{
+
+    protected $callback;
+
+    public function __construct(\Closure $callback)
+    {
+        $this->callback = $callback;
+    }
+
+    /**
+     * @param Request $request
+     * @param \Exception $error
+     * @return Request|null
+     */
+    public function handleError(Request $request, \Exception $error)
+    {
+        /* Fire exceptions */
+        return call_user_func($this->callback,
+            $request,
+            $error
+        );
+    }
+}

src/Pecee/Handlers/IExceptionHandler.php

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

src/Pecee/Http/Input/IInputItem.php

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

src/Pecee/Http/Input/Input.php

@@ -5,207 +5,285 @@ use Pecee\Http\Request;
 
 class Input
 {
-	/**
+    /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
-	 */
+     */
-	public $get;
+    public $get = [];
 
-	/**
+    /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
-	 */
+     */
-	public $post;
+    public $post = [];
 
-	/**
+    /**
-	 * @var \Pecee\Http\Input\InputCollection
+     * @var array
-	 */
+     */
-	public $file;
+    public $file = [];
 
-	/**
+    /**
-	 * @var Request
+     * @var Request
-	 */
+     */
-	protected $request;
+    protected $request;
 
-	public function __construct(Request $request)
+    public function __construct(Request $request)
-	{
+    {
-		$this->request = $request;
+        $this->request = $request;
-		$this->setGet();
-		$this->setPost();
-		$this->setFile();
-	}
 
-	/**
+        $this->parseInputs();
-	 * Get all get/post items
+    }
-	 * @param array|null $filter Only take items in filter
-	 * @return array
-	 */
-	public function all(array $filter = null)
-	{
-		$output = $_POST;
 
-		if ($this->request->getMethod() === 'post') {
+    public function parseInputs()
+    {
+        /* Parse get requests */
+        if (count($_GET) > 0) {
+            $this->get = $this->handleGetPost($_GET);
+        }
 
-			$contents = file_get_contents('php://input');
+        /* Parse post requests */
+        $postVars = $_POST;
 
-			if (stripos(trim($contents), '{') === 0) {
+        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
-				$output = json_decode($contents, true);
+            parse_str(file_get_contents('php://input'), $postVars);
-				if ($output === false) {
+        }
-					$output = array();
-				}
-			}
-		}
 
-		$output = array_merge($_GET, $output);
+        if (count($postVars) > 0) {
+            $this->post = $this->handleGetPost($postVars);
+        }
 
-		if ($filter !== null) {
+        /* Parse get requests */
-			$output = array_filter($output, function ($key) use ($filter) {
+        if (count($_FILES) > 0) {
-				if (in_array($key, $filter)) {
+            $this->file = $this->parseFiles();
-					return true;
+        }
-				}
+    }
 
-				return false;
+    public function parseFiles()
-			}, ARRAY_FILTER_USE_KEY);
+    {
-		}
+        $list = [];
 
-		return $output;
+        foreach ((array)$_FILES as $key => $value) {
-	}
 
-	public function getObject($index, $default = null)
+            // Handle array input
-	{
+            if (is_array($value['name']) === false) {
-		$key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[') + 1, strpos($index, ']') - strlen($index)) : null;
+                $values['index'] = $key;
-		$index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
+                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
+                continue;
+            }
 
-		$element = $this->get->findFirst($index);
+            $keys = [];
 
-		if ($element !== null) {
+            $files = $this->rearrangeFiles($value['name'], $keys, $value);
-			return ($key !== null) ? $element[$key] : $element;
-		}
 
-		if ($this->request->getMethod() !== 'get') {
+            if (isset($list[$key])) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
 
-			$element = $this->post->findFirst($index);
+        }
-			if ($element !== null) {
-				return ($key !== null) ? $element[$key] : $element;
-			}
 
-			$element = $this->file->findFirst($index);
+        return $list;
-			if ($element !== null) {
+    }
-				return ($key !== null) ? $element[$key] : $element;
-			}
-		}
 
-		return $default;
+    protected function rearrangeFiles(array $values, &$index, $original)
-	}
+    {
 
-	/**
+        $output = [];
-	 * Get input element value matching index
-	 * @param string $index
-	 * @param string|null $default
-	 * @return string|null
-	 */
-	public function get($index, $default = null)
-	{
-		$item = $this->getObject($index);
 
-		if ($item !== null) {
+        $getItem = function ($key, $property = 'name') use ($original, $index) {
 
-			if ($item instanceof InputCollection || $item instanceof InputFile) {
+            $path = $original[$property];
-				return $item;
-			}
 
-			return (trim($item->getValue()) === '') ? $default : $item->getValue();
+            $fileValues = array_values($index);
-		}
 
-		return $default;
+            foreach ($fileValues as $i) {
-	}
+                $path = $path[$i];
+            }
 
-	public function exists($index)
+            return $path[$key];
-	{
+        };
-		return ($this->getObject($index) !== null);
-	}
 
-	public function setGet()
+        foreach ($values as $key => $value) {
-	{
-		$this->get = new InputCollection();
 
-		if (count($_GET) > 0) {
+            if (is_array($getItem($key)) === false) {
-			foreach ($_GET as $key => $get) {
-				if (is_array($get) === false) {
-					$this->get->{$key} = new InputItem($key, $get);
-					continue;
-				}
 
-				$output = new InputCollection();
+                $file = InputFile::createFromArray([
+                    'index'    => $key,
+                    'filename' => $getItem($key),
+                    'error'    => $getItem($key, 'error'),
+                    'tmp_name' => $getItem($key, 'tmp_name'),
+                    'type'     => $getItem($key, 'type'),
+                    'size'     => $getItem($key, 'size'),
+                ]);
 
-				foreach ($get as $k => $g) {
+                if (isset($output[$key])) {
-					$output->{$k} = new InputItem($k, $g);
+                    $output[$key][] = $file;
-				}
+                } else {
+                    $output[$key] = $file;
+                }
 
-				$this->get->{$key} = $output;
+                continue;
-			}
+            }
-		}
-	}
 
-	public function setPost()
+            $index[] = $key;
-	{
-		$this->post = new InputCollection();
 
-		$postVars = $_POST;
+            $files = $this->rearrangeFiles($value, $index, $original);
 
-		if (in_array($this->request->getMethod(), ['put', 'patch', 'delete']) === true) {
+            if (isset($output[$key])) {
-			parse_str(file_get_contents('php://input'), $postVars);
+                $output[$key][] = $files;
-		}
+            } else {
+                $output[$key] = $files;
+            }
 
-		if (count($postVars) > 0) {
+        }
 
-			foreach ($postVars as $key => $post) {
+        return $output;
-				if (is_array($post) === false) {
+    }
-					$this->post->{strtolower($key)} = new InputItem($key, $post);
-					continue;
-				}
 
-				$output = new InputCollection();
+    protected function handleGetPost(array $array)
+    {
+        $list = [];
 
-				foreach ($post as $k => $p) {
+        $max = count($array) - 1;
-					$output->{$k} = new InputItem($k, $p);
+        $keys = array_keys($array);
-				}
 
-				$this->post->{strtolower($key)} = $output;
+        for ($i = $max; $i >= 0; $i--) {
-			}
-		}
-	}
 
-	public function setFile()
+            $key = $keys[$i];
-	{
+            $value = $array[$key];
-		$this->file = new InputCollection();
 
-		if (count($_FILES) > 0) {
+            // Handle array input
-			foreach ($_FILES as $key => $values) {
+            if (is_array($value) === false) {
+                $list[$key] = new InputItem($key, $value);
+                continue;
+            }
 
-				// Handle array input
+            $output = $this->handleGetPost($value);
-				if (is_array($values['name']) === false && trim($values['error']) !== '4') {
-					$values['index'] = $key;
-					$this->file->{strtolower($key)} = InputFile::createFromArray($values);
-					continue;
-				}
 
-				$output = new InputCollection();
+            $list[$key] = $output;
+        }
 
-				foreach ($values['name'] as $k => $val) {
+        return $list;
-					if (trim($val['error'][$k]) !== '4') {
+    }
-						$output->{$k} = InputFile::createFromArray([
-							'index' => $k,
-							'error' => $val['error'][$k],
-							'tmp_name' => $val['tmp_name'][$k],
-							'type' => $val['type'][$k],
-							'size' => $val['size'][$k],
-							'name' => $val['name'][$k]
-						]);
-					}
-				}
 
-				$this->file->{strtolower($key)} = $output;
+    /**
-			}
+     * Find post-value by index or return default value.
-		}
+     *
-	}
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findPost($index, $defaultValue = null)
+    {
+        return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
+    }
+
+    /**
+     * Find file by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputFile|string
+     */
+    public function findFile($index, $defaultValue = null)
+    {
+        return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
+    }
+
+    /**
+     * Find parameter/query-string by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findGet($index, $defaultValue = null)
+    {
+        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
+    }
+
+    /**
+     * Get input object
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
+     * @return IInputItem|string
+     */
+    public function getObject($index, $defaultValue = null, $methods = null)
+    {
+        if ($methods !== null && is_string($methods) === true) {
+            $methods = [$methods];
+        }
+
+        $element = null;
+
+        if ($methods === null || in_array('get', $methods)) {
+            $element = $this->findGet($index);
+        }
+
+        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
+            $element = $this->findPost($index);
+        }
+
+        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
+            $element = $this->findFile($index);
+        }
+
+        return ($element !== null) ? $element : $defaultValue;
+    }
+
+    /**
+     * Get input element value matching index
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
+     * @return InputItem|string
+     */
+    public function get($index, $defaultValue = null, $methods = null)
+    {
+        $input = $this->getObject($index, $defaultValue, $methods);
+
+        if ($input instanceof InputItem) {
+            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
+        }
+
+        return $input;
+    }
+
+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @return bool
+     */
+    public function exists($index)
+    {
+        return ($this->getObject($index) !== null);
+    }
+
+    /**
+     * Get all get/post items
+     * @param array|null $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = null)
+    {
+        $output = $_POST;
+
+        if ($this->request->getMethod() === 'post') {
+
+            $contents = file_get_contents('php://input');
+
+            if (strpos(trim($contents), '{') === 0) {
+                $output = json_decode($contents, true);
+                if ($output === false) {
+                    $output = [];
+                }
+            }
+        }
+
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output);
+    }
 
 }

src/Pecee/Http/Input/InputCollection.php

@@ -1,94 +0,0 @@
-<?php
-namespace Pecee\Http\Input;
-
-class InputCollection implements \IteratorAggregate
-{
-	protected $data = array();
-
-	/**
-	 * Search for input element matching index.
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return InputItem|mixed
-	 */
-	public function findFirst($index, $default = null)
-	{
-		if (count($this->data) > 0) {
-
-			if (isset($this->data[$index])) {
-				return $this->data[$index];
-			}
-
-			foreach ($this->data as $key => $input) {
-				if (strtolower($index) === strtolower($key)) {
-					return $input;
-				}
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Get input element value matching index
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return string|null
-	 */
-	public function get($index, $default = null)
-	{
-		$input = $this->findFirst($index);
-
-		if($input !== null && trim($input->getValue()) !== '') {
-			return $input->getValue();
-		}
-
-		return $default;
-	}
-
-	public function getValue($index, $default = null) {
-
-	}
-
-	/**
-	 * @param string $index
-	 * @throws \InvalidArgumentException
-	 * @return InputItem
-	 */
-	public function __get($index)
-	{
-		$item = $this->findFirst($index);
-		// Ensure that item are always available
-		if ($item === null) {
-			$this->data[$index] = new InputItem($index, null);
-			return $this->data[$index];
-		}
-
-		return $item;
-	}
-
-	public function __set($index, $value)
-	{
-		$this->data[$index] = $value;
-	}
-
-	public function getData()
-	{
-		return $this->data;
-	}
-
-	/**
-	 * Retrieve an external iterator
-	 * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
-	 * @return \Traversable An instance of an object implementing <b>Iterator</b> or
-	 * <b>Traversable</b>
-	 * @since 5.0.0
-	 */
-	public function getIterator()
-	{
-		return new \ArrayIterator($this->data);
-	}
-
-}

src/Pecee/Http/Input/InputFile.php

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

src/Pecee/Http/Input/InputItem.php

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

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

src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php

@@ -1,5 +1,5 @@
 <?php
-namespace Pecee\Exceptions;
+namespace Pecee\Http\Middleware\Exceptions;
 
 class TokenMismatchException extends \Exception
 {

src/Pecee/Http/Middleware/IMiddleware.php

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

src/Pecee/Http/Request.php

@@ -2,205 +2,355 @@
 namespace Pecee\Http;
 
 use Pecee\Http\Input\Input;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
-	protected $data = array();
+    private $data = [];
-	protected $headers;
+    protected $headers;
-	protected $host;
+    protected $host;
-	protected $uri;
+    protected $uri;
-	protected $method;
+    protected $method;
-	protected $input;
+    protected $input;
 
-	public function __construct()
+    /**
-	{
+     * @var ILoadableRoute|null
-		$this->parseHeaders();
+     */
-		$this->input = new Input($this);
+    protected $rewriteRoute;
-		$this->host = $this->getHeader('http-host');;
+    protected $rewriteUrl;
-		$this->uri = $this->getHeader('request-uri');
-		$this->method = strtolower($this->input->post->findFirst('_method', $this->getHeader('request-method')));
-	}
 
-	protected function parseHeaders()
+    /**
-	{
+     * @var ILoadableRoute|null
-		$this->headers = array();
+     */
+    protected $loadedRoute;
 
-		foreach ($_SERVER as $name => $value) {
+    public function __construct()
-			$this->headers[strtolower($name)] = $value;
+    {
-			$this->headers[strtolower(str_replace('_', '-', $name))] = $value;
+        $this->parseHeaders();
-		}
+        $this->setHost($this->getHeader('http-host'));
-	}
 
-	public function isSecure()
+        // Check if special IIS header exist, otherwise use default.
-	{
+        $this->setUri(new Uri($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
-		if ($this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443) {
-			return true;
-		}
 
-		return false;
+        $this->input = new Input($this);
-	}
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
+    }
 
-	/**
+    protected function parseHeaders()
-	 * @return string
+    {
-	 */
+        $this->headers = [];
-	public function getUri()
-	{
-		return $this->uri;
-	}
 
-	/**
+        $max = count($_SERVER) - 1;
-	 * @return string
+        $keys = array_keys($_SERVER);
-	 */
-	public function getHost()
-	{
-		return $this->host;
-	}
 
-	/**
+        for ($i = $max; $i >= 0; $i--) {
-	 * @return string
+            $key = $keys[$i];
-	 */
+            $value = $_SERVER[$key];
-	public function getMethod()
-	{
-		return $this->method;
-	}
 
-	/**
+            $this->headers[strtolower($key)] = $value;
-	 * Get http basic auth user
+            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
-	 * @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');
-	}
 
-	/**
+    public function isSecure()
-	 * Get all headers
+    {
-	 * @return array
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
-	 */
+    }
-	public function getHeaders()
-	{
-		return $this->headers;
-	}
 
-	/**
+    /**
-	 * Get id address
+     * @return Uri
-	 * @return string
+     */
-	 */
+    public function getUri()
-	public function getIp()
+    {
-	{
+        return $this->uri;
-		if ($this->getHeader('http-cf-connecting-ip') !== null) {
+    }
-			return $this->getHeader('http-cf-connecting-ip');
-		}
 
-		if ($this->getHeader('http-x-forwarded-for') !== null && strlen($this->getHeader('http-x-forwarded-for'))) {
+    /**
-			return $this->getHeader('http-x-forwarded_for');
+     * @return string
-		}
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
 
-		return $this->getHeader('remote-addr');
+    /**
-	}
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
 
-	/**
+    /**
-	 * Get referer
+     * Get http basic auth user
-	 * @return string
+     * @return string|null
-	 */
+     */
-	public function getReferer()
+    public function getUser()
-	{
+    {
-		return $this->getHeader('http-referer');
+        return $this->getHeader('php-auth-user');
-	}
+    }
 
-	/**
+    /**
-	 * Get user agent
+     * Get http basic auth password
-	 * @return string
+     * @return string|null
-	 */
+     */
-	public function getUserAgent()
+    public function getPassword()
-	{
+    {
-		return $this->getHeader('http-user-agent');
+        return $this->getHeader('php-auth-pw');
-	}
+    }
 
-	/**
+    /**
-	 * Get header value by name
+     * Get all headers
-	 *
+     * @return array
-	 * @param string $name
+     */
-	 * @param object|null $defaultValue
+    public function getHeaders()
-	 *
+    {
-	 * @return string|null
+        return $this->headers;
-	 */
+    }
-	public function getHeader($name, $defaultValue = null)
-	{
-		return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
-	}
 
-	/**
+    /**
-	 * Get input class
+     * Get id address
-	 * @return Input
+     * @return string
-	 */
+     */
-	public function getInput()
+    public function getIp()
-	{
+    {
-		return $this->input;
+        if ($this->getHeader('http-cf-connecting-ip') !== null) {
-	}
+            return $this->getHeader('http-cf-connecting-ip');
+        }
 
-	/**
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
-	 * Is format accepted
+            return $this->getHeader('http-x-forwarded_for');
-	 *
+        }
-	 * @param string $format
-	 *
-	 * @return bool
-	 */
-	public function isFormatAccepted($format)
-	{
-		return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
-	}
 
-	/**
+        return $this->getHeader('remote-addr');
-	 * Get accept formats
+    }
-	 * @return array
-	 */
-	public function getAcceptFormats()
-	{
-		return explode(',', $this->getHeader('http-accept'));
-	}
 
-	/**
+    /**
-	 * @param string $uri
+     * Get remote address/ip
-	 */
+     *
-	public function setUri($uri)
+     * @alias static::getIp
-	{
+     * @return string
-		$this->uri = $uri;
+     */
-	}
+    public function getRemoteAddr()
+    {
+        return $this->getIp();
+    }
 
-	/**
+    /**
-	 * @param string $host
+     * Get referer
-	 */
+     * @return string
-	public function setHost($host)
+     */
-	{
+    public function getReferer()
-		$this->host = $host;
+    {
-	}
+        return $this->getHeader('http-referer');
+    }
 
-	/**
+    /**
-	 * @param string $method
+     * Get user agent
-	 */
+     * @return string
-	public function setMethod($method)
+     */
-	{
+    public function getUserAgent()
-		$this->method = $method;
+    {
-	}
+        return $this->getHeader('http-user-agent');
+    }
 
-	public function __set($name, $value = null)
+    /**
-	{
+     * Get header value by name
-		$this->data[$name] = $value;
+     *
-	}
+     * @param string $name
+     * @param string|null $defaultValue
+     *
+     * @return string|null
+     */
+    public function getHeader($name, $defaultValue = null)
+    {
+        if (array_key_exists(strtolower($name), $this->headers) === true) {
+            return $this->headers[strtolower($name)];
+        }
 
-	public function __get($name)
+        $max = count($_SERVER) - 1;
-	{
+        $keys = array_keys($_SERVER);
-		return isset($this->data[$name]) ? $this->data[$name] : null;
+
-	}
+        for ($i = $max; $i >= 0; $i--) {
+
+            $key = $keys[$i];
+            $name = $_SERVER[$key];
+
+            if ($key === $name) {
+                return $name;
+            }
+        }
+
+        return $defaultValue;
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Get accept formats
+     * @return array
+     */
+    public function getAcceptFormats()
+    {
+        return explode(',', $this->getHeader('http-accept'));
+    }
+
+    /**
+     * @param Uri $uri
+     */
+    public function setUri(Uri $uri)
+    {
+        $this->uri = $uri;
+    }
+
+    /**
+     * @param string $host
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+    }
+
+    /**
+     * @param string $method
+     */
+    public function setMethod($method)
+    {
+        $this->method = $method;
+    }
+
+    /**
+     * Set rewrite route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setRewriteRoute(ILoadableRoute $route)
+    {
+        $this->rewriteRoute = $route;
+
+        $callback = $route->getCallback();
+
+        /* Only add default namespace on relative callbacks */
+        if ($callback === null || $callback[0] !== '\\') {
+
+            $namespace = SimpleRouter::getDefaultNamespace();
+
+            if ($namespace !== null) {
+
+                if ($this->rewriteRoute->getNamespace() !== null) {
+                    $namespace .= '\\' . $this->rewriteRoute->getNamespace();
+                }
+
+                $this->rewriteRoute->setDefaultNamespace($namespace);
+
+            }
+
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get rewrite route
+     *
+     * @return ILoadableRoute|null
+     */
+    public function getRewriteRoute()
+    {
+        return $this->rewriteRoute;
+    }
+
+    /**
+     * Get rewrite url
+     *
+     * @return string
+     */
+    public function getRewriteUrl()
+    {
+        return $this->rewriteUrl;
+    }
+
+    /**
+     * Set rewrite url
+     *
+     * @param string $rewriteUrl
+     * @return static
+     */
+    public function setRewriteUrl($rewriteUrl)
+    {
+        $this->rewriteUrl = $rewriteUrl;
+
+        return $this;
+    }
+
+    /**
+     * Set rewrite callback
+     * @param string $callback
+     * @return static
+     */
+    public function setRewriteCallback($callback)
+    {
+        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+    }
+
+    /**
+     * Get loaded route
+     * @return ILoadableRoute|null
+     */
+    public function getLoadedRoute()
+    {
+        return $this->loadedRoute;
+    }
+
+    /**
+     * Set loaded route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setLoadedRoute(ILoadableRoute $route)
+    {
+        $this->loadedRoute = $route;
+
+        return $this;
+    }
+
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->data);
+    }
+
+    public function __set($name, $value = null)
+    {
+        $this->data[$name] = $value;
+    }
+
+    public function __get($name)
+    {
+        return isset($this->data[$name]) ? $this->data[$name] : null;
+    }
 
 }

src/Pecee/Http/Response.php

@@ -3,116 +3,119 @@ namespace Pecee\Http;
 
 class Response
 {
-	protected $request;
+    protected $request;
 
-	public function __construct(Request $request)
+    public function __construct(Request $request)
-	{
+    {
-		$this->request = $request;
+        $this->request = $request;
-	}
+    }
 
-	/**
+    /**
-	 * Set the http status code
+     * Set the http status code
-	 *
+     *
-	 * @param int $code
+     * @param int $code
-	 * @return static
+     * @return static
-	 */
+     */
-	public function httpCode($code)
+    public function httpCode($code)
-	{
+    {
-		http_response_code($code);
+        http_response_code($code);
-		return $this;
-	}
 
-	/**
+        return $this;
-	 * Redirect the response
+    }
-	 *
-	 * @param string $url
-	 * @param int $httpCode
-	 */
-	public function redirect($url, $httpCode = null)
-	{
-		if ($httpCode !== null) {
-			$this->httpCode($httpCode);
-		}
 
-		$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->header('location: ' . $url);
-	{
+        die();
-		$this->redirect($this->request->getUri());
+    }
-	}
 
-	/**
+    public function refresh()
-	 * Add http authorisation
+    {
-	 * @param string $name
+        $this->redirect($this->request->getUri()->getPath());
-	 * @return static
+    }
-	 */
-	public function auth($name = '')
-	{
-		$this->headers([
-			'WWW-Authenticate: Basic realm="' . $name . '"',
-			'HTTP/1.0 401 Unauthorized'
-		]);
-		return $this;
-	}
 
-	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([
+        return $this;
-			'Cache-Control: public',
+    }
-			'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
-			'Etag: ' . $eTag
-		]);
 
-		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $lastModified ||
+    public function cache($eTag, $lastModified = 2592000)
-			isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $eTag
+    {
-		) {
 
-			$this->headers([
+        $this->headers([
-				'HTTP/1.1 304 Not Modified'
+            'Cache-Control: public',
-			]);
+            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',
+            'Etag: ' . $eTag,
+        ]);
 
-			exit();
+        $httpModified = $this->request->getHeader('http-if-modified-since');
-		}
+        $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
 
-		return $this;
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
-	}
 
-	/**
+            $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
+    /**
-	 */
+     * Json encode array
-	public function headers(array $headers)
+     * @param array $value
-	{
+     */
-		foreach ($headers as $header) {
+    public function json(array $value)
-			header($header);
+    {
-		}
+        $this->header('Content-Type: application/json');
-		return $this;
+        echo json_encode($value);
-	}
+        die();
+    }
+
+    /**
+     * 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/Http/Uri.php

@@ -0,0 +1,172 @@
+<?php
+
+namespace Pecee\Http;
+
+class Uri
+{
+    private $originalUrl;
+    private $data = [
+        'scheme',
+        'host',
+        'port',
+        'user',
+        'pass',
+        'path',
+        'query',
+        'fragment',
+    ];
+
+    public function __construct($url)
+    {
+        $this->originalUrl = $url;
+        $this->data = array_merge($this->data, $this->parseUrl($url));
+
+        if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
+            $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+        }
+
+    }
+
+    /**
+     * Check if url is using a secure protocol like https
+     * @return bool
+     */
+    public function isSecure()
+    {
+        return (strtolower($this->getScheme()) === 'https');
+    }
+
+    /**
+     * Checks if url is relative
+     * @return bool
+     */
+    public function isRelative()
+    {
+        return ($this->getHost() === null);
+    }
+
+    /**
+     * Get url scheme
+     * @return string|null
+     */
+    public function getScheme()
+    {
+        return $this->data['scheme'];
+    }
+
+    /**
+     * Get url host
+     * @return string|null
+     */
+    public function getHost()
+    {
+        return $this->data['host'];
+    }
+
+    /**
+     * Get url port
+     * @return int|null
+     */
+    public function getPort()
+    {
+        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
+    }
+
+    /**
+     * Parse username from url
+     * @return string|null
+     */
+    public function getUserName()
+    {
+        return $this->data['user'];
+    }
+
+    /**
+     * Parse password from url
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return $this->data['pass'];
+    }
+
+    /**
+     * Get path from url
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->data['path'];
+    }
+
+    /**
+     * Get querystring from url
+     * @return string|null
+     */
+    public function getQueryString()
+    {
+        return $this->data['query'];
+    }
+
+    /**
+     * Get fragment from url (everything after #)
+     * @return string|null
+     */
+    public function getFragment()
+    {
+        return $this->data['fragment'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl()
+    {
+        return $this->originalUrl;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @throws \InvalidArgumentException
+     * @return array
+     */
+    public function parseUrl($url, $component = -1)
+    {
+        $encodedUrl = preg_replace_callback(
+            '%[^:/@?&=#]+%u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new \InvalidArgumentException('Malformed URL: ' . $url);
+        }
+
+        foreach ((array)$parts as $name => $value) {
+            $parts[$name] = urldecode($value);
+        }
+
+        return $parts;
+    }
+
+    /**
+     * Returns data array with information about the url
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function __toString()
+    {
+        return $this->getOriginalUrl();
+    }
+
+}

src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php

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

src/Pecee/SimpleRouter/IRouterBootManager.php

@@ -5,11 +5,11 @@ use Pecee\Http\Request;
 
 interface IRouterBootManager
 {
-	/**
+    /**
-	 * Called when router loads it's routes
+     * Called when router loads it's routes
-	 *
+     *
-	 * @param Request $request
+     * @param Request $request
-	 * @return Request
+     * @return Request
-	 */
+     */
-	public function boot(Request $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
+     * Get controller class-name
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getController();
+    public function getController();
 
-	/**
+    /**
-	 * Set controller class-name
+     * Set controller class-name
-	 *
+     *
-	 * @param string $controller
+     * @param string $controller
-	 * @return static
+     * @return static
-	 */
+     */
-	public function setController($controller);
+    public function setController($controller);
 
-	/**
+    /**
-	 * Return active method
+     * Return active method
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getMethod();
+    public function getMethod();
 
-	/**
+    /**
-	 * Set active method
+     * Set active method
-	 *
+     *
-	 * @param string $method
+     * @param string $method
-	 * @return static
+     * @return static
-	 */
+     */
-	public function setMethod($method);
+    public function setMethod($method);
 
 }

src/Pecee/SimpleRouter/Route/IGroupRoute.php

@@ -1,60 +1,70 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
+use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 
 interface IGroupRoute extends IRoute
 {
-	/**
+    /**
-	 * Method called to check if a domain matches
+     * Method called to check if a domain matches
-	 *
+     *
-	 * @param Request $request
+     * @param Request $request
-	 * @return bool
+     * @return bool
-	 */
+     */
-	public function matchDomain(Request $request);
+    public function matchDomain(Request $request);
 
-	/**
+    /**
-	 * Set exception-handlers for group
+     * Add exception handler
-	 *
+     *
-	 * @param array $handlers
+     * @param IExceptionHandler|string $handler
-	 * @return static $this
+     * @return static $this;
-	 */
+     */
-	public function setExceptionHandlers(array $handlers);
+    public function addExceptionHandler($handler);
 
-	/**
+    /**
-	 * Get exception-handlers for group
+     * Set exception-handlers for group
-	 *
+     *
-	 * @return array
+     * @param array $handlers
-	 */
+     * @return static $this
-	public function getExceptionHandlers();
+     */
+    public function setExceptionHandlers(array $handlers);
 
-	/**
+    /**
-	 * Get domains for domain.
+     * Get exception-handlers for group
-	 *
+     *
-	 * @return array
+     * @return array
-	 */
+     */
-	public function getDomains();
+    public function getExceptionHandlers();
 
-	/**
+    /**
-	 * Set allowed domains for group.
+     * Get domains for domain.
-	 *
+     *
-	 * @param array $domains
+     * @return array
-	 * @return $this
+     */
-	 */
+    public function getDomains();
-	public function setDomains(array $domains);
 
-	/**
+    /**
-	 * Set prefix that child-routes will inherit.
+     * Set allowed domains for group.
-	 *
+     *
-	 * @param string $prefix
+     * @param array $domains
-	 * @return string
+     * @return $this
-	 */
+     */
-	public function setPrefix($prefix);
+    public function setDomains(array $domains);
 
-	/**
+    /**
-	 * Get prefix.
+     * Set prefix that child-routes will inherit.
-	 *
+     *
-	 * @return string
+     * @param string $prefix
-	 */
+     * @return string
-	public function getPrefix();
+     */
+    public function setPrefix($prefix);
+
+    /**
+     * Get prefix.
+     *
+     * @return string
+     */
+    public function getPrefix();
 }

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

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

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

src/Pecee/SimpleRouter/Route/LoadableRoute.php

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

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

src/Pecee/SimpleRouter/Route/RouteGroup.php

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

src/Pecee/SimpleRouter/Route/RouteResource.php

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

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -1,45 +1,38 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
 
 class RouteUrl extends LoadableRoute
 {
-	public function __construct($url, $callback)
+    public function __construct($url, $callback)
-	{
+    {
-		$this->setUrl($url);
+        $this->setUrl($url);
-		$this->setCallback($callback);
+        $this->setCallback($callback);
-	}
+    }
 
-	public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
-	{
+    {
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        /* Match global regular-expression for route */
-		$url = rtrim($url, '/') . '/';
+        $regexMatch = $this->matchRegex($request, $url);
 
-		// Match on custom defined regular expression
+        if ($regexMatch === false) {
-		if ($this->regex !== null) {
+            return false;
-			$parameters = [];
+        }
-			if (preg_match('/(' . $this->regex . ')/is', $request->getHost() . $url, $parameters)) {
-				$this->parameters = (array)$parameters[0];
 
-				return true;
+        /* Parse parameters from current route */
-			}
+        $parameters = $this->parseParameters($this->url, $url);
 
-			return null;
+        /* If no custom regular expression or parameters was found on this route, we stop */
-		}
+        if ($regexMatch === null && $parameters === null) {
+            return false;
+        }
 
-		// Make regular expression based on route
+        /* Set the parameters */
-		$route = rtrim($this->url, '/') . '/';
+        $this->setParameters((array)$parameters);
 
-		$parameters = $this->parseParameters($route, $url);
+        return true;
-
+    }
-		if ($parameters !== null) {
-			$this->parameters = array_merge($this->parameters, $parameters);
-
-			return true;
-		}
-
-		return null;
-	}
 
 }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -7,8 +7,10 @@
  * This class is added so calls can be made statically like Router::get() making the code look pretty.
  * It also adds some extra functionality like default-namespace.
  */
+
 namespace Pecee\SimpleRouter;
 
+use Pecee\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
@@ -21,354 +23,407 @@ use Pecee\SimpleRouter\Route\RouteUrl;
 
 class SimpleRouter
 {
-	/**
+    /**
-	 * Default namespace added to all routes
+     * Default namespace added to all routes
-	 * @var string
+     * @var string
-	 */
+     */
-	protected static $defaultNamespace;
+    protected static $defaultNamespace;
 
-	/**
+    /**
-	 * The response object
+     * The response object
-	 * @var Response
+     * @var Response
-	 */
+     */
-	protected static $response;
+    protected static $response;
 
-	/**
+    /**
-	 * Start/route request
+     * Router instance
-	 *
+     * @var Router
-	 * @throws HttpException
+     */
-	 * @throws NotFoundHttpException
+    protected static $router;
-	 */
-	public static function start()
-	{
-		static::router()->routeRequest();
-	}
 
-	/**
+    /**
-	 * Set default namespace which will be prepended to all routes.
+     * Start/route request
-	 *
+     *
-	 * @param string $defaultNamespace
+     * @throws HttpException
-	 */
+     * @throws NotFoundHttpException
-	public static function setDefaultNamespace($defaultNamespace)
+     */
-	{
+    public static function start()
-		static::$defaultNamespace = $defaultNamespace;
+    {
-	}
+        echo static::router()->routeRequest();
+    }
 
-	/**
+    /**
-	 * Base CSRF verifier
+     * Set default namespace which will be prepended to all routes.
-	 *
+     *
-	 * @param BaseCsrfVerifier $baseCsrfVerifier
+     * @param string $defaultNamespace
-	 */
+     */
-	public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    public static function setDefaultNamespace($defaultNamespace)
-	{
+    {
-		static::router()->setCsrfVerifier($baseCsrfVerifier);
+        static::$defaultNamespace = $defaultNamespace;
-	}
+    }
 
-	/**
+    /**
-	 * Boot managers allows you to alter the routes before the routing occurs.
+     * Base CSRF verifier
-	 * Perfect if you want to load pretty-urls from a file or database.
+     *
-	 *
+     * @param BaseCsrfVerifier $baseCsrfVerifier
-	 * @param IRouterBootManager $bootManager
+     */
-	 */
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
-	public static function addBootManager(IRouterBootManager $bootManager)
+    {
-	{
+        static::router()->setCsrfVerifier($baseCsrfVerifier);
-		static::router()->addBootManager($bootManager);
+    }
-	}
 
-	/**
+    /**
-	 * Route the given url to your callback on GET request method.
+     * 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 string $url
+     *
-	 * @param string|\Closure $callback
+     * @param IRouterBootManager $bootManager
-	 * @param array|null $settings
+     */
-	 * @return RouteUrl
+    public static function addBootManager(IRouterBootManager $bootManager)
-	 */
+    {
-	public static function get($url, $callback, array $settings = null)
+        static::router()->addBootManager($bootManager);
-	{
+    }
-		return static::match(['get'], $url, $callback, $settings);
-	}
 
-	/**
+    /**
-	 * Route the given url to your callback on POST request method.
+     * Route the given url to your callback on GET request method.
-	 *
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @return RouteUrl
-	 */
+     */
-	public static function post($url, $callback, array $settings = null)
+    public static function get($url, $callback, array $settings = null)
-	{
+    {
-		return static::match(['post'], $url, $callback, $settings);
+        return static::match(['get'], $url, $callback, $settings);
-	}
+    }
 
-	/**
+    /**
-	 * Route the given url to your callback on PUT request method.
+     * Route the given url to your callback on POST request method.
-	 *
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @return RouteUrl
-	 */
+     */
-	public static function put($url, $callback, array $settings = null)
+    public static function post($url, $callback, array $settings = null)
-	{
+    {
-		return static::match(['put'], $url, $callback, $settings);
+        return static::match(['post'], $url, $callback, $settings);
-	}
+    }
 
-	/**
+    /**
-	 * Route the given url to your callback on PATCH request method.
+     * Route the given url to your callback on PUT request method.
-	 *
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @return RouteUrl
-	 */
+     */
-	public static function patch($url, $callback, array $settings = null)
+    public static function put($url, $callback, array $settings = null)
-	{
+    {
-		return static::match(['patch'], $url, $callback, $settings);
+        return static::match(['put'], $url, $callback, $settings);
-	}
+    }
 
-	/**
+    /**
-	 * Route the given url to your callback on OPTIONS request method.
+     * Route the given url to your callback on PATCH request method.
-	 *
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @return RouteUrl
-	 */
+     */
-	public static function options($url, $callback, array $settings = null)
+    public static function patch($url, $callback, array $settings = null)
-	{
+    {
-		return static::match(['options'], $url, $callback, $settings);
+        return static::match(['patch'], $url, $callback, $settings);
-	}
+    }
 
-	/**
+    /**
-	 * Route the given url to your callback on DELETE request method.
+     * Route the given url to your callback on OPTIONS request method.
-	 *
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @return RouteUrl
-	 */
+     */
-	public static function delete($url, $callback, array $settings = null)
+    public static function options($url, $callback, array $settings = null)
-	{
+    {
-		return static::match(['delete'], $url, $callback, $settings);
+        return static::match(['options'], $url, $callback, $settings);
-	}
+    }
 
-	/**
+    /**
-	 * Groups allows for encapsulating routes with special settings.
+     * Route the given url to your callback on DELETE request method.
-	 *
+     *
-	 * @param array $settings
+     * @param string $url
-	 * @param \Closure $callback
+     * @param string|\Closure $callback
-	 * @throws \InvalidArgumentException
+     * @param array|null $settings
-	 * @return RouteGroup
+     * @return RouteUrl
-	 */
+     */
-	public static function group(array $settings = [], \Closure $callback)
+    public static function delete($url, $callback, array $settings = null)
-	{
+    {
-		$group = new RouteGroup();
+        return static::match(['delete'], $url, $callback, $settings);
-		$group->setCallback($callback);
+    }
-		$group->setSettings($settings);
 
-		if (is_callable($callback) === false) {
+    /**
-			throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+     * 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);
 
-		static::router()->addRoute($group);
+        if (is_callable($callback) === false) {
+            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        }
 
-		return $group;
+        static::router()->addRoute($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);
-	}
 
-	/**
+    /**
-	 * This type will route the given url to your callback on the provided request methods.
+     * Alias for the form method
-	 * Route the given url to your callback on POST and GET request method.
+     *
-	 *
+     * @param string $url
-	 * @param string $url
+     * @param callable $callback
-	 * @param string|\Closure $callback
+     * @param array|null $settings
-	 * @param array|null $settings
+     * @see SimpleRouter::form
-	 * @see SimpleRouter::form
+     * @return RouteUrl
-	 * @return RouteUrl
+     */
-	 */
+    public static function basic($url, $callback, array $settings = null)
-	public static function form($url, $callback, array $settings = null)
+    {
-	{
+        return static::match(['get', 'post'], $url, $callback, $settings);
-		return static::match(['get', 'post'], $url, $callback, $settings);
+    }
-	}
 
-	/**
+    /**
-	 * This type will route the given url to your callback on the provided request methods.
+     * 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 array $requestMethods
+     *
-	 * @param string $url
+     * @param string $url
-	 * @param string|\Closure $callback
+     * @param string|\Closure $callback
-	 * @param array|null $settings
+     * @param array|null $settings
-	 * @return RouteUrl
+     * @see SimpleRouter::form
-	 */
+     * @return RouteUrl
-	public static function match(array $requestMethods, $url, $callback, array $settings = null)
+     */
-	{
+    public static function form($url, $callback, array $settings = null)
-		$route = new RouteUrl($url, $callback);
+    {
-		$route->setRequestMethods($requestMethods);
+        return static::match(['get', 'post'], $url, $callback, $settings);
-		$route = static::addDefaultNamespace($route);
+    }
 
-		if ($settings !== null) {
+    /**
-			$route->setSettings($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|IRoute
+     */
+    public static function match(array $requestMethods, $url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
+        $route->setRequestMethods($requestMethods);
+        $route = static::addDefaultNamespace($route);
 
-		static::router()->addRoute($route);
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		return $route;
+        static::router()->addRoute($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);
 
-		if ($settings !== null) {
+    /**
-			$route->setSettings($settings);
+     * 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|IRoute
+     */
+    public static function all($url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
+        $route = static::addDefaultNamespace($route);
 
-		static::router()->addRoute($route);
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		return $route;
+        static::router()->addRoute($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);
 
-		if ($settings !== null) {
+    /**
-			$route->setSettings($settings);
+     * This route will route request from the given url to the controller.
-		}
+     *
+     * @param string $url
+     * @param string $controller
+     * @param array|null $settings
+     * @return RouteController|IRoute
+     */
+    public static function controller($url, $controller, array $settings = null)
+    {
+        $route = new RouteController($url, $controller);
+        $route = static::addDefaultNamespace($route);
 
-		static::router()->addRoute($route);
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		return $route;
+        static::router()->addRoute($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);
 
-		if ($settings !== null) {
+    /**
-			$route->setSettings($settings);
+     * 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|IRoute
+     */
+    public static function resource($url, $controller, array $settings = null)
+    {
+        $route = new RouteResource($url, $controller);
+        $route = static::addDefaultNamespace($route);
 
-		static::router()->addRoute($route);
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
 
-		return $route;
+        static::router()->addRoute($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 = [])
-	{
-		return static::router()->getUrl($name, $parameters, $getParams);
-	}
 
-	/**
+    /**
-	 * Get the request
+     * Add exception callback handler.
-	 *
+     *
-	 * @return \Pecee\Http\Request
+     * @param \Closure $callback
-	 */
+     * @return CallbackExceptionHandler $callbackHandler
-	public static function request()
+     */
-	{
+    public static function error(\Closure $callback)
-		return static::router()->getRequest();
+    {
-	}
+        $routes = static::router()->getRoutes();
 
-	/**
+        $callbackHandler = new CallbackExceptionHandler($callback);
-	 * Get the response object
-	 *
-	 * @return Response
-	 */
-	public static function response()
-	{
-		if (static::$response === null) {
-			static::$response = new Response(static::request());
-		}
 
-		return static::$response;
+        $group = new RouteGroup();
-	}
+        $group->addExceptionHandler($callbackHandler);
 
-	/**
+        array_unshift($routes, $group);
-	 * Returns the router instance
-	 *
-	 * @return Router
-	 */
-	public static function router()
-	{
-		return Router::getInstance();
-	}
 
-	/**
+        static::router()->setRoutes($routes);
-	 * 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) {
+        return $callbackHandler;
-				$namespace .= '\\' . $route->getNamespace();
+    }
-			}
 
-			$route->setDefaultNamespace($namespace);
+    /**
-		}
+     * 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);
+    }
 
-		return $route;
+    /**
-	}
+     * 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());
+        }
+
+        return static::$response;
+    }
+
+    /**
+     * Returns the router instance
+     *
+     * @return Router
+     */
+    public static function router()
+    {
+        if (static::$router === null) {
+            static::$router = new Router();
+        }
+
+        return static::$router;
+    }
+
+    /**
+     * Prepends the default namespace to all new routes added.
+     *
+     * @param IRoute $route
+     * @return IRoute
+     */
+    protected static function addDefaultNamespace(IRoute $route)
+    {
+        if (static::$defaultNamespace !== null) {
+
+            $callback = $route->getCallback();
+
+            /* Only add default namespace on relative callbacks */
+            if ($callback === null || $callback[0] !== '\\') {
+
+                $namespace = static::$defaultNamespace;
+
+                $currentNamespace = $route->getNamespace();
+
+                if ($currentNamespace !== null) {
+                    $namespace .= '\\' . $currentNamespace;
+                }
+
+                $route->setDefaultNamespace($namespace);
+
+            }
+        }
+
+        return $route;
+    }
+
+    /**
+     * Get default namespace
+     * @return string
+     */
+    public static function getDefaultNamespace()
+    {
+        return static::$defaultNamespace;
+    }
 
 }

test/Dummy/DummyController.php

@@ -2,24 +2,34 @@
 
 class DummyController
 {
-	public function start()
+	public function method1()
 	{
-		echo static::class . '@' . 'start() OK';
+
 	}
 
+    public function method2()
+    {
+
+    }
+
 	public function param($params = null)
 	{
-		$params = func_get_args();
+		echo join(', ', func_get_args());
-		echo 'Params: ' . join(', ', $params);
 	}
 
-	public function notFound()
+	public function getTest()
-	{
+    {
-		echo 'not found';
+        echo 'getTest';
-	}
+    }
 
-	public function silent() {
+    public function postTest()
+    {
+        echo 'postTest';
+    }
 
-	}
+    public function putTest()
+    {
+        echo 'putTest';
+    }
 
 }

test/Dummy/DummyMiddleware.php

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

test/Dummy/Exceptions/ExceptionHandlerException.php

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

test/Dummy/Exceptions/ResponseException.php

@@ -0,0 +1,18 @@
+<?php
+
+class ResponseException extends \Exception
+{
+    protected $response;
+
+    public function __construct($response)
+    {
+        $this->response = $response;
+        parent::__construct('', 0);
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+}

test/Dummy/Handler/ExceptionHandler.php

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

test/Dummy/Handler/ExceptionHandlerFirst.php

@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+	    global $stack;
+	    $stack[] = static::class;
+
+		$request->setUri(new \Pecee\Http\Uri('/'));
+		return $request;
+	}
+
+}

test/Dummy/Handler/ExceptionHandlerSecond.php

@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+        $request->setUri(new \Pecee\Http\Uri('/'));
+        return $request;
+	}
+
+}

test/Dummy/Handler/ExceptionHandlerThird.php

@@ -0,0 +1,13 @@
+<?php
+
+class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+		throw new ResponseException('ExceptionHandler loaded');
+	}
+
+}

test/Dummy/ResourceController.php

@@ -0,0 +1,39 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index()
+    {
+        echo 'index';
+    }
+
+    public function show($id)
+    {
+        echo 'show ' . $id;
+    }
+
+    public function store()
+    {
+        echo 'store';
+    }
+
+    public function create()
+    {
+        echo 'create';
+    }
+
+    public function edit($id)
+    {
+        echo 'edit ' . $id;
+    }
+
+    public function update($id)
+    {
+        echo 'update ' . $id;
+    }
+
+    public function destroy($id)
+    {
+        echo 'destroy ' . $id;
+    }
+}

test/GroupTest.php

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

test/Helpers/TestRouter.php

@@ -0,0 +1,41 @@
+<?php
+
+class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
+{
+
+    public static function debugNoReset($testUri, $testMethod = 'get')
+    {
+        static::request()->setUri(new \Pecee\Http\Uri($testUri));
+        static::request()->setMethod($testMethod);
+
+        static::start();
+    }
+
+    public static function debug($testUri, $testMethod = 'get')
+    {
+        try {
+            static::debugNoReset($testUri, $testMethod);
+        } catch(\Exception $e) {
+            static::router()->reset();
+            throw $e;
+        }
+
+        static::router()->reset();
+
+    }
+
+    public static function debugOutput($testUri, $testMethod = 'get')
+    {
+        $response = null;
+
+        // Route request
+        ob_start();
+        static::debug($testUri, $testMethod);
+        $response = ob_get_contents();
+        ob_end_clean();
+
+        // Return response
+        return $response;
+    }
+
+}

test/MiddlewareTest.php

@@ -3,30 +3,32 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
+require_once 'Helpers/TestRouter.php';
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
-	public function testMiddlewareFound()
+    public function testMiddlewareFound()
-	{
+    {
-		SimpleRouter::router()->reset();
+        $this->setExpectedException(MiddlewareLoadedException::class);
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/my/test/url');
 
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
-		});
+        });
 
-		$found = false;
+        TestRouter::debug('/my/test/url', 'get');
 
-		try {
+    }
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof MiddlewareLoadedException);
-		}
 
-		$this->assertTrue($found);
+    public function testNestedMiddlewareDontLoad()
-	}
+    {
+
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
+            TestRouter::get('/middleware', 'DummyController@method1');
+        });
+
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+
+        TestRouter::debug('/my/test/url', 'get');
+    }
 
 }

test/RouterCallbackExceptionHandlerTest.php

@@ -0,0 +1,27 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterCallbackExceptionHandlerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testCallbackExceptionHandler()
+    {
+        $this->setExpectedException(ExceptionHandlerException::class);
+
+        // Match normal route on alias
+        TestRouter::get('/my-new-url', 'DummyController@method2');
+        TestRouter::get('/my-url', 'DummyController@method1');
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $exception) {
+            throw new ExceptionHandlerException();
+        });
+
+        TestRouter::debugNoReset('/404-url', 'get');
+        TestRouter::router()->reset();
+    }
+
+}

test/RouterControllerTest.php

@@ -0,0 +1,42 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterControllerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}

test/RouterResourceTest.php

@@ -0,0 +1,70 @@
+<?php
+
+require_once 'Dummy/ResourceController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterResourceTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testResourceStore()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'post');
+
+        $this->assertEquals('store', $response);
+    }
+
+    public function testResourceCreate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/create', 'get');
+
+        $this->assertEquals('create', $response);
+
+    }
+
+    public function testResourceIndex()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'get');
+
+        $this->assertEquals('index', $response);
+    }
+
+    public function testResourceDestroy()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'delete');
+
+        $this->assertEquals('destroy 38', $response);
+    }
+
+
+    public function testResourceEdit()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38/edit', 'get');
+
+        $this->assertEquals('edit 38', $response);
+
+    }
+
+    public function testResourceUpdate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'put');
+
+        $this->assertEquals('update 38', $response);
+
+    }
+
+    public function testResourceGet()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'get');
+
+        $this->assertEquals('show 38', $response);
+
+    }
+
+}

test/RouterRewriteTest.php

@@ -0,0 +1,78 @@
+<?php
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exceptions/ResponseException.php';
+require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
+require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
+require_once 'Dummy/Handler/ExceptionHandlerThird.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouteRewriteTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * 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 testExceptionHandlerRewrite()
+    {
+        global $stack;
+        $stack = [];
+
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
+
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
+
+                TestRouter::get('/my-path', 'DummyController@method1');
+
+            });
+        });
+
+        try {
+            TestRouter::debug('/my-non-existing-path', 'get');
+        } catch (\ResponseException $e) {
+
+        }
+
+        $expectedStack = [
+            ExceptionHandlerFirst::class,
+            ExceptionHandlerSecond::class,
+            ExceptionHandlerThird::class,
+        ];
+
+        $this->assertEquals($expectedStack, $stack);
+
+    }
+
+    public function testRewriteExceptionMessage()
+    {
+        $this->setExpectedException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            if (strtolower($request->getUri()->getPath()) == '/my/test') {
+                $request->setRewriteUrl('/another-non-existing');
+
+                return $request;
+            }
+
+        });
+
+        TestRouter::debug('/my/test', 'get');
+    }
+
+}

test/RouterRouteTest.php

@@ -2,140 +2,146 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-
+require_once 'Helpers/TestRouter.php';
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException as NotFoundHttpException;
 
 class RouterRouteTest extends PHPUnit_Framework_TestCase
 {
-	protected $result = false;
+    protected $result = false;
 
-	public function testNotFound()
+    public function testMultiParam()
-	{
+    {
-		SimpleRouter::router()->reset();
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
 
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+            if ($param1 === 'param1' && $param2 === 'param2') {
-			SimpleRouter::get('/non-existing-path', 'DummyController@start');
+                $this->result = true;
-		});
+            }
 
-		$found = false;
+        });
 
-		try {
+        TestRouter::debug('/test-param1-param2', 'get');
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof NotFoundHttpException && $e->getCode() == 404);
-		}
 
-		$this->assertTrue($found);
+        $this->assertTrue($this->result);
-	}
 
-	public function testGet()
+    }
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('get');
 
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
+    public function testNotFound()
-		SimpleRouter::start();
+    {
-	}
+        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        TestRouter::get('/non-existing-path', 'DummyController@method1');
+        TestRouter::debug('/test-param1-param2', 'post');
+    }
 
-	public function testPost()
+    public function testGet()
-	{
+    {
-		SimpleRouter::router()->reset();
+        TestRouter::get('/my/test/url', 'DummyController@method1');
-		SimpleRouter::request()->setUri('/my/test/url');
+        TestRouter::debug('/my/test/url', 'get');
-		SimpleRouter::request()->setMethod('post');
+    }
 
-		SimpleRouter::post('/my/test/url', 'DummyController@start');
+    public function testPost()
-		SimpleRouter::start();
+    {
-	}
+        TestRouter::post('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'post');
+    }
 
-	public function testPut()
+    public function testPut()
-	{
+    {
-		SimpleRouter::router()->reset();
+        TestRouter::put('/my/test/url', 'DummyController@method1');
-		SimpleRouter::request()->setUri('/my/test/url');
+        TestRouter::debug('/my/test/url', 'put');
-		SimpleRouter::request()->setMethod('put');
+    }
 
-		SimpleRouter::put('/my/test/url', 'DummyController@start');
+    public function testDelete()
-		SimpleRouter::start();
+    {
-	}
+        TestRouter::delete('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'delete');
+    }
 
-	public function testDelete()
+    public function testMethodNotAllowed()
-	{
+    {
-		SimpleRouter::router()->reset();
+        TestRouter::get('/my/test/url', 'DummyController@method1');
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('delete');
 
-		SimpleRouter::delete('/my/test/url', 'DummyController@start');
+        try {
-		SimpleRouter::start();
+            TestRouter::debug('/my/test/url', 'post');
-	}
+        } catch (\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+    }
 
-	public function testMethodNotAllowed()
+    public function testSimpleParam()
-	{
+    {
-		SimpleRouter::router()->reset();
+        TestRouter::get('/test-{param1}', 'DummyController@param');
-		SimpleRouter::request()->setUri('/my/test/url');
+        $response = TestRouter::debugOutput('/test-param1', 'get');
-		SimpleRouter::request()->setMethod('post');
 
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
+        $this->assertEquals('param1', $response);
+    }
 
-		try {
+    public function testPathParamRegex()
-			SimpleRouter::start();
+    {
-		} catch (\Exception $e) {
+        TestRouter::get('/{lang}/productscategories/{name}', 'DummyController@param', ['where' => ['lang' => '[a-z]+', 'name' => '[A-Za-z0-9\-]+']]);
-			$this->assertEquals(403, $e->getCode());
+        $response = TestRouter::debugOutput('/it/productscategories/system', 'get');
-		}
-	}
 
-	public function testSimpleParam()
+        $this->assertEquals('it, system', $response);
-	{
+    }
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1');
 
-		SimpleRouter::get('/test-{param1}', 'DummyController@param');
+    public function testDomainAllowedRoute()
-		SimpleRouter::start();
+    {
-	}
+        $this->result = false;
 
-	public function testMultiParam()
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-	{
+            TestRouter::get('/test', function ($subdomain = null) {
-		SimpleRouter::router()->reset();
+                $this->result = ($subdomain === 'hello');
-		SimpleRouter::request()->setMethod('get');
+            });
-		SimpleRouter::request()->setUri('/test-param1-param2');
+        });
 
-		SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
+        TestRouter::request()->setHost('hello.world.com');
-		SimpleRouter::start();
+        TestRouter::debug('/test', 'get');
-	}
 
-	public function testPathParamRegex()
+        $this->assertTrue($this->result);
-	{
-		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()
+    public function testDomainNotAllowedRoute()
-	{
+    {
-		SimpleRouter::router()->reset();
+        $this->result = false;
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test');
-		SimpleRouter::request()->setHost('hello.world.com');
 
-		$this->result = false;
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            TestRouter::get('/test', function ($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });
 
-		SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
+        TestRouter::request()->setHost('other.world.com');
-			SimpleRouter::get('/test', function ($subdomain = null) {
-				$this->result = ($subdomain === 'hello');
-			});
-		});
 
-		SimpleRouter::start();
 
-		$this->assertTrue($this->result);
+        TestRouter::debug('/test', 'get');
 
-	}
+        $this->assertFalse($this->result);
+
+    }
+
+    public function testRegEx()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@method1')->where(['path' => '[a-zA-Z\-]+']);
+        TestRouter::debug('/my/custom-path', 'get');
+    }
+
+    public function testDefaultParameterRegex()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }
+
+    public function testDefaultParameterRegexGroup()
+    {
+        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function() {
+            TestRouter::get('/my/{path}', 'DummyController@param');
+        });
+
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }
 
 }

test/RouterUrlTest.php

@@ -3,99 +3,171 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
+require_once 'Helpers/TestRouter.php';
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
 
 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {
-	protected $result = false;
 
-	protected function getUrl($name = null, $parameters = null, array $getParams = []) {
+    public function testIssue253()
-		return SimpleRouter::getUrl($name, $parameters, $getParams);
+    {
-	}
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
 
-	public function testUrls()
+        TestRouter::debugNoReset('/page/22', 'get');
-	{
+        $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/');
 
-		// Match normal route on alias
+        TestRouter::debugNoReset('/', 'get');
-		SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
+        $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		SimpleRouter::get('/about', 'DummyController@about');
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
 
-		SimpleRouter::group(['prefix' => '/admin', 'as' => 'admin'], function() {
+        TestRouter::router()->reset();
+    }
 
-			// Match route with prefix on alias
+    public function testUnicodeCharacters()
-			SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'home']);
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
+        $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-			// Match controller with prefix and alias
+        // Test danish characters
-			SimpleRouter::controller('/users', 'DummyController', ['as' => 'users']);
+        TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+        TestRouter::debugNoReset('/kategori/økse', 'get');
+        $this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-			// Match controller with prefix and NO alias
+        TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
-			SimpleRouter::controller('/pages', 'DummyController');
+        TestRouter::debugNoReset('/test/Dermatología');
 
-		});
+        $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
 
-		SimpleRouter::group(['prefix' => 'api', 'as' => 'api'], function() {
+        $this->assertEquals('Dermatología', $parameters['param']);
 
-			// Match resource controller
+        TestRouter::router()->reset();
-			SimpleRouter::resource('phones', 'DummyController');
+    }
 
-		});
+    public function testOptionalParameters()
+    {
+        TestRouter::get('/aviso/legal', 'DummyController@method1');
+        TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
+        TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
+        TestRouter::get('/{pagina?}', 'DummyController@method1');
 
-		SimpleRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+        TestRouter::debugNoReset('/aviso/optional', 'get');
+        $this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		// Match controller with no prefix and no alias
+        TestRouter::debugNoReset('/pagina/optional', 'get');
-		SimpleRouter::controller('/cats', 'CatsController');
+        $this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		// Pretend to load page
+        TestRouter::debugNoReset('/optional', 'get');
-		SimpleRouter::start();
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		$this->assertEquals('/gadgets/iphoneinfo/', $this->getUrl('gadgets.iphone'));
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		$this->assertEquals('/api/phones/create/', $this->getUrl('api.phones.create'));
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-		// Should match /
+        TestRouter::router()->reset();
-		$this->assertEquals('/', $this->getUrl('home'));
+    }
 
-		// Should match /about/
+    public function testSimilarUrls()
-		$this->assertEquals('/about/', $this->getUrl('DummyController@about'));
+    {
+        // Match normal route on alias
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
 
-		// Should match /admin/
+        TestRouter::debugNoReset('/url1', 'get');
-		$this->assertEquals('/admin/', $this->getUrl('DummyController@start'));
 
-		// Should match /admin/
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
-		$this->assertEquals('/admin/', $this->getUrl('admin.home'));
 
-		// Should match /admin/2/
+        TestRouter::router()->reset();
-		$this->assertEquals('/admin/2/', $this->getUrl('admin.home', ['id' => 2]));
+    }
 
-		// Should match /admin/users/
+    public function testUrls()
-		$this->assertEquals('/admin/users/', $this->getUrl('admin.users'));
+    {
+        // Match normal route on alias
+        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);
 
-		// Should match /admin/users/home/
+        TestRouter::get('/about', 'DummyController@about');
-		$this->assertEquals('/admin/users/home/', $this->getUrl('admin.users@home'));
 
-		// Should match /cats/
+        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
-		$this->assertEquals('/cats/', $this->getUrl('CatsController'));
 
-		// Should match /cats/view/
+            // Match route with prefix on alias
-		$this->assertEquals('/cats/view/', $this->getUrl('CatsController', 'view'));
+            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);
 
-		// Should match /cats/view/
+            // Match controller with prefix and alias
-		//$this->assertEquals('/cats/view/', $this->getUrl('CatsController', ['view']));
+            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);
 
-		// Should match /cats/view/666
+            // Match controller with prefix and NO alias
-		$this->assertEquals('/cats/view/666/', $this->getUrl('CatsController@getView', ['666']));
+            TestRouter::controller('/pages', 'DummyController');
 
-		// Should match /funny/man/
+        });
-		$this->assertEquals('/funny/man/', $this->getUrl('/funny/man'));
 
-		// Should match /?jackdaniels=true&cola=yeah
+        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
-		$this->assertEquals('/?jackdaniels=true&cola=yeah', $this->getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
 
-	}
+            // Match resource controller
+            TestRouter::resource('phones', 'DummyController');
+
+        });
+
+        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+
+        // Match controller with no prefix and no alias
+        TestRouter::controller('/cats', 'CatsController');
+
+        // Pretend to load page
+        TestRouter::debugNoReset('/', 'get');
+
+        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));
+
+        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));
+
+        // Should match /
+        $this->assertEquals('/', TestRouter::getUrl('home'));
+
+        // Should match /about/
+        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));
+
+        // Should match /admin/2/
+        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
+
+        // Should match /admin/users/
+        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
+
+        // Should match /admin/users/home/
+        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
+
+        // Should match /cats/
+        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
+
+        // Should match /cats/view/
+        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
+
+        // Should match /cats/view/
+        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
+
+        // Should match /cats/view/666
+        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
+
+        // Should match /funny/man/
+        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
+
+        // Should match /?jackdaniels=true&cola=yeah
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+
+        TestRouter::router()->reset();
+
+    }
 
 }