Merge pull request #186 from skipperbent/v2-development

Development

README.md

@@ -15,72 +15,71 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 
 ## Table of Contents
 
-- [Getting started](#getting-started)
-	- [Requirements](#requirements)
-	- [Notes](#notes-1)
-	- [Features](#features)
-	- [Installation](#installation)
-		- [Setting up Apache](#setting-up-apache)
-		- [Setting up Nginx](#setting-up-nginx)
-		- [Configuration](#configuration)
-		- [Helper functions](#helper-functions)
+- Gettings started
+	- Requirements
+	- Notes
+	- Features
+	- Installation
+		- Setting up Apache
+		- Setting up Nginx
+		- Setting up simple-php-router
+		- Helper methods
 
-- [Routes](#routes)
-	- [Basic routing](#basic-routing)
-		- [Available methods](#available-methods)
-		- [Multiple HTTP-verbs](#multiple-http-verbs)
-	- [Route parameters](#route-parameters)
-		- [Required parameters](#required-parameters)
-		- [Optional parameters](#optional-parameters)
-		- [Regular expression constraints](#regular-expression-constraints)
-		- [Regular expression route-match](#regular-expression-route-match)
-	- [Named routes](#named-routes)
-		- [Generating URLs To Named Routes](#generating-urls-to-named-routes)
-	- [Router groups](#router-groups)
-		- [Middleware](#middleware)
-		- [Namespaces](#namespaces)
-		- [Subdomain-routing](#subdomain-routing)
-		- [Route prefixes](#route-prefixes)
-	- [Form Method Spoofing](#form-method-spoofing)
-	- [Accessing The Current Route](#accessing-the-current-route)
-	- [Other examples](#other-examples)
+- Routes
+	- Basic routing
+		- Available methods
+		- Multiple HTTP-verbs
+	- Route parameters
+		- Required parameters
+		- Optional parameters
+		- Regular expression constraints
+		- Regular expression route-match
+	- Named routes
+		- Generating URLs To Named Routes
+	- Router groups
+		- Middleware
+		- Namespaces
+		- Subdomain-routing
+		- Route prefixes
+	- Form Method Spoofing
+	- Accessing The Current Route
+	- Other examples
 
-- [CSRF-protection](#csrf-protection)
-	- [Adding CSRF-verifier](#adding-csrf-verifier)
-	- [Getting CSRF-token](#getting-csrf-token)
+- CSRF-protection
+	- Adding CSRF-verifier
+	- Getting CSRF-token
 
-- [Middlewares](#middlewares)
-	- [Example](#example)
-- [ExceptionHandler](#exceptionhandler)
-	- [Example](#example-1)
+- Middleware
+	- Example
+- ExceptionHandler
+	- Example
 
-- [Urls](#urls)
- 	- [Get by name (single route)](#get-by-name-single-route)
- 	- [Get by name (controller route)](#get-by-name-controller-route)
- 	- [Get by class](#get-by-class)
- 	- [Get by custom names for methods on a controller/resource route](#using-custom-names-for-methods-on-a-controllerresource-route)
- 	- [Getting REST/resource controller urls](#getting-restresource-controller-urls)
- 	- [Get the current url](#get-the-current-url)
+- Urls
+ 	- Get by name (single route)
+ 	- Get by name (controller route)
+ 	- Get by class
+ 	- Get by custom names for methods on a controller/resource route
+ 	- Getting REST/resource controller urls
 
-- [Input & parameters](#input--parameters)
-    - [Using the Input class to manage parameters](#using-the-input-class-to-manage-parameters)
-	    - [Get single parameter value](#get-single-parameter-value)
-	    - [Get parameter object](#get-parameter-object)
-	    - [Managing files](#managing-files)
-	    - [Get all parameters](#get-all-parameters)
+- Input & parameters
+	- Return single parameter value
+	- Return single parameter object
+	- Managing files
+	- Return all parameters
 
-- [Advanced](#advanced)
-	- [Bootmanager: loading routes dynamically](#bootmanager-loading-routes-dynamically)
-	- [Url rewriting](#url-rewriting)
-		- [Rewrite using callback](#rewrite-using-callback)
-		- [Rewrite using url](#rewrite-using-url)
+- Advanced
+	- Bootmanager: loading routes dynamically
+	- Ovewrite route about to be loaded
+		- Examples
+		- Rewriting to new route
+		- Changing callback
 
-	- [Adding routes manually](#adding-routes-manually)
-	- [Extending](#extending)
+	- Adding routes manually
+	- Extending
 
-- [Credits](#credits)
-	- [Sites](#sites)
-	- [License](#license)
+- Credits
+	- Sites
+	- License
 
 ___
 
@@ -93,7 +92,8 @@ composer require pecee/simple-router
 
 ## Requirements
 
-- PHP 5.5 or greater
+- PHP 5.4 or greater
+- mcrypt extension
 
 ## Notes
 
@@ -155,7 +155,7 @@ location / {
 
 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.
 
-### Configuration
+### Setting up simple-php-router
 
 Create a new file, name it `routes.php` and place it in your library folder. This will be the file where you define all the routes for your project.
 
@@ -193,6 +193,8 @@ To implement the functions below, simply copy the code to a new file and require
 
 ```php
 <?php
+use Pecee\SimpleRouter\SimpleRouter;
+
 /**
  * Get url for a route by using either name/alias, class or method name.
  *
@@ -210,43 +212,41 @@ To implement the functions below, simply copy the code to a new file and require
  * @param array|null $getParams
  * @return string
  */
-function url($name = null, $parameters = null, $getParams = null)
-{
-    return SimpleRouter::getUrl($name, $parameters, $getParams);
+function url($name = null, $parameters = null, $getParams = null) {
+    SimpleRouter::getUrl($name, $parameters, $getParams);
 }
 
 /**
- * @return \Pecee\Http\Response
+ * Get current csrf-token
+ * @return null|string
  */
-function response()
-{
-    return SimpleRouter::response();
+function csrf_token() {
+    $token = new \Pecee\CsrfToken();
+    return $token->getToken();
 }
 
 /**
+ * Get request object
  * @return \Pecee\Http\Request
  */
-function 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 request()->getInput();
-}
-
-function redirect($url, $code = null)
-{
-    if ($code !== null) {
-        response()->httpCode($code);
-    }
-
-    response()->redirect($url);
+function input() {
+    return SimpleRouter::request()->getInput();
 }
 ```
 
@@ -422,7 +422,7 @@ Route groups allow you to share route attributes, such as middleware or namespac
 To assign middleware to all routes within a group, you may use the middleware key in the group attribute array. Middleware are executed in the order they are listed in the array:
 
 ```php
-SimpleRouter::group(['middleware' => \Demo\Middleware\Auth::class], function () {
+SimpleRouter::group(['middleware' => '\Demo\Middleware\Auth'], function () {
     SimpleRouter::get('/', function ()    {
         // Uses Auth Middleware
     });
@@ -437,11 +437,6 @@ SimpleRouter::group(['middleware' => \Demo\Middleware\Auth::class], function ()
 
 Another common use-case for route groups is assigning the same PHP namespace to a group of controllers using the `namespace` parameter in the group array:
 
-#### Note
-Group namespaces will only be added to routes with relative callbacks.
-For example if your route has an absolute callback like `\Demo\Controller\DefaultController@home`, the namespace from the route will not be prepended.
-To fix this you can make the callback relative by removing the `\` in the beginning of the callback.
-
 ```php
 SimpleRouter::group(['namespace' => 'Admin'], function () {
     // Controllers Within The "App\Http\Controllers\Admin" Namespace
@@ -485,8 +480,7 @@ HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining
 You can access information about the current route loaded by using the following method:
 
 ```php
-SimpleRouter::request()->getLoadedRoute();
-request()->getLoadedRoute();
+SimpleRouter::router()->getLoadedRoute();
 ```
 
 ## Other examples
@@ -500,7 +494,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 /* Adding custom csrfVerifier here */
 SimpleRouter::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
 
-SimpleRouter::group(['middleware' => \Demo\Middlewares\Site::class, 'exceptionHandler' => \Demo\Handlers\CustomExceptionHandler::class], function() {
+SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler' => 'Handlers\CustomExceptionHandler'], function() {
 
 
     SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show', ['where' => ['id' => '[0-9]+']]);
@@ -510,7 +504,7 @@ SimpleRouter::group(['middleware' => \Demo\Middlewares\Site::class, 'exceptionHa
      * Restful resource (see IRestController interface for available methods)
      */
 
-    SimpleRouter::resource('/rest', ControllerRessource::class);
+    SimpleRouter::resource('/rest', 'ControllerRessource');
 
 
     /**
@@ -526,7 +520,7 @@ SimpleRouter::group(['middleware' => \Demo\Middlewares\Site::class, 'exceptionHa
      * etc.
      */
 
-    SimpleRouter::controller('/animals', ControllerAnimals::class);
+    SimpleRouter::controller('/animals', 'ControllerAnimals');
 
 });
 
@@ -591,19 +585,13 @@ namespace Demo\Middlewares;
 
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
 
 class CustomMiddleware implements Middleware {
 
-    public function handle(Request $request) {
+    public function handle(Request $request, ILoadableRoute &$route) {
 
-        // Authenticate user, will be available using request()->user
-        $request->user = User::authenticate();
-
-        // If authentication failed, redirect request to user-login page.
-        if($request->user === null) {
-            $request->setRewriteUrl(url('user.login'));
-            return $request;
-        }
+        $request->setUri(url('home'));
 
     }
 }
@@ -627,10 +615,11 @@ 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, \Exception $error)
+	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. */
@@ -647,9 +636,14 @@ class CustomExceptionHandler implements IExceptionHandler
 		/* The router will throw the NotFoundHttpException on 404 */
 		if($error instanceof NotFoundHttpException) {
 
-			// Render custom 404-page
+			/*
+			 * 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->setRewriteCallback('Demo\Controllers\PageController@notFound');
+			$request->setUri(url('page.notfound'));
 			return $request;
 
 		}
@@ -667,7 +661,7 @@ class CustomExceptionHandler implements IExceptionHandler
 
 By default all controller and resource routes will use a simplified version of their url as name.
 
-### Get by name (single route)
+### Get routes using custom name (single route)
 
 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -680,10 +674,10 @@ url('product', null, ['category' => 'shoes']);
 # /product-view/?category=shoes
 ```
 
-### Get by name (controller route)
+### Getting the url using the name (controller route)
 
 ```php
-SimpleRouter::controller('/images', ImagesController::class, ['as' => 'picture']);
+SimpleRouter::controller('/images', 'ImagesController', ['as' => 'picture']);
 
 url('picture@getView', null, ['category' => 'shoes']);
 url('picture', 'getView', ['category' => 'shoes']);
@@ -695,7 +689,7 @@ url('picture', 'view');
 # /images/view/
 ```
 
-### Get by class
+### Getting the url using class
 
 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -712,7 +706,7 @@ url('ImagesController@getImage', null, ['id' => 22]);
 ### Using custom names for methods on a controller/resource route
 
 ```php
-SimpleRouter::controller('gadgets', GadgetsController::class, ['names' => ['getIphoneInfo' => 'iphone']]);
+SimpleRouter::controller('gadgets', 'GadgetsController', ['names' => ['getIphoneInfo' => 'iphone']]);
 
 url('gadgets.iphone');
 
@@ -723,7 +717,7 @@ url('gadgets.iphone');
 ### Getting REST/resource controller urls
 
 ```php
-SimpleRouter::resource('/phones', PhonesController::class);
+SimpleRouter::resource('/phones', 'PhonesController');
 
 url('phones');
 url('phones.index');
@@ -738,7 +732,7 @@ url('phones.edit');
 # /phones/edit/
 ```
 
-### Get the current url
+### Return the current url
 
 ```php
 url();
@@ -755,17 +749,17 @@ url(null, null, ['q' => 'cars']);
 
 We've added the `Input` class to easy access and manage parameters from your Controller-classes.
 
-### Get single parameter value:
+**Return single parameter value (matches both GET, POST, FILE):**
 
 If items is grouped in the html, it will return an array of items.
 
 **Note:** `get` will automatically trim the value and ensure that it's not empty. If it's empty the `$defaultValue` will be returned.
 
 ```php
-$value = input()->get($index, $defaultValue, $methods);
+$value = input()->get($index, $defaultValue);
 ```
 
-### Get parameter object
+**Return parameter object (matches both GET, POST, FILE):**
 
 Will return an instance of `InputItem` or `InputFile` depending on the type.
 
@@ -778,10 +772,10 @@ If items is grouped in the html, it will return an array of items.
 **Note:** `getObject` will only return `$defaultValue` if the item doesn't exist. If you want `$defaultValue` to be returned if the item is empty, please use `input()->get()` instead.
 
 ```php
-$object = input()->getObject($index, $defaultValue = null, $methods = null);
+$object = input()->getObject($index);
 ```
 
-### Return specific GET parameter (where name is the name of your parameter):
+**Return specific GET parameter (where name is the name of your parameter):**
 
 ```php
 # -- match any (default) --
@@ -805,11 +799,9 @@ $object = input()->get($index, $defaultValue, 'file');
 $object = input()->findGet($index, $defaultValue);
 $object = input()->findPost($index, $defaultValue);
 $object = input()->findFile($index, $defaultValue);
-```
 
-### Managing files
+# -- examples --
 
-```php
 /**
  * In this small example we loop through a collection of files
  * added on the page like this
@@ -827,10 +819,9 @@ foreach(input()->get('images', []) as $image)
 
     }
 }
-
 ```
 
-### Get all parameters
+**Return all parameters:**
 
 ```php
 // Get all
@@ -862,140 +853,15 @@ All object implements the `IInputItem` interface and will always contain these m
 Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.
 
 ```php
-/* Get parameter site_id or default-value 2 from either post-value or query-string */
-$siteId = input()->get('site_id', 2, ['post', 'get']);
+// Get parameter site_id or default-value 2
+$siteId = input()->get('site_id', 2);
 ```
 
 ---
 
 # Advanced
 
-## Url rewriting
-Sometimes it can be useful to manipulate the route about to be loaded.
-simple-php-router allows you to easily change the route about to be executed.
-All information about the current route is stored in the ```\Pecee\SimpleRouter\Router``` instance's `loadedRoute` property.
-
-For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
-
-
-```php
-use Pecee\SimpleRouter;
-$request = SimpleRouter::request();
-$request->setRewriteCallback('Example\MyCustomClass@hello');
-
-// -- or you can rewrite by url --
-
-$request->setRewriteUrl('/my-rewrite-url');
-```
-
-### Examples
-
-It's only possible to change the route BEFORE the route has initially been rendered. You can use the `Request` object to manipulate the route which are about to be loaded.
-
-#### Rewrite using callback
-
-This method is most efficient, as it will render the route immediately.
-
-This method is useful for rendering 404-pages etc.
-
-You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
-on some criteria's for the request.
-
-The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
-If you wish to change the callback from outside, please have this in mind.
-
-The example below will render `DefaultController@notFound` regardless of the url.
-
-**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
-
-#### Middleware example
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-class CustomMiddleware implements IMiddleware {
-
-    public function handle(Request $request) {
-
-        $request->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
-        return $request;
-
-    }
-
-}
-```
-
-#### Exception handler example
-
-```php
-namespace Demo\Handlers;
-
-use Pecee\Handlers\IExceptionHandler;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
-
-class CustomExceptionHandler implements IExceptionHandler
-{
-	public function handleError(Request $request, \Exception $error)
-	{
-		/* 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->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
-			return $request;
-
-		}
-
-		throw $error;
-
-	}
-
-}
-```
-
-#### Rewrite using url
-
-The example below will cause the router to reload the request and reinitialize all the routes. This method is slower, but will ensure that all middlewares and rules for the route is loaded.
-
-This method is useful if you want to redirect a url to another-url which is dependent on a middleware. You can also add a custom rule by calling `$request->setRewriteRoute($route)` if
-you want to customize request-methods or use another route-type like `RouteController` etc.
-
-We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
-
-**NOTE: Use this method if you want to fully load another route using it's settings (request method, middlewares etc).**
-
-#### Middleware example
-
-The example below will redirect the request to the `home`-route.
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-class CustomMiddleware implements IMiddleware {
-
-    public function handle(Request $request) {
-
-        $request->setRewriteUrl(url('home'));
-        return $request;
-
-    }
-}
-```
-
-# Bootmanager: loading routes dynamically
+## Load routes dynamicially using the router bootmanager
 
 Sometimes it can be necessary to keep urls stored in the database, file or similar. In this example, we want the url ```/my-cat-is-beatiful``` to load the route ```/article/view/1``` which the router knows, because it's defined in the ```routes.php``` file.
 
@@ -1011,7 +877,7 @@ class CustomRouterRules implement IRouterBootManager {
 
         $rewriteRules = [
             '/my-cat-is-beatiful' => '/article/view/1',
-            '/horses-are-great'   => '/article/view/2',
+            '/horses-are-great' => '/article/view/2'
         ];
 
         foreach($rewriteRules as $url => $rule) {
@@ -1019,11 +885,11 @@ class CustomRouterRules implement IRouterBootManager {
             // If the current uri matches the url, we use our custom route
 
             if($request->getUri() === $url) {
-                $request->setRewriteUrl($rule);
-                return $request;
+                $request->setUri($rule);
             }
         }
 
+        return $request;
     }
 
 }
@@ -1041,6 +907,82 @@ The last thing we need to do, is to add our custom boot-manager to the ```routes
 SimpleRouter::addBootManager(new CustomRouterRules());
 ```
 
+## Easily overwrite route about to be loaded
+Sometimes it can be useful to manipulate the route about to be loaded.
+simple-php-router allows you to easily change the route about to be executed.
+All information about the current route is stored in the ```\Pecee\SimpleRouter\Router``` instance's `loadedRoute` property.
+
+For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
+
+
+```php
+use Pecee\SimpleRouter;
+$route = SimpleRouter::router()->getLoadedRoute();
+
+$route->setCallback('Example\MyCustomClass@hello');
+
+// -- or you can rewrite by doing --
+
+$route->setClass('Example\MyCustomClass');
+$route->setMethod('hello');
+```
+
+### Examples
+
+It's only possible to change the route BEFORE the route has initially been loaded. If you want to redirect to another route, we highly recommend that you
+modify the `IRoute` object from a `Middleware` or `ExceptionHandler`, like the examples below.
+
+#### Rewriting to new route
+
+The example below will cause the router to re-route the request with another url. We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
+
+**NOTE: Use this method if you want to fully load another route using it's settings (request method etc).**
+
+
+```php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, ILoadableRoute &$route) {
+
+        $request->setUri(url('home'));
+
+    }
+}
+```
+
+#### Changing callback
+You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
+on some criteria's for the request.
+
+The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
+If you wish to change the callback from outside, please have this in mind.
+
+**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
+
+```php
+namespace Demo\Middlewares;
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+
+class CustomMiddleware implements Middleware {
+
+    public function handle(Request $request, ILoadableRoute &$route) {
+
+        $route->callback('DefaultController@home');
+
+    }
+
+}
+```
+
 ## Adding routes manually
 
 The ```SimpleRouter``` class referenced in the previous example, is just a simple helper class that knows how to communicate with the ```Router``` class.
@@ -1050,8 +992,8 @@ If you are up for a challenge, want the full control or simply just want to crea
 use \Pecee\SimpleRouter\Router;
 use \Pecee\SimpleRouter\Route\RouteUrl;
 
-/* Create new Router instance */
-$router = new Router();
+/* Grap the router instance */
+$router = Router::getInstance();
 
 $route = new RouteUrl('/answer/1', function() {
 
@@ -1059,7 +1001,7 @@ $route = new RouteUrl('/answer/1', function() {
 
 });
 
-$route->setMiddleware(\Demo\Middlewares\AuthMiddleware::class);
+$route->setMiddleware('\Demo\Middlewares\AuthMiddleware');
 $route->setNamespace('\Demo\Controllers');
 $route->setPrefix('v1');
 
@@ -1101,7 +1043,6 @@ class Router extends SimpleRouter {
 # Credits
 
 ## Sites
-
 This is some sites that uses the simple-router project in production.
 
 - [holla.dk](http://www.holla.dk)

composer.json

@@ -1,32 +1,26 @@
 {
-  "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.",
-  "keywords": [
-    "router",
-    "routing",
-    "laravel",
-    "pecee",
-    "route"
-  ],
-  "license": "MIT",
-  "support": {
-    "source": "https://github.com/skipperbent/simple-php-router/issues"
-  },
-  "authors": [
-    {
-      "name": "Simon Sessingø",
-      "email": "simon.sessingoe@gmail.com"
+ 	"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.",
+ 	"keywords": [ "router", "routing", "laravel", "pecee" ],
+	"license": "MIT",
+	"support": {
+			"source": "https://github.com/skipperbent/simple-php-router/issues"
+    },
+	"authors": [
+    	{
+        	 "name": "Simon Sessingø",
+           	 "email": "simon.sessingoe@gmail.com"
+        }
+	],
+	"require": {
+		"php": ">=5.4.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.7.7"
+    },
+    "autoload": {
+        "psr-4": {
+            "Pecee\\": "src/Pecee/"
+        }
     }
-  ],
-  "require": {
-    "php": ">=5.4.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "4.7.7"
-  },
-  "autoload": {
-    "psr-4": {
-      "Pecee\\": "src/Pecee/"
-    }
-  }
 }

src/Pecee/Controllers/IResourceController.php

@@ -1,47 +0,0 @@
-<?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

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

src/Pecee/Handlers/IExceptionHandler.php

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

src/Pecee/Http/Input/IInputItem.php

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

src/Pecee/Http/Input/Input.php

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

src/Pecee/Http/Input/InputFile.php

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

src/Pecee/Http/Input/InputItem.php

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

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

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

src/Pecee/Http/Middleware/IMiddleware.php

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

src/Pecee/Http/Request.php

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

src/Pecee/Http/Response.php

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

src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php

@@ -3,5 +3,4 @@ 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
-     *
-     * @param Request $request
-     * @return Request
-     */
-    public function boot(Request $request);
+	/**
+	 * Called when router loads it's routes
+	 *
+	 * @param Request $request
+	 * @return Request
+	 */
+	public function boot(Request $request);
 }

src/Pecee/SimpleRouter/Route/IControllerRoute.php

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

src/Pecee/SimpleRouter/Route/IGroupRoute.php

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

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

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

src/Pecee/SimpleRouter/Route/IRoute.php

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

src/Pecee/SimpleRouter/Route/LoadableRoute.php

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

src/Pecee/SimpleRouter/Route/RouteController.php

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

src/Pecee/SimpleRouter/Route/RouteGroup.php

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

src/Pecee/SimpleRouter/Route/RouteResource.php

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

src/Pecee/SimpleRouter/Route/RouteUrl.php

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

src/Pecee/SimpleRouter/SimpleRouter.php

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

test/Dummy/DummyController.php

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

test/Dummy/DummyMiddleware.php

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

test/Dummy/Exceptions/ExceptionHandlerException.php

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

test/Dummy/Exceptions/ResponseException.php

@@ -1,18 +0,0 @@
-<?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, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route = null, \Exception $error)
 	{
-	    echo $error->getMessage();
+		throw $error;
 	}
 
 }

test/Dummy/Handler/ExceptionHandlerFirst.php

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

test/Dummy/Handler/ExceptionHandlerSecond.php

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

test/Dummy/Handler/ExceptionHandlerThird.php

@@ -1,13 +0,0 @@
-<?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

@@ -1,39 +0,0 @@
-<?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,82 +2,94 @@
 
 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()
-    {
-        $this->result = false;
+	public function testGroupLoad()
+	{
+		$this->result = false;
 
-        TestRouter::group(['prefix' => '/group'], function () {
-            $this->result = true;
-        });
+		SimpleRouter::group(['prefix' => '/group'], function () {
+			$this->result = true;
+		});
 
-        try {
-            TestRouter::debug('/', 'get');
-        } catch(\Exception $e) {
+		try {
+			SimpleRouter::start();
+		} catch (Exception $e) {
+			// ignore RouteNotFound exception
+		}
 
-        }
-        $this->assertTrue($this->result);
-    }
+		$this->assertTrue($this->result);
+	}
 
-    public function testNestedGroup()
-    {
+	public function testNestedGroup()
+	{
 
-        TestRouter::group(['prefix' => '/api'], function () {
+		SimpleRouter::router()->reset();
+		SimpleRouter::request()->setUri('/api/v1/test');
+		SimpleRouter::request()->setMethod('get');
 
-            TestRouter::group(['prefix' => '/v1'], function () {
-                TestRouter::get('/test', 'DummyController@method1');
-            });
+		SimpleRouter::group(['prefix' => '/api'], function () {
 
-        });
+			SimpleRouter::group(['prefix' => '/v1'], function () {
+				SimpleRouter::get('/test', 'DummyController@start');
+			});
 
-        TestRouter::debug('/api/v1/test', 'get');
+		});
 
-    }
+		SimpleRouter::start();
+	}
 
-    public function testMultipleRoutes()
-    {
+	public function testManyRoutes()
+	{
 
-        TestRouter::group(['prefix' => '/api'], function () {
+		SimpleRouter::router()->reset();
+		SimpleRouter::request()->setUri('/my/match');
+		SimpleRouter::request()->setMethod('get');
 
-            TestRouter::group(['prefix' => '/v1'], function () {
-                TestRouter::get('/test', 'DummyController@method1');
-            });
+		SimpleRouter::group(['prefix' => '/api'], function () {
 
-        });
+			SimpleRouter::group(['prefix' => '/v1'], function () {
+				SimpleRouter::get('/test', 'DummyController@start');
+			});
 
-        TestRouter::get('/my/match', 'DummyController@method1');
+		});
 
-        TestRouter::group(['prefix' => '/service'], function () {
+		SimpleRouter::get('/my/match', 'DummyController@start');
 
-            TestRouter::group(['prefix' => '/v1'], function () {
-                TestRouter::get('/no-match', 'DummyController@method1');
-            });
+		SimpleRouter::group(['prefix' => '/service'], function () {
 
-        });
+			SimpleRouter::group(['prefix' => '/v1'], function () {
+				SimpleRouter::get('/no-match', 'DummyController@start');
+			});
 
-        TestRouter::debug('/my/match', 'get');
-    }
+		});
 
-    public function testUrls()
-    {
-        // Test array name
-        TestRouter::get('/my/fancy/url/1', 'DummyController@method1', ['as' => 'fancy1']);
+		SimpleRouter::start();
+	}
 
-        // Test method name
-        TestRouter::get('/my/fancy/url/2', 'DummyController@method1')->setName('fancy2');
+	public function testUrls()
+	{
 
-        TestRouter::debugNoReset('/my/fancy/url/1');
+		SimpleRouter::router()->reset();
+		SimpleRouter::request()->setUri('/my/fancy/url/1');
+		SimpleRouter::request()->setMethod('get');
 
-        $this->assertEquals('/my/fancy/url/1/', TestRouter::getUrl('fancy1'));
-        $this->assertEquals('/my/fancy/url/2/', TestRouter::getUrl('fancy2'));
+		// Test array name
+		SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
 
-        TestRouter::router()->reset();
+		// Test method name
+		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

@@ -1,41 +0,0 @@
-<?php
-
-class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
-{
-
-    public static function debugNoReset($testUri, $testMethod = 'get')
-    {
-        static::request()->setUri($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,32 +3,30 @@
 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()
-    {
-        $this->setExpectedException(MiddlewareLoadedException::class);
+	public function testMiddlewareFound()
+	{
+		SimpleRouter::router()->reset();
+		SimpleRouter::request()->setMethod('get');
+		SimpleRouter::request()->setUri('/my/test/url');
 
-        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
-        });
+		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+			SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
+		});
 
-        TestRouter::debug('/my/test/url', 'get');
+		$found = false;
 
-    }
+		try {
+			SimpleRouter::start();
+		} catch (\Exception $e) {
+			$found = ($e instanceof MiddlewareLoadedException);
+		}
 
-    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');
-    }
+		$this->assertTrue($found);
+	}
 
 }

test/RouterResourceTest.php

@@ -1,70 +0,0 @@
-<?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

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

test/RouterRouteTest.php

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

test/RouterUrlTest.php

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