Merge pull request #251 from skipperbent/v3-development

V3 development
Merge pull request #250 from skipperbent/bugfix-urlmatch
2026-06-17 16:57:53 +00:00 · 2017-08-01 21:30:42 +02:00 · 2017-08-01 21:30:13 +02:00 · 2017-08-01 21:25:44 +02:00 · 2017-08-01 21:09:18 +02:00 · 2017-08-01 18:29:47 +02:00
45 changed files with 2168 additions and 1163 deletions
@@ -1,4 +1,3 @@
 .idea
 composer.lock
-vendor/
-demo-project/vendor
+vendor/
@@ -15,71 +15,75 @@ If you want a great new feature or experience any issues what-so-ever, please fe

 ## Table of Contents

- Gettings started
-	- Requirements
-	- Notes
-	- Features
-	- Installation
-		- Setting up Apache
-		- Setting up Nginx
-		- Setting up simple-php-router
-		- Helper methods
+- [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)

- 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
+- [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)
+		- [Custom regex for matching parameters](#custom-regex-for-matching-parameters)
+	- [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)

- CSRF-protection
-	- Adding CSRF-verifier
-	- Getting CSRF-token
+- [CSRF-protection](#csrf-protection)
+	- [Adding CSRF-verifier](#adding-csrf-verifier)
+	- [Getting CSRF-token](#getting-csrf-token)

- Middleware
-	- Example
- ExceptionHandler
-	- Example
+- [Middlewares](#middlewares)
+	- [Example](#example)
+- [ExceptionHandlers](#exceptionhandlers)
+    - [Handling 404, 403 and other errors](#handling-404-403-and-other-errors)
+	- [Using custom exception handlers](#using-custom-exception-handlers)

- 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
+- [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)

- Input & parameters
-	- Return single parameter value
-	- Return single parameter object
-	- Managing files
-	- Return all parameters
+- [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)

- Advanced
-	- Bootmanager: loading routes dynamically
-	- Ovewrite route about to be loaded
-		- Examples
-		- Rewriting to new route
-		- Changing callback
+- [Advanced](#advanced)
+	- [Url rewriting](#url-rewriting)
+		- [Rewrite using callback](#rewrite-using-callback)
+		- [Rewrite using url](#rewrite-using-url)
+		- [Bootmanager: loading routes dynamically](#bootmanager-loading-routes-dynamically)
+		- [Adding routes manually](#adding-routes-manually)
+	- [Parameters](#parameters)
+        - [Custom default regex for matching parameters](#custom-default-regex-for-matching-parameters)
+	- [Extending](#extending)

-	- Adding routes manually
-	- Extending
-
- Credits
-	- Sites
-	- License
+- [Credits](#credits)
+	- [Sites](#sites)
+	- [License](#license)

 ___

@@ -92,8 +96,7 @@ composer require pecee/simple-router

 ## Requirements

- PHP 5.4 or greater
- mcrypt extension
+- PHP 5.5 or greater

 ## Notes

@@ -155,7 +158,21 @@ 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.

-### Setting up simple-php-router
+#### .htaccess example
+
+Below is an example of an working `.htaccess` file used by simple-php-router.
+
+Simply create a new `.htaccess` file in your projects `public` directory and paste the contents below in your newly created file. This will redirect all requests to your `index.php` file (see Configuration section below).
+
+```
+RewriteEngine on
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteCond %{SCRIPT_FILENAME} !-l
+RewriteRule ^(.*)$ index.php/$1
+```
+
+### Configuration

 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,8 +210,6 @@ 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.
 *
@@ -212,41 +227,43 @@ use Pecee\SimpleRouter\SimpleRouter;
 * @param array|null $getParams
 * @return string
 */
-function url($name = null, $parameters = null, $getParams = null) {
-    SimpleRouter::getUrl($name, $parameters, $getParams);
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return SimpleRouter::getUrl($name, $parameters, $getParams);
 }

 /**
- * Get current csrf-token
- * @return null|string
- */
-function csrf_token() {
-    $token = new \Pecee\CsrfToken();
-    return $token->getToken();
-}
-
-/**
- * Get request object
- * @return \Pecee\Http\Request
- */
-function request() {
-    return SimpleRouter::request();
-}
-
-/**
- * Get response object
 * @return \Pecee\Http\Response
 */
-function response() {
+function response()
+{
    return SimpleRouter::response();
 }

+/**
+ * @return \Pecee\Http\Request
+ */
+function request()
+{
+    return SimpleRouter::request();
+}
+
 /**
 * Get input class
 * @return \Pecee\Http\Input\Input
 */
-function input() {
-    return SimpleRouter::request()->getInput();
+function input()
+{
+    return request()->getInput();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
 }
 ```

@@ -365,7 +382,7 @@ The example below is using the following regular expression: `/ajax/([\w]+)/?([0

 **Matches:** `/ajax/abc/`, `/ajax/abc/123/`

-**Doesn't match:** `/ajax/`
+**Won't match:** `/ajax/`

 Match groups specified in the regex will be passed on as parameters:

@@ -376,13 +393,42 @@ SimpleRouter::all('/ajax/abc/123', function($param1, $param2) {
 })->setMatch('/\/ajax\/([\w]+)\/?([0-9]+)?\/?/is');
 ```

+### Custom regex for matching parameters
+
+By default simple-php-router uses the `\w` regular expression when matching parameters. 
+This decision was made with speed and reliability in mind, as this match will match both letters, number and most of the used symbols on the internet.
+
+However, sometimes it can be necessary to add a custom regular expression to match more advanced characters like `-` etc. 
+
+Instead of adding a custom regular expression to all your parameters, you can simply add a global regular expression which will be used on all the parameters on the route. 
+
+**Note:** If you the regular expression to be available across, we recommend using the global parameter on a group as demonstrated in the examples below.
+
+#### Example
+
+This example will ensure that all parameters use the `[\w\-]+` regular expression when parsing.
+
+```php
+SimpleRouter::get('/path/{parameter}', 'VideoController@home', ['defaultParameterRegex' => '[\w\-]+']);
+```
+
+You can also apply this setting to a group if you need multiple routes to use your custom regular expression when parsing parameters.
+
+```php
+SimpleRouter::group(['defaultParameterRegex' => '[\w\-]+'], function() {
+
+    SimpleRouter::get('/path/{parameter}', 'VideoController@home');
+
+});
+```
+
 ## Named routes

 Named routes allow the convenient generation of URLs or redirects for specific routes. You may specify a name for a route by chaining the name method onto the route definition:

 ```php
 SimpleRouter::get('/user/profile', function () {
-    //
+    // Your code here
 })->name('profile');
 ```

@@ -422,7 +468,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'], function () {
+SimpleRouter::group(['middleware' => \Demo\Middleware\Auth::class], function () {
    SimpleRouter::get('/', function ()    {
        // Uses Auth Middleware
    });
@@ -437,6 +483,11 @@ SimpleRouter::group(['middleware' => '\Demo\Middleware\Auth'], 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
@@ -480,7 +531,8 @@ 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::router()->getLoadedRoute();
+SimpleRouter::request()->getLoadedRoute();
+request()->getLoadedRoute();
 ```

 ## Other examples
@@ -494,7 +546,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 /* Adding custom csrfVerifier here */
 SimpleRouter::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());

-SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler' => 'Handlers\CustomExceptionHandler'], function() {
+SimpleRouter::group(['middleware' => \Demo\Middlewares\Site::class, 'exceptionHandler' => \Demo\Handlers\CustomExceptionHandler::class], function() {


    SimpleRouter::get('/answers/{id}', 'ControllerAnswers@show', ['where' => ['id' => '[0-9]+']]);
@@ -504,7 +556,7 @@ SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler
     * Restful resource (see IRestController interface for available methods)
     */

-    SimpleRouter::resource('/rest', 'ControllerRessource');
+    SimpleRouter::resource('/rest', ControllerRessource::class);


    /**
@@ -520,7 +572,7 @@ SimpleRouter::group(['middleware' => '\Demo\Middlewares\Site', 'exceptionHandler
     * etc.
     */

-    SimpleRouter::controller('/animals', 'ControllerAnimals');
+    SimpleRouter::controller('/animals', ControllerAnimals::class);

 });

@@ -585,13 +637,19 @@ 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) {
+    public function handle(Request $request) {

-        $request->setUri(url('home'));
+        // 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;
+        }

    }
 }
@@ -599,13 +657,30 @@ class CustomMiddleware implements Middleware {

 ---

-# ExceptionHandler
+# ExceptionHandlers

 ExceptionHandler are classes that handles all exceptions. ExceptionsHandlers must implement the `IExceptionHandler` interface.

-## Example
+## Handling 404, 403 and other errors

-Resource controllers can implement the `IRestController` interface, but is not required.
+If you simply want to catch a 404 (page not found) etc. you can use the `Router::error($callback)` static helper method. 
+
+This will add a callback method which is fired whenever an error occurs on all routes.
+
+The basic example below simply redirect the page to `/not-found` if an `NotFoundHttpException` (404) occurred. 
+The code should be placed in the file that contains your routes.
+
+```php
+Router::get('/not-found', 'PageController@notFound');
+
+Router::error(function(Request $request, \Exception $exception) {
+    if($exception instanceof NotFoundHttpException && $exception->getCode == 404) {
+        response()->redirect('/not-found');
+    }
+});
+```
+
+## Using custom exception handlers

 This is a basic example of an ExceptionHandler implementation (please see "[Easily overwrite route about to be loaded](#easily-overwrite-route-about-to-be-loaded)" for examples on how to change callback).

@@ -615,11 +690,10 @@ namespace Demo\Handlers;
 use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 class CustomExceptionHandler implements IExceptionHandler
 {
-	public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error)
+	public function handleError(Request $request, \Exception $error)
 	{

 		/* You can use the exception handler to format errors depending on the request and type. */
@@ -636,14 +710,9 @@ class CustomExceptionHandler implements IExceptionHandler
 		/* 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.
-			 */
+			// Render custom 404-page

-			$request->setUri(url('page.notfound'));
+			$request->setRewriteCallback('Demo\Controllers\PageController@notFound');
 			return $request;

 		}
@@ -661,7 +730,7 @@ class CustomExceptionHandler implements IExceptionHandler

 By default all controller and resource routes will use a simplified version of their url as name.

-### Get routes using custom name (single route)
+### Get by name (single route)

 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -674,10 +743,10 @@ url('product', null, ['category' => 'shoes']);
 # /product-view/?category=shoes
 ```

-### Getting the url using the name (controller route)
+### Get by name (controller route)

 ```php
-SimpleRouter::controller('/images', 'ImagesController', ['as' => 'picture']);
+SimpleRouter::controller('/images', ImagesController::class, ['as' => 'picture']);

 url('picture@getView', null, ['category' => 'shoes']);
 url('picture', 'getView', ['category' => 'shoes']);
@@ -689,7 +758,7 @@ url('picture', 'view');
 # /images/view/
 ```

-### Getting the url using class
+### Get by class

 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
@@ -706,7 +775,7 @@ url('ImagesController@getImage', null, ['id' => 22]);
 ### Using custom names for methods on a controller/resource route

 ```php
-SimpleRouter::controller('gadgets', 'GadgetsController', ['names' => ['getIphoneInfo' => 'iphone']]);
+SimpleRouter::controller('gadgets', GadgetsController::class, ['names' => ['getIphoneInfo' => 'iphone']]);

 url('gadgets.iphone');

@@ -717,7 +786,7 @@ url('gadgets.iphone');
 ### Getting REST/resource controller urls

 ```php
-SimpleRouter::resource('/phones', 'PhonesController');
+SimpleRouter::resource('/phones', PhonesController::class);

 url('phones');
 url('phones.index');
@@ -732,7 +801,7 @@ url('phones.edit');
 # /phones/edit/
 ```

-### Return the current url
+### Get the current url

 ```php
 url();
@@ -749,17 +818,17 @@ url(null, null, ['q' => 'cars']);

 We've added the `Input` class to easy access and manage parameters from your Controller-classes.

-**Return single parameter value (matches both GET, POST, FILE):**
+### Get single parameter value:

 If items is grouped in the html, it will return an array of items.

 **Note:** `get` will automatically trim the value and ensure that it's not empty. If it's empty the `$defaultValue` will be returned.

 ```php
-$value = input()->get($index, $defaultValue);
+$value = input()->get($index, $defaultValue, $methods);
 ```

-**Return parameter object (matches both GET, POST, FILE):**
+### Get parameter object

 Will return an instance of `InputItem` or `InputFile` depending on the type.

@@ -772,10 +841,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);
+$object = input()->getObject($index, $defaultValue = null, $methods = null);
 ```

-**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) --
@@ -799,9 +868,11 @@ $object = input()->get($index, $defaultValue, 'file');
 $object = input()->findGet($index, $defaultValue);
 $object = input()->findPost($index, $defaultValue);
 $object = input()->findFile($index, $defaultValue);
+```

-# -- examples --
+### Managing files

+```php
 /**
 * In this small example we loop through a collection of files
 * added on the page like this
@@ -819,9 +890,10 @@ foreach(input()->get('images', []) as $image)

    }
 }
+
 ```

-**Return all parameters:**
+### Get all parameters

 ```php
 // Get all
@@ -853,15 +925,138 @@ All object implements the `IInputItem` interface and will always contain these m
 Below example requires you to have the helper functions added. Please refer to the helper functions section in the documentation.

 ```php
-// Get parameter site_id or default-value 2
-$siteId = input()->get('site_id', 2);
+/* Get parameter site_id or default-value 2 from either post-value or query-string */
+$siteId = input()->get('site_id', 2, ['post', 'get']);
 ```

 ---

 # Advanced

-## Load routes dynamicially using the router bootmanager
+## 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');
+```
+
+**Note:** 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

 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.

@@ -877,7 +1072,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) {
@@ -885,11 +1080,11 @@ class CustomRouterRules implement IRouterBootManager {
            // If the current uri matches the url, we use our custom route

            if($request->getUri() === $url) {
-                $request->setUri($rule);
+                $request->setRewriteUrl($rule);
+                return $request;
            }
        }

-        return $request;
    }

 }
@@ -907,83 +1102,7 @@ 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
+### 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.
 If you are up for a challenge, want the full control or simply just want to create your own ```Router``` helper class, this example is for you.
@@ -992,8 +1111,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;

-/* Grap the router instance */
-$router = Router::getInstance();
+/* Create new Router instance */
+$router = new Router();

 $route = new RouteUrl('/answer/1', function() {

@@ -1001,7 +1120,7 @@ $route = new RouteUrl('/answer/1', function() {

 });

-$route->setMiddleware('\Demo\Middlewares\AuthMiddleware');
+$route->addMiddleware(\Demo\Middlewares\AuthMiddleware::class);
 $route->setNamespace('\Demo\Controllers');
 $route->setPrefix('v1');

@@ -1009,6 +1128,10 @@ $route->setPrefix('v1');
 $router->addRoute($route);
 ```

+## Parameters
+
+This section contains advanced tips & tricks on extending the usage for parameters.
+
 ## Extending

 This is a simple example of an integration into a framework.
@@ -1043,6 +1166,7 @@ class Router extends SimpleRouter {
 # Credits

 ## Sites
+
 This is some sites that uses the simple-router project in production.

 - [holla.dk](http://www.holla.dk)
@@ -1,26 +1,35 @@
 {
- 	"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/"
-        }
+  "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",
+    "router",
+    "routing",
+    "route",
+    "simple-php-router",
+    "laravel",
+    "pecee",
+    "php"
+  ],
+  "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/"
+    }
+  }
 }
@@ -1,47 +1,47 @@
 <?php
 namespace Pecee\Controllers;

-interface IRestController
+interface IResourceController
 {

    /**
     * @return void
     */
-    function index();
+    public function index();

    /**
     * @param mixed $id
     * @return void
     */
-    function show($id);
+    public function show($id);

    /**
     * @return void
     */
-    function store();
+    public function store();

    /**
     * @return void
     */
-    function create();
+    public function create();

    /**
     * View
     * @param mixed $id
     * @return void
     */
-    function edit($id);
+    public function edit($id);

    /**
     * @param mixed $id
     * @return void
     */
-    function update($id);
+    public function update($id);

    /**
     * @param mixed $id
     * @return void
     */
-    function destroy($id);
+    public function destroy($id);

 }
@@ -3,13 +3,14 @@ namespace Pecee;

 class CsrfToken
 {
-    const CSRF_KEY = 'XSRF-TOKEN';
+    const CSRF_KEY = 'CSRF-TOKEN';

    protected $token;

    /**
     * Generate random identifier for CSRF token
     *
+     * @throws \RuntimeException
     * @return string
     */
    public static function generateToken()
@@ -18,7 +19,14 @@ class CsrfToken
            return bin2hex(random_bytes(32));
        }

-        return bin2hex(openssl_random_pseudo_bytes(32));
+        $isSourceStrong = false;
+
+        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
+        if ($isSourceStrong === false || $random === false) {
+            throw new \RuntimeException('IV generation failed');
+        }
+
+        return $random;
    }

    /**
@@ -52,7 +60,7 @@ class CsrfToken
     */
    public function getToken()
    {
-        if ($this->hasToken()) {
+        if ($this->hasToken() === true) {
            return $_COOKIE[static::CSRF_KEY];
        }

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

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 interface IExceptionHandler
 {
    /**
     * @param Request $request
-     * @param ILoadableRoute $route
     * @param \Exception $error
     * @return Request|null
     */
-    public function handleError(Request $request, ILoadableRoute &$route = null, \Exception $error);
+    public function handleError(Request $request, \Exception $error);

 }
@@ -14,8 +14,6 @@ interface IInputItem

    public function getValue();

-    public function setValue($value);
-
    public function __toString();

 }
@@ -32,7 +32,7 @@ class Input
        $this->parseInputs();
    }

-    protected function parseInputs()
+    public function parseInputs()
    {
        /* Parse get requests */
        if (count($_GET) > 0) {
@@ -42,7 +42,7 @@ class Input
        /* Parse post requests */
        $postVars = $_POST;

-        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete']) === true) {
+        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
            parse_str(file_get_contents('php://input'), $postVars);
        }

@@ -51,49 +51,97 @@ class Input
        }

        /* Parse get requests */
-
        if (count($_FILES) > 0) {
-
-            $max = count($_FILES) - 1;
-            $keys = array_keys($_FILES);
-
-            for ($i = $max; $i >= 0; $i--) {
-
-                $key = $keys[$i];
-                $value = $_FILES[$key];
-
-                // Handle array input
-                if (is_array($value['name']) === false) {
-                    $values['index'] = $key;
-                    $this->file[$key] = InputFile::createFromArray(array_merge($value, $values));
-                    continue;
-                }
-
-                $subMax = count($value['name']) - 1;
-                $keys = array_keys($value['name']);
-                $output = [];
-
-                for ($i = $subMax; $i >= 0; $i--) {
-
-                    $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]],
-                    ]);
-
-                }
-
-                $this->file[$key] = $output;
-            }
+            $this->file = $this->parseFiles();
        }
    }

-    protected function handleGetPost($array)
+    public function parseFiles()
    {
-        $tmp = [];
+        $list = [];
+
+        foreach ((array)$_FILES as $key => $value) {
+
+            // Handle array input
+            if (is_array($value['name']) === false) {
+                $values['index'] = $key;
+                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
+                continue;
+            }
+
+            $keys = [];
+
+            $files = $this->rearrangeFiles($value['name'], $keys, $value);
+
+            if (isset($list[$key])) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
+
+        }
+
+        return $list;
+    }
+
+    protected function rearrangeFiles(array $values, &$index, $original)
+    {
+
+        $output = [];
+
+        $getItem = function ($key, $property = 'name') use ($original, $index) {
+
+            $path = $original[$property];
+
+            $fileValues = array_values($index);
+
+            foreach ($fileValues as $i) {
+                $path = $path[$i];
+            }
+
+            return $path[$key];
+        };
+
+        foreach ($values as $key => $value) {
+
+            if (is_array($getItem($key)) === false) {
+
+                $file = InputFile::createFromArray([
+                    'index'    => $key,
+                    'filename' => $getItem($key),
+                    'error'    => $getItem($key, 'error'),
+                    'tmp_name' => $getItem($key, 'tmp_name'),
+                    'type'     => $getItem($key, 'type'),
+                    'size'     => $getItem($key, 'size'),
+                ]);
+
+                if (isset($output[$key])) {
+                    $output[$key][] = $file;
+                } else {
+                    $output[$key] = $file;
+                }
+
+                continue;
+            }
+
+            $index[] = $key;
+
+            $files = $this->rearrangeFiles($value, $index, $original);
+
+            if (isset($output[$key])) {
+                $output[$key][] = $files;
+            } else {
+                $output[$key] = $files;
+            }
+
+        }
+
+        return $output;
+    }
+
+    protected function handleGetPost(array $array)
+    {
+        $list = [];

        $max = count($array) - 1;
        $keys = array_keys($array);
@@ -105,77 +153,110 @@ class Input

            // Handle array input
            if (is_array($value) === false) {
-                $tmp[$key] = new InputItem($key, $value);
+                $list[$key] = new InputItem($key, $value);
                continue;
            }

-            $subMax = count($value) - 1;
-            $keys = array_keys($value);
-            $output = [];
+            $output = $this->handleGetPost($value);

-            for ($i = $subMax; $i >= 0; $i--) {
-                $output[$keys[$i]] = new InputItem($key, $value[$keys[$i]]);
-            }
-
-            $tmp[$key] = $output;
+            $list[$key] = $output;
        }

-        return $tmp;
+        return $list;
    }

-    public function findPost($index, $default = null)
+    /**
+     * 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] : $default;
+        return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
    }

-    public function findFile($index, $default = null)
+    /**
+     * 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] : $default;
+        return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
    }

-    public function findGet($index, $default = null)
+    /**
+     * 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] : $default;
+        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
    }

-    public function getObject($index, $default = null, $method = null)
+    /**
+     * Get input object
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
+     * @return IInputItem|string
+     */
+    public function getObject($index, $defaultValue = null, $methods = null)
    {
+        if ($methods !== null && is_string($methods) === true) {
+            $methods = [$methods];
+        }
+
        $element = null;

-        if ($method === null || strtolower($method) === 'get') {
+        if ($methods === null || in_array('get', $methods)) {
            $element = $this->findGet($index);
        }

-        if ($element === null && $method === null || strtolower($method) === 'post') {
+        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
            $element = $this->findPost($index);
        }

-        if ($element === null && $method === null || strtolower($method) === 'file') {
+        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
            $element = $this->findFile($index);
        }

-        return ($element === null) ? $default : $element;
+        return ($element !== null) ? $element : $defaultValue;
    }

    /**
     * Get input element value matching index
     *
     * @param string $index
-     * @param string|null $default
-     * @param string|null $method
+     * @param string|null $defaultValue
+     * @param array|string|null $methods
     * @return InputItem|string
     */
-    public function get($index, $default = null, $method = null)
+    public function get($index, $defaultValue = null, $methods = null)
    {
-        $input = $this->getObject($index, $default, $method);
+        $input = $this->getObject($index, $defaultValue, $methods);

        if ($input instanceof InputItem) {
-            return (trim($input->getValue()) === '') ? $default : $input->getValue();
+            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
        }

        return $input;
    }

+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @return bool
+     */
    public function exists($index)
    {
        return ($this->getObject($index) !== null);
@@ -194,7 +275,7 @@ class Input

            $contents = file_get_contents('php://input');

-            if (stripos(trim($contents), '{') === 0) {
+            if (strpos(trim($contents), '{') === 0) {
                $output = json_decode($contents, true);
                if ($output === false) {
                    $output = [];
@@ -202,19 +283,7 @@ class Input
            }
        }

-        $output = array_merge($_GET, $output);
-
-        if ($filter !== null) {
-            $output = array_filter($output, function ($key) use ($filter) {
-                if (in_array($key, $filter)) {
-                    return true;
-                }
-
-                return false;
-            }, ARRAY_FILTER_USE_KEY);
-        }
-
-        return $output;
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output);
    }

 }
@@ -4,8 +4,8 @@ namespace Pecee\Http\Input;
 class InputFile implements IInputItem
 {
    public $index;
-    public $value;
    public $name;
+    public $filename;
    public $size;
    public $type;
    public $error;
@@ -21,7 +21,9 @@ class InputFile implements IInputItem

    /**
     * Create from array
+     *
     * @param array $values
+     * @throws \InvalidArgumentException
     * @return static
     */
    public static function createFromArray(array $values)
@@ -30,14 +32,23 @@ class InputFile implements IInputItem
            throw new \InvalidArgumentException('Index key is required');
        }

-        $input = new static($values['index']);
-        $input->setError(isset($values['error']) ? $values['error'] : null);
-        $input->setName(isset($values['name']) ? $values['name'] : null);
-        $input->setSize(isset($values['size']) ? $values['size'] : null);
-        $input->setType(isset($values['type']) ? $values['type'] : null);
-        $input->setTmpName(isset($values['tmp_name']) ? $values['tmp_name'] : null);
+        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
+
+        $values = array_merge([
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ], $values);
+
+        return (new static($values['index']))
+            ->setSize($values['size'])
+            ->setError($values['error'])
+            ->setType($values['type'])
+            ->setTmpName($values['tmp_name'])
+            ->setFilename($values['name']);

-        return $input;
    }

    /**
@@ -48,6 +59,11 @@ class InputFile implements IInputItem
        return $this->index;
    }

+    /**
+     * Set input index
+     * @param string $index
+     * @return static $this
+     */
    public function setIndex($index)
    {
        $this->index = $index;
@@ -75,6 +91,10 @@ class InputFile implements IInputItem
        return $this;
    }

+    /**
+     * Get mime-type of file
+     * @return string
+     */
    public function getMime()
    {
        return $this->getType();
@@ -100,12 +120,19 @@ class InputFile implements IInputItem
        return $this;
    }

+    /**
+     * Returns extension without "."
+     *
+     * @return string
+     */
    public function getExtension()
    {
-        return pathinfo($this->getName(), PATHINFO_EXTENSION);
+        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
    }

    /**
+     * Get human friendly name
+     *
     * @return string
     */
    public function getName()
@@ -113,6 +140,13 @@ class InputFile implements IInputItem
        return $this->name;
    }

+    /**
+     * Set human friendly name.
+     * Useful for adding validation etc.
+     *
+     * @param string $name
+     * @return static $this
+     */
    public function setName($name)
    {
        $this->name = $name;
@@ -120,29 +154,63 @@ class InputFile implements IInputItem
        return $this;
    }

+    /**
+     * Set filename
+     *
+     * @param string $name
+     * @return static $this
+     */
+    public function setFilename($name)
+    {
+        $this->filename = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get filename
+     *
+     * @return string mixed
+     */
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Move the uploaded temporary file to it's new home
+     *
+     * @param string $destination
+     * @return bool
+     */
    public function move($destination)
    {
        return move_uploaded_file($this->tmpName, $destination);
    }

+    /**
+     * Get file contents
+     *
+     * @return string
+     */
    public function getContents()
    {
        return file_get_contents($this->tmpName);
    }

-    public function setValue($value)
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
+    /**
+     * Return true if an upload error occurred.
+     *
+     * @return bool
+     */
    public function hasError()
    {
        return ($this->getError() !== 0);
    }

    /**
+     * Get upload-error code.
+     *
     * @return string
     */
    public function getError()
@@ -152,6 +220,7 @@ class InputFile implements IInputItem

    /**
     * Set error
+     *
     * @param int $error
     * @return static $this
     */
@@ -162,27 +231,6 @@ class InputFile implements IInputItem
        return $this;
    }

-    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();
-    }
-
-    public function getValue()
-    {
-        return $this->getTmpName();
-    }
-
    /**
     * @return string
     */
@@ -202,4 +250,26 @@ class InputFile implements IInputItem

        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,
+        ];
+    }
+
 }
@@ -75,4 +75,5 @@ class InputItem implements IInputItem
    {
        return (string)$this->value;
    }
+
 }
@@ -4,7 +4,6 @@ namespace Pecee\Http\Middleware;
 use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 class BaseCsrfVerifier implements IMiddleware
 {
@@ -55,10 +54,10 @@ class BaseCsrfVerifier implements IMiddleware
        return false;
    }

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

-        if (in_array($request->getMethod(), ['post', 'put', 'delete']) === true && $this->skip($request) === false) {
+        if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {

            $token = $request->getInput()->get(static::POST_KEY, null, 'post');

@@ -77,7 +76,7 @@ class BaseCsrfVerifier implements IMiddleware

    public function generateToken()
    {
-        $token = $this->csrfToken->generateToken();
+        $token = CsrfToken::generateToken();
        $this->csrfToken->setToken($token);

        return $token;
@@ -85,7 +84,7 @@ class BaseCsrfVerifier implements IMiddleware

    public function hasToken()
    {
-        if ($this->token != null) {
+        if ($this->token !== null) {
            return true;
        }

@@ -2,15 +2,13 @@
 namespace Pecee\Http\Middleware;

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Route\ILoadableRoute;

 interface IMiddleware
 {
    /**
     * @param Request $request
-     * @param ILoadableRoute $route
     * @return Request|null
     */
-    public function handle(Request $request, ILoadableRoute &$route);
+    public function handle(Request $request);

 }
@@ -2,23 +2,37 @@
 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 = [];
+    private $data = [];
    protected $headers;
    protected $host;
    protected $uri;
    protected $method;
    protected $input;

+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;
+    protected $rewriteUrl;
+
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $loadedRoute;
+
    public function __construct()
    {
        $this->parseHeaders();
-        $this->host = $this->getHeader('http-host');;
+        $this->host = $this->getHeader('http-host');
        $this->uri = $this->getHeader('request-uri');
        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
    }

    protected function parseHeaders()
@@ -40,11 +54,7 @@ class Request

    public function isSecure()
    {
-        if ($this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443) {
-            return true;
-        }
-
-        return false;
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
    }

    /**
@@ -108,13 +118,24 @@ class Request
            return $this->getHeader('http-cf-connecting-ip');
        }

-        if ($this->getHeader('http-x-forwarded-for') !== null && strlen($this->getHeader('http-x-forwarded-for'))) {
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
            return $this->getHeader('http-x-forwarded_for');
        }

        return $this->getHeader('remote-addr');
    }

+    /**
+     * Get remote address/ip
+     *
+     * @alias static::getIp
+     * @return string
+     */
+    public function getRemoteAddr()
+    {
+        return $this->getIp();
+    }
+
    /**
     * Get referer
     * @return string
@@ -137,7 +158,7 @@ class Request
     * Get header value by name
     *
     * @param string $name
-     * @param object|null $defaultValue
+     * @param string|null $defaultValue
     *
     * @return string|null
     */
@@ -217,6 +238,108 @@ class Request
        $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;
@@ -64,14 +64,14 @@ class Response

        $this->headers([
            'Cache-Control: public',
-            'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
+            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',
            'Etag: ' . $eTag,
        ]);

        $httpModified = $this->request->getHeader('http-if-modified-since');
        $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');

-        if ($httpModified !== null && strtotime($httpModified) == $lastModified || $httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) {
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {

            $this->header('HTTP/1.1 304 Not Modified');

@@ -111,9 +111,8 @@ class Response
     */
    public function headers(array $headers)
    {
-        $max = count($headers);
-        for ($i = 0; $i < $max; $i++) {
-            $this->header($headers[$i]);
+        foreach ($headers as $header) {
+            $this->header($header);
        }

        return $this;
@@ -3,4 +3,5 @@ namespace Pecee\SimpleRouter\Exceptions;

 class NotFoundHttpException extends HttpException
 {
+
 }
@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

+use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;

 interface IGroupRoute extends IRoute
@@ -13,6 +15,14 @@ interface IGroupRoute extends IRoute
     */
    public function matchDomain(Request $request);

+    /**
+     * Add exception handler
+     *
+     * @param IExceptionHandler|string $handler
+     * @return static $this;
+     */
+    public function addExceptionHandler($handler);
+
    /**
     * Set exception-handlers for group
     *
@@ -20,9 +20,8 @@ interface ILoadableRoute extends IRoute
     * Loads and renders middlewares-classes
     *
     * @param Request $request
-     * @param ILoadableRoute $route
     */
-    public function loadMiddleware(Request $request, ILoadableRoute &$route);
+    public function loadMiddleware(Request $request);

    public function getUrl();

@@ -51,4 +50,19 @@ interface ILoadableRoute extends IRoute
     */
    public function setName($name);

+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch();
+
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex);
+
 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
@@ -8,17 +9,19 @@ interface IRoute
    /**
     * Method called to check if a domain matches
     *
+     * @param string $route
     * @param Request $request
     * @return bool
     */
-    public function matchRoute(Request $request);
+    public function matchRoute($route, Request $request);

    /**
     * Called when route is matched.
     * Returns class to be rendered.
     *
     * @param Request $request
-     * @return object
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @return void
     */
    public function renderRoute(Request $request);

@@ -112,21 +115,6 @@ interface IRoute

    public function getDefaultNamespace();

-    /**
-     * Get regular expression match used for matching route (if defined).
-     *
-     * @return string
-     */
-    public function getMatch();
-
-    /**
-     * Add regular expression match for the entire route.
-     *
-     * @param string $regex
-     * @return static
-     */
-    public function setMatch($regex);
-
    /**
     * Get parameter names.
     *
@@ -186,7 +174,7 @@ interface IRoute
     * @param string $middleware
     * @return static
     */
-    public function setMiddleware($middleware);
+    public function addMiddleware($middleware);

    /**
     * Set middlewares array
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Middleware\IMiddleware;
@@ -7,38 +8,58 @@ use Pecee\SimpleRouter\Exceptions\HttpException;

 abstract class LoadableRoute extends Route implements ILoadableRoute
 {
-    const PARAMETERS_REGEX_MATCH = '%s([\w\-\_]*?)\%s{0,1}%s';
-
+    /**
+     * @var string
+     */
    protected $url;
+
+    /**
+     * @var string
+     */
    protected $name;

+    protected $regex;
+
    /**
     * Loads and renders middlewares-classes
     *
     * @param Request $request
-     * @param ILoadableRoute $route
     * @throws HttpException
     */
-    public function loadMiddleware(Request $request, ILoadableRoute &$route)
+    public function loadMiddleware(Request $request)
    {
-        if (count($this->getMiddlewares()) > 0) {
+        $max = count($this->getMiddlewares());

-            $max = count($this->getMiddlewares());
+        if ($max > 0) {

            for ($i = 0; $i < $max; $i++) {

                $middleware = $this->getMiddlewares()[$i];

-                $middleware = $this->loadClass($middleware);
-                if (!($middleware instanceof IMiddleware)) {
-                    throw new HttpException($middleware . ' must be instance of Middleware');
+                if (is_object($middleware) === false) {
+                    $middleware = $this->loadClass($middleware);
                }

-                $middleware->handle($request, $route);
+                if (($middleware instanceof IMiddleware) === false) {
+                    throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+                }
+
+                $middleware->handle($request);
            }
        }
    }

+    public function matchRegex(Request $request, $url)
+    {
+        /* Match on custom defined regular expression */
+
+        if ($this->regex === null) {
+            return null;
+        }
+
+        return (preg_match($this->regex, $request->getHost() . $url) > 0);
+    }
+
    /**
     * Set url
     *
@@ -51,18 +72,11 @@ abstract class LoadableRoute extends Route implements ILoadableRoute

        if (strpos($this->url, $this->paramModifiers[0]) !== false) {

-            $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
-
-            if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
-
-                $max = count($matches[1]);
-
-                for ($i = 0; $i < $max; $i++) {
-                    $this->parameters[$matches[1][$i]] = null;
-                }
+            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);

+            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
+                $this->parameters = array_fill_keys($matches[1], null);
            }
-
        }

        return $this;
@@ -84,39 +98,40 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    public function findUrl($method = null, $parameters = null, $name = null)
    {
-        $url = '';
+        $url = $this->getUrl();

-        $parameters = (array)$parameters;
+        $group = $this->getGroup();

-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+        if ($group !== null && count($group->getDomains()) > 0) {
+            $url = '//' . $group->getDomains()[0] . $url;
        }

-        $url .= $this->getUrl();
-
-        $params = array_merge($this->getParameters(), $parameters);
-
-        /* Url that contains parameters that aren't recognized */
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
        $unknownParams = [];

-        /* Create the param string - {} */
+        /* Create the param string - {parameter} */
        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];

-        /* Create the param string with the optional symbol - {?} */
+        /* Create the param string with the optional symbol - {parameter?} */
        $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];

-        /* Let's parse the values of any {} parameter in the url */
+        /* Replace any {parameter} in the url with the correct value */

+        $params = $this->getParameters();
        $max = count($params) - 1;
        $keys = array_keys($params);

        for ($i = $max; $i >= 0; $i--) {
            $param = $keys[$i];
-            $value = $params[$param];
+            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];

-            $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
+            /* If parameter is specifically set to null - use the original-defined value */
+            if ($value === null && isset($this->originalParameters[$param])) {
+                $value = $this->originalParameters[$param];
+            }

            if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
+                /* Add parameter to the correct position */
                $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
            } else {
                $unknownParams[$param] = $value;
@@ -149,6 +164,29 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        return (strtolower($this->name) === strtolower($name));
    }

+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex)
+    {
+        $this->regex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch()
+    {
+        return $this->regex;
+    }
+
    /**
     * Sets the router name, which makes it easier to obtain the url or router at a later point.
     * Alias for LoadableRoute::setName().
@@ -1,12 +1,16 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

+use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;

 abstract class Route implements IRoute
 {
+    const PARAMETERS_REGEX_FORMAT = '%s([\w]+)(\%s?)%s';
+    const PARAMETERS_DEFAULT_REGEX = '[\w]+';
+
    const REQUEST_TYPE_GET = 'get';
    const REQUEST_TYPE_POST = 'post';
    const REQUEST_TYPE_PUT = 'put';
@@ -23,6 +27,14 @@ abstract class Route implements IRoute
        self::REQUEST_TYPE_DELETE,
    ];

+    /**
+     * If enabled parameters containing null-value
+     * will not be passed along to the callback.
+     *
+     * @var bool
+     */
+    protected $filterEmptyParams = false;
+    protected $defaultParameterRegex = null;
    protected $paramModifiers = '{}';
    protected $paramOptionalSymbol = '?';
    protected $group;
@@ -32,138 +44,131 @@ abstract class Route implements IRoute

    /* Default options */
    protected $namespace;
-    protected $regex;
    protected $requestMethods = [];
    protected $where = [];
    protected $parameters = [];
+    protected $originalParameters = [];
    protected $middlewares = [];

-    public function renderRoute(Request $request)
-    {
-        if ($this->getCallback() !== null && is_callable($this->getCallback())) {
-
-            /* When the callback is a function */
-            call_user_func_array($this->getCallback(), $this->getParameters());
-
-        } else {
-
-            /* When the callback is a method */
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-
-            $class = $this->loadClass($className);
-            $method = $controller[1];
-
-            if (!method_exists($class, $method)) {
-                throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            $parameters = array_filter($this->getParameters(), function ($var) {
-                return ($var !== null);
-            });
-
-            call_user_func_array([$class, $method], $parameters);
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
-    {
-        $parameterNames = [];
-        $regex = '';
-        $lastCharacter = '';
-        $isParameter = false;
-        $parameter = '';
-        $routeLength = strlen($route) - 1;
-
-        for ($i = $routeLength; $i >= 0; $i--) {
-
-            $character = strrev($route)[$i];
-
-            if ($character === '{') {
-                /* Remove "/" and "\" from regex */
-                if (substr($regex, strlen($regex) - 1) === '/') {
-                    $regex = substr($regex, 0, strlen($regex) - 2);
-                }
-
-                $isParameter = true;
-            } elseif ($isParameter && $character === '}') {
-                $required = true;
-
-                /* Check for optional parameter and use custom parameter regex if it exists */
-                if (is_array($this->where) === true && isset($this->where[$parameter])) {
-                    $parameterRegex = $this->where[$parameter];
-                }
-
-                if ($lastCharacter === '?') {
-                    $parameter = substr($parameter, 0, strlen($parameter) - 1);
-                    $regex .= '(?:\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?)?';
-                    $required = false;
-                } else {
-                    $regex .= '\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?';
-                }
-
-                $parameterNames[] = [
-                    'name'     => $parameter,
-                    'required' => $required,
-                ];
-
-                $parameter = '';
-                $isParameter = false;
-            } elseif ($isParameter) {
-                $parameter .= $character;
-            } elseif ($character === '/') {
-                $regex .= '\\' . $character;
-            } else {
-                $regex .= str_replace('.', '\\.', $character);
-            }
-
-            $lastCharacter = $character;
-        }
-
-        $parameterValues = [];
-
-        if (preg_match('/^' . $regex . '\/?$/is', $url, $parameterValues)) {
-
-            $parameters = [];
-
-            $max = count($parameterNames) - 1;
-
-            for ($i = $max; $i >= 0; $i--) {
-
-                $name = $parameterNames[$i];
-
-                $parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
-
-                if ($name['required'] && $parameterValue === null) {
-                    throw new HttpException('Missing required parameter ' . $name['name'], 404);
-                }
-
-                if ($name['required'] === false && $parameterValue === null) {
-                    continue;
-                }
-
-                $parameters[$name['name']] = $parameterValue;
-            }
-
-            return $parameters;
-        }
-
-        return null;
-    }
-
    protected function loadClass($name)
    {
-        if (!class_exists($name)) {
-            throw new NotFoundHttpException(sprintf('Class %s does not exist', $name), 404);
+        if (class_exists($name) === false) {
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
        }

        return new $name();
    }

+    public function renderRoute(Request $request)
+    {
+        $callback = $this->getCallback();
+
+        if ($callback === null) {
+            return;
+        }
+
+        /* Render callback function */
+        if (is_callable($callback) === true) {
+
+            /* When the callback is a function */
+            call_user_func_array($callback, $this->getParameters());
+
+            return;
+
+        }
+
+        /* When the callback is a class + method */
+        $controller = explode('@', $callback);
+
+        $namespace = $this->getNamespace();
+
+        $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
+
+        $class = $this->loadClass($className);
+        $method = $controller[1];
+
+        if (method_exists($class, $method) === false) {
+            throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
+        }
+
+        $parameters = $this->getParameters();
+
+        /* Filter parameters with null-value */
+
+        if ($this->filterEmptyParams === true) {
+            $parameters = array_filter($parameters, function ($var) {
+                return ($var !== null);
+            });
+        }
+
+        call_user_func_array([$class, $method], $parameters);
+    }
+
+    protected function parseParameters($route, $url, $parameterRegex = null)
+    {
+        $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+
+        $parameters = [];
+
+        // Ensures that hostnames/domains will work with parameters
+        $url = '/' . ltrim($url, '/');
+
+        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
+
+            foreach ($urlParts as $key => $t) {
+
+                $regex = '';
+
+                if ($key < count($parameters[1])) {
+
+                    $name = $parameters[1][$key];
+
+                    /* If custom regex is defined, use that */
+                    if (isset($this->where[$name]) === true) {
+                        $regex = $this->where[$name];
+                    } else {
+
+                        /* If method specific regex is defined use that, otherwise use the default parameter regex */
+                        if ($parameterRegex !== null) {
+                            $regex = $parameterRegex;
+                        } else {
+                            $regex = ($this->defaultParameterRegex === null) ? static::PARAMETERS_DEFAULT_REGEX : $this->defaultParameterRegex;
+                        }
+                    }
+
+                    $regex = sprintf('(?:\/|\-)' . $parameters[2][$key] . '(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
+
+                }
+
+                $urlParts[$key] = preg_quote($t, '/') . $regex;
+            }
+
+            $urlRegex = join('', $urlParts);
+
+        } else {
+            $urlRegex = preg_quote($route, '/');
+        }
+
+        if (preg_match('/^' . $urlRegex . '\/?/', $url, $matches) > 0) {
+
+            $values = [];
+
+            if (isset($parameters[1]) === true) {
+
+                /* Only take matched parameters with name */
+                foreach ($parameters[1] as $name) {
+                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+                }
+            }
+
+            return $values;
+        }
+
+        return null;
+    }
+
    /**
     * Returns callback name/identifier for the current route based on the callback.
     * Useful if you need to get a unique identifier for the loaded route, for instance
@@ -173,7 +178,7 @@ abstract class Route implements IRoute
     */
    public function getIdentifier()
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            return $this->callback;
        }

@@ -270,7 +275,7 @@ abstract class Route implements IRoute

    public function getMethod()
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            $tmp = explode('@', $this->callback);

            return $tmp[1];
@@ -281,7 +286,7 @@ abstract class Route implements IRoute

    public function getClass()
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            $tmp = explode('@', $this->callback);

            return $tmp[0];
@@ -339,29 +344,6 @@ abstract class Route implements IRoute
        return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
    }

-    /**
-     * Add regular expression match for the entire route.
-     *
-     * @param string $regex
-     * @return static
-     */
-    public function setMatch($regex)
-    {
-        $this->regex = $regex;
-
-        return $this;
-    }
-
-    /**
-     * Get regular expression match used for matching route (if defined).
-     *
-     * @return string
-     */
-    public function getMatch()
-    {
-        return $this->regex;
-    }
-
    /**
     * Export route settings to array so they can be merged with another route.
     *
@@ -383,17 +365,14 @@ abstract class Route implements IRoute
            $values['where'] = $this->where;
        }

-        if (count($this->parameters) > 0) {
-            /* Ensure the right order + values */
-            $parameters = ($values['parameters'] + $this->parameters);
-            $parameters = array_merge($parameters, $this->parameters);
-            $this->setParameters($parameters);
-        }
-
        if (count($this->middlewares) > 0) {
            $values['middleware'] = $this->middlewares;
        }

+        if ($this->defaultParameterRegex !== null) {
+            $values['defaultParameterRegex'] = $this->defaultParameterRegex;
+        }
+
        return $values;
    }

@@ -406,7 +385,7 @@ abstract class Route implements IRoute
     */
    public function setSettings(array $values, $merge = false)
    {
-        if (isset($values['namespace']) && $this->namespace === null) {
+        if ($this->namespace === null && isset($values['namespace'])) {
            $this->setNamespace($values['namespace']);
        }

@@ -427,6 +406,10 @@ abstract class Route implements IRoute
            $this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
        }

+        if (isset($values['defaultParameterRegex'])) {
+            $this->setDefaultParameterRegex($values['defaultParameterRegex']);
+        }
+
        return $this;
    }

@@ -463,7 +446,7 @@ abstract class Route implements IRoute
     */
    public function where(array $options)
    {
-        return $this->where($options);
+        return $this->setWhere($options);
    }

    /**
@@ -473,7 +456,14 @@ abstract class Route implements IRoute
     */
    public function getParameters()
    {
-        return $this->parameters;
+        /* Sort the parameters after the user-defined param order, if any */
+        $parameters = [];
+
+        if (count($this->originalParameters) > 0) {
+            $parameters = $this->originalParameters;
+        }
+
+        return array_merge($parameters, $this->parameters);
    }

    /**
@@ -484,15 +474,24 @@ abstract class Route implements IRoute
     */
    public function setParameters(array $parameters)
    {
-        $this->parameters = $parameters;
+        /*
+         * If this is the first time setting parameters we store them so we
+         * later can organize the array, in case somebody tried to sort the array.
+         */
+        if (count($parameters) > 0 && count($this->originalParameters) === 0) {
+            $this->originalParameters = $parameters;
+        }
+
+        $this->parameters = array_merge($this->parameters, $parameters);

        return $this;
    }

    /**
-     * Set middleware class-name
+     * Add middleware class-name
     *
-     * @param string $middleware
+     * @deprecated This method is deprecated and will be removed in the near future.
+     * @param IMiddleware|string $middleware
     * @return static
     */
    public function setMiddleware($middleware)
@@ -502,6 +501,19 @@ abstract class Route implements IRoute
        return $this;
    }

+    /**
+     * Add middleware class-name
+     *
+     * @param IMiddleware|string $middleware
+     * @return static
+     */
+    public function addMiddleware($middleware)
+    {
+        $this->middlewares[] = $middleware;
+
+        return $this;
+    }
+
    /**
     * Set middlewares array
     *
@@ -523,4 +535,28 @@ abstract class Route implements IRoute
        return $this->middlewares;
    }

+    /**
+     * Set default regular expression used when matching parameters.
+     * This is used when no custom parameter regex is found.
+     *
+     * @param string $regex
+     * @return static $this
+     */
+    public function setDefaultParameterRegex($regex)
+    {
+        $this->defaultParameterRegex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get default regular expression used when matching parameters.
+     *
+     * @return string
+     */
+    public function getDefaultParameterRegex()
+    {
+        return $this->defaultParameterRegex;
+    }
+
 }
@@ -2,7 +2,6 @@
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;

 class RouteController extends LoadableRoute implements IControllerRoute
 {
@@ -31,11 +30,11 @@ class RouteController extends LoadableRoute implements IControllerRoute
        }

        /* Remove method/type */
-        if (stripos($name, '.') !== false) {
+        if (strpos($name, '.') !== false) {
            $method = substr($name, strrpos($name, '.') + 1);
            $newName = substr($name, 0, strrpos($name, '.'));

-            if (strtolower($this->name) === strtolower($newName) && in_array($method, $this->names)) {
+            if (in_array($method, $this->names, false) === true && strtolower($this->name) === strtolower($newName)) {
                return true;
            }
        }
@@ -43,31 +42,31 @@ class RouteController extends LoadableRoute implements IControllerRoute
        return parent::hasName($name);
    }

+    /**
+     * @param string|null $method
+     * @param string|array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
    public function findUrl($method = null, $parameters = null, $name = null)
    {
-
-        if (stripos($name, '.') !== false) {
-            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names);
+        if (strpos($name, '.') !== false) {
+            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
            if ($found !== false) {
-                $method = $found;
+                $method = (string)$found;
            }
        }

        $url = '';
-
        $parameters = (array)$parameters;

-        /* Remove requestType from method-name, if it exists */
        if ($method !== null) {

-            $max = count(static::$requestTypes);
-
-            for ($i = 0; $i < $max; $i++) {
-
-                $requestType = static::$requestTypes[$i];
+            /* Remove requestType from method-name, if it exists */
+            foreach (static::$requestTypes as $requestType) {

                if (stripos($method, $requestType) === 0) {
-                    $method = substr($method, strlen($requestType));
+                    $method = (string)substr($method, strlen($requestType));
                    break;
                }
            }
@@ -75,8 +74,10 @@ class RouteController extends LoadableRoute implements IControllerRoute
            $method .= '/';
        }

-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+        $group = $this->getGroup();
+
+        if ($group !== null && count($group->getDomains()) > 0) {
+            $url .= '//' . $group->getDomains()[0];
        }

        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
@@ -84,59 +85,35 @@ class RouteController extends LoadableRoute implements IControllerRoute
        return '/' . trim($url, '/') . '/';
    }

-    public function renderRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
-        if ($this->getCallback() !== null && is_callable($this->getCallback())) {
-
-            // When the callback is a function
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-
-            $class = $this->loadClass($className);
-            $method = $request->getMethod() . ucfirst($controller[1]);
-
-            if (!method_exists($class, $method)) {
-                throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            call_user_func_array([$class, $method], $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    public function matchRoute(Request $request)
-    {
-        $url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
+        $url = parse_url(urldecode($url), PHP_URL_PATH);
        $url = rtrim($url, '/') . '/';

-        if (strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
+        /* Match global regular-expression for route */
+        $regexMatch = $this->matchRegex($request, $url);

-            $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
-
-            $path = explode('/', $strippedUrl);
-
-            if (count($path) > 0) {
-
-                $method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
-                $this->method = $method;
-
-                array_shift($path);
-                $this->parameters = $path;
-
-                // Set callback
-                $this->setCallback($this->controller . '@' . $this->method);
-
-                return true;
-            }
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
        }

-        return null;
+        $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
+        $path = explode('/', $strippedUrl);
+
+        if (count($path) > 0) {
+
+            $method = (isset($path[0]) === false || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
+            $this->method = $request->getMethod() . ucfirst($method);
+
+            $this->parameters = array_slice($path, 1);
+
+            // Set callback
+            $this->setCallback($this->controller . '@' . $this->method);
+
+            return true;
+        }
+
+        return false;
    }

    /**
@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

+use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;

 class RouteGroup extends Route implements IGroupRoute
@@ -18,44 +20,55 @@ class RouteGroup extends Route implements IGroupRoute
     */
    public function matchDomain(Request $request)
    {
-        if (count($this->domains) > 0) {
-
-            $max = count($this->domains) - 1;
-
-            for ($i = $max; $i >= 0; $i--) {
-
-                $domain = $this->domains[$i];
-                $parameters = $this->parseParameters($domain, $request->getHost(), '.*');
-
-                if ($parameters !== null) {
-                    $this->parameters = $parameters;
-
-                    return true;
-                }
-            }
-
-            return false;
+        if ($this->domains === null || count($this->domains) === 0) {
+            return true;
        }

-        return true;
+        foreach ($this->domains as $domain) {
+
+            $parameters = $this->parseParameters($domain, $request->getHost(), '.*');
+
+            if ($parameters !== null && count($parameters) > 0) {
+
+                $this->parameters = $parameters;
+
+                return true;
+            }
+        }
+
+        return false;
    }

    /**
     * Method called to check if route matches
     *
+     * @param string $url
     * @param Request $request
     * @return bool
     */
-    public function matchRoute(Request $request)
+    public function matchRoute($url, Request $request)
    {
-        // Skip if prefix doesn't match
-        if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
+        /* Skip if prefix doesn't match */
+        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
            return false;
        }

        return $this->matchDomain($request);
    }

+    /**
+     * Add exception handler
+     *
+     * @param IExceptionHandler|string $handler
+     * @return static $this
+     */
+    public function addExceptionHandler($handler)
+    {
+        $this->exceptionHandlers[] = $handler;
+
+        return $this;
+    }
+
    /**
     * Set exception-handlers for group
     *
@@ -175,6 +188,10 @@ class RouteGroup extends Route implements IGroupRoute
            $values['as'] = $this->name;
        }

+        if (count($this->parameters) > 0) {
+            $values['parameters'] = $this->parameters;
+        }
+
        return array_merge($values, parent::toArray());
    }

@@ -1,8 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;

 class RouteResource extends LoadableRoute implements IControllerRoute
 {
@@ -15,6 +15,17 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        'update'  => '',
        'destroy' => '',
    ];
+
+    protected $methodNames = [
+        'index'   => 'index',
+        'create'  => 'create',
+        'store'   => 'store',
+        'show'    => 'show',
+        'edit'    => 'edit',
+        'update'  => 'update',
+        'destroy' => 'destroy',
+    ];
+
    protected $names = [];
    protected $controller;

@@ -42,8 +53,8 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        }

        /* Remove method/type */
-        if (stripos($name, '.') !== false) {
-            $name = substr($name, 0, strrpos($name, '.'));
+        if (strpos($name, '.') !== false) {
+            $name = (string)substr($name, 0, strrpos($name, '.'));
        }

        return (strtolower($this->name) === strtolower($name));
@@ -51,99 +62,83 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function findUrl($method = null, $parameters = null, $name = null)
    {
-        $method = array_search($name, $this->names);
-        if ($method !== false) {
-            return rtrim($this->url . $this->urls[$method], '/') . '/';
+        $url = array_search($name, $this->names, false);
+        if ($url !== false) {
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
        }

        return $this->url;
    }

-    public function renderRoute(Request $request)
-    {
-        if ($this->getCallback() !== null && is_callable($this->getCallback())) {
-            // When the callback is a function
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-            $class = $this->loadClass($className);
-            $method = strtolower($controller[1]);
-
-            if (!method_exists($class, $method)) {
-                throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            call_user_func_array([$class, $method], $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    protected function call($method, $parameters)
+    protected function call($method)
    {
        $this->setCallback($this->controller . '@' . $method);
-        $this->parameters = $parameters;

        return true;
    }

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

+        /* Match global regular-expression for route */
+        $regexMatch = $this->matchRegex($request, $url);
+
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
+        }
+
        $route = rtrim($this->url, '/') . '/{id?}/{action?}';

-        $parameters = $this->parseParameters($route, $url);
+        /* Parse parameters from current route */
+        $this->parameters = $this->parseParameters($route, $url);

-        if ($parameters !== null) {
-
-            $parameters = array_merge($this->parameters, (array)$parameters);
-
-            $action = isset($parameters['action']) ? $parameters['action'] : null;
-            unset($parameters['action']);
-
-            $method = $request->getMethod();
-
-            // Delete
-            if (isset($parameters['id']) && $method === static::REQUEST_TYPE_DELETE) {
-                return $this->call('destroy', $parameters);
-            }
-
-            // Update
-            if (isset($parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT])) {
-                return $this->call('update', $parameters);
-            }
-
-            // Edit
-            if (isset($parameters['id']) && strtolower($action) === 'edit' && $method === static::REQUEST_TYPE_GET) {
-                return $this->call('edit', $parameters);
-            }
-
-            // Create
-            if (strtolower($action) === 'create' && $method === static::REQUEST_TYPE_GET) {
-                return $this->call('create', $parameters);
-            }
-
-            // Save
-            if ($method === static::REQUEST_TYPE_POST) {
-                return $this->call('store', $parameters);
-            }
-
-            // Show
-            if (isset($parameters['id']) && $method === static::REQUEST_TYPE_GET) {
-                return $this->call('show', $parameters);
-            }
-
-            // Index
-            return $this->call('index', $parameters);
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $this->parameters === null) {
+            return false;
        }

-        return null;
+        $action = strtolower(trim($this->parameters['action']));
+        $id = $this->parameters['id'];
+
+        // Remove action parameter
+        unset($this->parameters['action']);
+
+        $method = $request->getMethod();
+
+        // Delete
+        if ($method === static::REQUEST_TYPE_DELETE && $id !== null) {
+            return $this->call($this->methodNames['destroy']);
+        }
+
+        // Update
+        if ($id !== null && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false) === true) {
+            return $this->call($this->methodNames['update']);
+        }
+
+        // Edit
+        if ($method === static::REQUEST_TYPE_GET && $id !== null && $action === 'edit') {
+            return $this->call($this->methodNames['edit']);
+        }
+
+        // Create
+        if ($method === static::REQUEST_TYPE_GET && $id === 'create') {
+            return $this->call($this->methodNames['create']);
+        }
+
+        // Save
+        if ($method === static::REQUEST_TYPE_POST) {
+            return $this->call($this->methodNames['store']);
+        }
+
+        // Show
+        if ($method === static::REQUEST_TYPE_GET && $id !== null) {
+            return $this->call($this->methodNames['show']);
+        }
+
+        // Index
+        return $this->call($this->methodNames['index']);
    }

    /**
@@ -182,6 +177,29 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        return $this;
    }

+    /**
+     * Define custom method name for resource controller
+     *
+     * @param array $names
+     * @return static $this
+     */
+    public function setMethodNames(array $names)
+    {
+        $this->methodNames = $names;
+
+        return $this;
+    }
+
+    /**
+     * Get method names
+     *
+     * @return array $this
+     */
+    public function getMethodNames()
+    {
+        return $this->methodNames;
+    }
+
    /**
     * Merge with information from another route.
     *
@@ -195,6 +213,10 @@ class RouteResource extends LoadableRoute implements IControllerRoute
            $this->names = $values['names'];
        }

+        if (isset($values['methods'])) {
+            $this->methodNames = $values['methods'];
+        }
+
        parent::setSettings($values, $merge);

        return $this;
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
@@ -11,39 +12,30 @@ class RouteUrl extends LoadableRoute
        $this->setCallback($callback);
    }

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

-        // Match on custom defined regular expression
-        if ($this->regex !== null) {
-            $parameters = [];
-            if (preg_match($this->regex, $request->getHost() . $url, $parameters)) {
-                /* Remove global match */
-                if (count($parameters) > 1) {
-                    array_shift($parameters);
-                    $this->parameters = $parameters;
-                }
+        /* Match global regular-expression for route */
+        $regexMatch = $this->matchRegex($request, $url);

-                return true;
-            }
-
-            return null;
+        if ($regexMatch === false) {
+            return false;
        }

-        // Make regular expression based on route
-        $route = rtrim($this->url, '/') . '/';
+        /* Parse parameters from current route */
+        $parameters = $this->parseParameters($this->url, $url);

-        $parameters = $this->parseParameters($route, $url);
-
-        if ($parameters !== null) {
-            $this->parameters = array_merge($this->parameters, $parameters);
-
-            return true;
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $parameters === null) {
+            return false;
        }

-        return null;
+        /* Set the parameters */
+        $this->setParameters((array)$parameters);
+
+        return true;
    }

 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter;

 use Pecee\Handlers\IExceptionHandler;
@@ -69,37 +70,6 @@ class Router
     */
    protected $exceptionHandlers;

-    /**
-     * The current loaded route
-     * @var ILoadableRoute|null
-     */
-    protected $loadedRoute;
-
-    /**
-     * List over route changes (to avoid endless-looping)
-     * @var array
-     */
-    protected $routeRewrites = [];
-
-    /**
-     * If the route has been rewritten/changed this property will contain the original url.
-     * @var string
-     */
-    protected $originalUrl;
-
-    /**
-     * Get current router instance
-     * @return static
-     */
-    public static function getInstance()
-    {
-        if (static::$instance === null) {
-            static::$instance = new static();
-        }
-
-        return static::$instance;
-    }
-
    public function __construct()
    {
        $this->reset();
@@ -137,34 +107,45 @@ class Router
        return $route;
    }

+    /**
+     * Process added routes.
+     *
+     * @param array $routes
+     * @param IGroupRoute|null $group
+     * @param IRoute|null $parent
+     * @throws NotFoundHttpException
+     */
    protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
    {
        // Loop through each route-request
        $max = count($routes) - 1;

+        $exceptionHandlers = [];
+
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
        /* @var $route IRoute */
        for ($i = $max; $i >= 0; $i--) {

            $route = $routes[$i];

+            /* @var $route IGroupRoute */
            if ($route instanceof IGroupRoute) {

                $group = $route;

-                if ($route->getCallback() !== null && is_callable($route->getCallback())) {
+                $this->processingRoute = true;
+                $route->renderRoute($this->request);
+                $this->processingRoute = false;

-                    $this->processingRoute = true;
-                    $route->renderRoute($this->request);
-                    $this->processingRoute = false;
-
-                    if ($route->matchRoute($this->request)) {
-
-                        /* Add exceptionhandlers */
-                        if (count($route->getExceptionHandlers()) > 0) {
-                            $this->exceptionHandlers = array_merge($route->getExceptionHandlers(), $this->exceptionHandlers);
-                        }
+                if ($route->matchRoute($url, $this->request) === true) {

+                    /* Add exception handlers */
+                    if (count($route->getExceptionHandlers()) > 0) {
+                        /** @noinspection AdditionOperationOnArraysInspection */
+                        $exceptionHandlers += $route->getExceptionHandlers();
                    }
+
                }
            }

@@ -172,7 +153,6 @@ class Router

                /* Add the parent group */
                $route->setGroup($group);
-
            }

            if ($parent !== null) {
@@ -193,7 +173,7 @@ class Router

            if (count($this->routeStack) > 0) {

-                /* Pop and grap the routes added when executing group callback earlier */
+                /* Pop and grab the routes added when executing group callback earlier */
                $stack = $this->routeStack;
                $this->routeStack = [];

@@ -201,69 +181,84 @@ class Router
                $this->processRoutes($stack, $route, $group);
            }
        }
+
+        $this->exceptionHandlers = array_merge($exceptionHandlers, $this->exceptionHandlers);
+    }
+
+    /**
+     * Load routes
+     * @throws NotFoundHttpException
+     * @return void
+     */
+    public function loadRoutes()
+    {
+        /* Initialize boot-managers */
+        if (count($this->bootManagers) > 0) {
+
+            $max = count($this->bootManagers) - 1;
+
+            /* @var $manager IRouterBootManager */
+            for ($i = $max; $i >= 0; $i--) {
+                $manager = $this->bootManagers[$i];
+                $manager->boot($this->request);
+            }
+        }
+
+        /* Loop through each route-request */
+        $this->processRoutes($this->routes);
    }

    public function routeRequest($rewrite = false)
    {
-        $this->loadedRoute = null;
        $routeNotAllowed = false;

        try {

-            /* Initialize boot-managers */
-            if (count($this->bootManagers) > 0) {
-
-                $max = count($this->bootManagers) - 1;
-
-                /* @var $manager IRouterBootManager */
-                for ($i = $max; $i >= 0; $i--) {
-
-                    $manager = $this->bootManagers[$i];
-
-                    $this->request = $manager->boot($this->request);
-
-                    if (!($this->request instanceof Request)) {
-                        throw new HttpException('Bootmanager "' . get_class($manager) . '" must return instance of ' . Request::class, 500);
-                    }
-                }
-            }
-
            if ($rewrite === false) {
-
-                /* Loop through each route-request */
-                $this->processRoutes($this->routes);
+                $this->loadRoutes();

                if ($this->csrfVerifier !== null) {

-                    // Verify csrf token for request
+                    /* Verify csrf token for request */
                    $this->csrfVerifier->handle($this->request);
                }
-
-                $this->originalUrl = $this->request->getUri();
            }

+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
            $max = count($this->processedRoutes) - 1;

-            /* @var $route IRoute */
+            /* @var $route ILoadableRoute */
            for ($i = $max; $i >= 0; $i--) {

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

                /* If the route matches */
-                if ($route->matchRoute($this->request)) {
+                if ($route->matchRoute($url, $this->request) === true) {

                    /* Check if request method matches */
-                    if (count($route->getRequestMethods()) > 0 && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
+                    if (count($route->getRequestMethods()) > 0 && in_array($this->request->getMethod(), $route->getRequestMethods(), false) === false) {
                        $routeNotAllowed = true;
                        continue;
                    }

-                    $this->loadedRoute = $route;
-                    $this->loadedRoute->loadMiddleware($this->request, $this->loadedRoute);
+                    $route->loadMiddleware($this->request);

-                    /* If the request has changed, we reinitialize the router */
-                    if ($this->request->getUri() !== $this->originalUrl && !in_array($this->request->getUri(), $this->routeRewrites)) {
-                        $this->routeRewrites[] = $this->request->getUri();
+                    $rewriteRoute = $this->request->getRewriteRoute();
+
+                    if ($rewriteRoute !== null) {
+                        $rewriteRoute->loadMiddleware($this->request);
+                        $rewriteRoute->renderRoute($this->request);
+
+                        return;
+                    }
+
+                    /* If the request has changed */
+                    $rewriteUrl = $this->request->getRewriteUrl();
+
+                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                        unset($this->processedRoutes[$i]);
+                        $this->processedRoutes = array_values($this->processedRoutes);
                        $this->routeRequest(true);

                        return;
@@ -271,8 +266,8 @@ class Router

                    /* Render route */
                    $routeNotAllowed = false;
-                    $this->request->setUri($this->originalUrl);
-                    $this->loadedRoute->renderRoute($this->request);
+                    $this->request->setLoadedRoute($route);
+                    $route->renderRoute($this->request);

                    break;
                }
@@ -286,13 +281,24 @@ class Router
            $this->handleException(new HttpException('Route or method not allowed', 403));
        }

-        if ($this->loadedRoute === null) {
-            $this->handleException(new NotFoundHttpException('Route not found: ' . $this->request->getUri(), 404));
+        if ($this->request->getLoadedRoute() === null) {
+
+            $rewriteUrl = $this->request->getRewriteUrl();
+
+            if ($rewriteUrl !== null) {
+                $message = sprintf('Route not found: "%s" (rewrite from: "%s")', $rewriteUrl, $this->request->getUri());
+            } else {
+                $message = sprintf('Route not found: "%s"', $this->request->getUri());
+            }
+
+            $this->handleException(new NotFoundHttpException($message, 404));
        }
    }

    protected function handleException(\Exception $e)
    {
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+
        $max = count($this->exceptionHandlers);

        /* @var $handler IExceptionHandler */
@@ -300,21 +306,35 @@ class Router

            $handler = $this->exceptionHandlers[$i];

-            $handler = new $handler();
+            if (is_object($handler) === false) {
+                $handler = new $handler();
+            }

-            if (!($handler instanceof IExceptionHandler)) {
+            if (($handler instanceof IExceptionHandler) === false) {
                throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
            }

-            $request = $handler->handleError($this->request, $this->loadedRoute, $e);
+            if ($handler->handleError($this->request, $e) !== null) {

-            /* If the request has changed */
-            if ($request !== null && $this->request->getUri() !== $this->originalUrl && !in_array($request->getUri(), $this->routeRewrites)) {
-                $this->request = $request;
-                $this->routeRewrites[] = $request->getUri();
-                $this->routeRequest(true);
+                $rewriteRoute = $this->request->getRewriteRoute();

-                return;
+                if ($rewriteRoute !== null) {
+                    $rewriteRoute->loadMiddleware($this->request);
+                    $rewriteRoute->renderRoute($this->request);
+
+                    return;
+                }
+
+                $rewriteUrl = $this->request->getRewriteUrl();
+
+                /* If the request has changed */
+                if ($rewriteUrl !== null && $rewriteUrl !== $url) {
+                    unset($this->exceptionHandlers[$i]);
+                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
+                    $this->routeRequest(true);
+
+                    return;
+                }
            }
        }

@@ -327,7 +347,7 @@ class Router

            if ($includeEmpty === false) {
                $getParams = array_filter($getParams, function ($item) {
-                    return (!empty($item));
+                    return (trim($item) !== '');
                });
            }

@@ -363,7 +383,7 @@ class Router
            }

            /* Using @ is most definitely a controller@method or alias@method */
-            if (strpos($name, '@') !== false) {
+            if (is_string($name) === true && strpos($name, '@') !== false) {
                list($controller, $method) = array_map('strtolower', explode('@', $name));

                if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
@@ -372,10 +392,10 @@ class Router
            }

            /* Check if callback matches (if it's not a function) */
-            if (strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && !is_callable($route->getCallback())) {
+            if (is_string($name) === true && is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && is_callable($route->getCallback()) === false) {

                /* Check if the entire callback is matching */
-                if (strtolower($route->getCallback()) === strtolower($name) || strpos($route->getCallback(), $name) === 0) {
+                if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
                    return $route;
                }

@@ -404,6 +424,7 @@ class Router
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
+     * @throws \InvalidArgumentException
     * @return string
     */
    public function getUrl($name = null, $parameters = null, $getParams = null)
@@ -426,9 +447,11 @@ class Router
            return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
        }

+        $loadedRoute = $this->request->getLoadedRoute();
+
        /* If nothing is defined and a route is loaded we use that */
-        if ($name === null && $this->loadedRoute !== null) {
-            return $this->loadedRoute->findUrl($this->loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+        if ($name === null && $loadedRoute !== null) {
+            return $loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
        }

        /* We try to find a match on the given name */
@@ -439,7 +462,7 @@ class Router
        }

        /* Using @ is most definitely a controller@method or alias@method */
-        if (stripos($name, '@') !== false) {
+        if (is_string($name) === true && strpos($name, '@') !== false) {
            list($controller, $method) = explode('@', $name);

            /* Loop through all the routes to see if we can find a match */
@@ -505,6 +528,19 @@ class Router
        return $this->routes;
    }

+    /**
+     * Set routes
+     *
+     * @param array $routes
+     * @return static $this
+     */
+    public function setRoutes(array $routes)
+    {
+        $this->routes = $routes;
+
+        return $this;
+    }
+
    /**
     * Get current request
     *
@@ -537,13 +573,4 @@ class Router
        return $this;
    }

-    /**
-     * Get loaded route
-     * @return ILoadableRoute|null
-     */
-    public function getLoadedRoute()
-    {
-        return $this->loadedRoute;
-    }
-
 }
@@ -7,8 +7,10 @@
 * This class is added so calls can be made statically like Router::get() making the code look pretty.
 * It also adds some extra functionality like default-namespace.
 */
+
 namespace Pecee\SimpleRouter;

+use Pecee\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
@@ -33,6 +35,12 @@ class SimpleRouter
     */
    protected static $response;

+    /**
+     * Router instance
+     * @var Router
+     */
+    protected static $router;
+
    /**
     * Start/route request
     *
@@ -212,7 +220,7 @@ class SimpleRouter
     * @param string $url
     * @param string|\Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function match(array $requestMethods, $url, $callback, array $settings = null)
    {
@@ -235,7 +243,7 @@ class SimpleRouter
     * @param string $url
     * @param string|\Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
    public static function all($url, $callback, array $settings = null)
    {
@@ -257,7 +265,7 @@ class SimpleRouter
     * @param string $url
     * @param string $controller
     * @param array|null $settings
-     * @return RouteController
+     * @return RouteController|IRoute
     */
    public static function controller($url, $controller, array $settings = null)
    {
@@ -279,11 +287,12 @@ class SimpleRouter
     * @param string $url
     * @param string $controller
     * @param array|null $settings
-     * @return RouteResource
+     * @return RouteResource|IRoute
     */
    public static function resource($url, $controller, array $settings = null)
    {
        $route = new RouteResource($url, $controller);
+        $route = static::addDefaultNamespace($route);

        if ($settings !== null) {
            $route->setSettings($settings);
@@ -294,6 +303,28 @@ class SimpleRouter
        return $route;
    }

+    /**
+     * Add exception callback handler.
+     *
+     * @param \Closure $callback
+     * @return CallbackExceptionHandler $callbackHandler
+     */
+    public static function error(\Closure $callback)
+    {
+        $routes = static::router()->getRoutes();
+
+        $callbackHandler = new CallbackExceptionHandler($callback);
+
+        $group = new RouteGroup();
+        $group->addExceptionHandler($callbackHandler);
+
+        array_unshift($routes, $group);
+
+        static::router()->setRoutes($routes);
+
+        return $callbackHandler;
+    }
+
    /**
     * Get url for a route by using either name/alias, class or method name.
     *
@@ -309,6 +340,7 @@ class SimpleRouter
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
+     * @throws \Exception
     * @return string
     */
    public static function getUrl($name = null, $parameters = null, $getParams = null)
@@ -347,7 +379,11 @@ class SimpleRouter
     */
    public static function router()
    {
-        return Router::getInstance();
+        if (static::$router === null) {
+            static::$router = new Router();
+        }
+
+        return static::$router;
    }

    /**
@@ -359,16 +395,35 @@ class SimpleRouter
    protected static function addDefaultNamespace(IRoute $route)
    {
        if (static::$defaultNamespace !== null) {
-            $namespace = static::$defaultNamespace;

-            if ($route->getNamespace() !== null) {
-                $namespace .= '\\' . $route->getNamespace();
+            $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);
+
            }
-
-            $route->setDefaultNamespace($namespace);
        }

        return $route;
    }

+    /**
+     * Get default namespace
+     * @return string
+     */
+    public static function getDefaultNamespace()
+    {
+        return static::$defaultNamespace;
+    }
+
 }
@@ -2,24 +2,34 @@

 class DummyController
 {
-	public function start()
+	public function method1()
 	{
-		echo static::class . '@' . 'start() OK';
+
 	}

+    public function method2()
+    {
+
+    }
+
 	public function param($params = null)
 	{
-		$params = func_get_args();
-		echo 'Params: ' . join(', ', $params);
+		echo join(', ', func_get_args());
 	}

-	public function notFound()
-	{
-		echo 'not found';
-	}
+	public function getTest()
+    {
+        echo 'getTest';
+    }

-	public function silent() {
+    public function postTest()
+    {
+        echo 'postTest';
+    }

-	}
+    public function putTest()
+    {
+        echo 'putTest';
+    }

 }
@@ -1,12 +1,11 @@
 <?php
 require_once 'Exceptions/MiddlewareLoadedException.php';

-use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;

-class DummyMiddleware implements IMiddleware
+class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
 {
-	public function handle(Request $request, \Pecee\SimpleRouter\Route\ILoadableRoute &$route)
+	public function handle(Request $request)
 	{
 		throw new MiddlewareLoadedException('Middleware loaded!');
 	}
@@ -0,0 +1,4 @@
+<?php
+class ExceptionHandlerException extends \Exception
+{
+}
@@ -0,0 +1,18 @@
+<?php
+
+class ResponseException extends \Exception
+{
+    protected $response;
+
+    public function __construct($response)
+    {
+        $this->response = $response;
+        parent::__construct('', 0);
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+}
@@ -2,9 +2,9 @@

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

 }
@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+	    global $stack;
+	    $stack[] = static::class;
+
+		$request->setUri('/');
+		return $request;
+	}
+
+}
@@ -0,0 +1,14 @@
+<?php
+
+class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+        $request->setUri('/');
+        return $request;
+	}
+
+}
@@ -0,0 +1,13 @@
+<?php
+
+class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	{
+        global $stack;
+        $stack[] = static::class;
+
+		throw new ResponseException('ExceptionHandler loaded');
+	}
+
+}
@@ -0,0 +1,39 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index()
+    {
+        echo 'index';
+    }
+
+    public function show($id)
+    {
+        echo 'show ' . $id;
+    }
+
+    public function store()
+    {
+        echo 'store';
+    }
+
+    public function create()
+    {
+        echo 'create';
+    }
+
+    public function edit($id)
+    {
+        echo 'edit ' . $id;
+    }
+
+    public function update($id)
+    {
+        echo 'update ' . $id;
+    }
+
+    public function destroy($id)
+    {
+        echo 'destroy ' . $id;
+    }
+}
@@ -2,94 +2,82 @@

 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';

 class GroupTest extends PHPUnit_Framework_TestCase
 {
-	protected $result;
+    protected $result;

-	public function testGroupLoad()
-	{
-		$this->result = false;
+    public function testGroupLoad()
+    {
+        $this->result = false;

-		SimpleRouter::group(['prefix' => '/group'], function () {
-			$this->result = true;
-		});
+        TestRouter::group(['prefix' => '/group'], function () {
+            $this->result = true;
+        });

-		try {
-			SimpleRouter::start();
-		} catch (Exception $e) {
-			// ignore RouteNotFound exception
-		}
+        try {
+            TestRouter::debug('/', 'get');
+        } catch(\Exception $e) {

-		$this->assertTrue($this->result);
-	}
+        }
+        $this->assertTrue($this->result);
+    }

-	public function testNestedGroup()
-	{
+    public function testNestedGroup()
+    {

-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/api/v1/test');
-		SimpleRouter::request()->setMethod('get');
+        TestRouter::group(['prefix' => '/api'], function () {

-		SimpleRouter::group(['prefix' => '/api'], function () {
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
+            });

-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
+        });

-		});
+        TestRouter::debug('/api/v1/test', 'get');

-		SimpleRouter::start();
-	}
+    }

-	public function testManyRoutes()
-	{
+    public function testMultipleRoutes()
+    {

-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/match');
-		SimpleRouter::request()->setMethod('get');
+        TestRouter::group(['prefix' => '/api'], function () {

-		SimpleRouter::group(['prefix' => '/api'], function () {
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
+            });

-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
+        });

-		});
+        TestRouter::get('/my/match', 'DummyController@method1');

-		SimpleRouter::get('/my/match', 'DummyController@start');
+        TestRouter::group(['prefix' => '/service'], function () {

-		SimpleRouter::group(['prefix' => '/service'], function () {
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/no-match', 'DummyController@method1');
+            });

-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/no-match', 'DummyController@start');
-			});
+        });

-		});
+        TestRouter::debug('/my/match', 'get');
+    }

-		SimpleRouter::start();
-	}
+    public function testUrls()
+    {
+        // Test array name
+        TestRouter::get('/my/fancy/url/1', 'DummyController@method1', ['as' => 'fancy1']);

-	public function testUrls()
-	{
+        // Test method name
+        TestRouter::get('/my/fancy/url/2', 'DummyController@method1')->setName('fancy2');

-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/fancy/url/1');
-		SimpleRouter::request()->setMethod('get');
+        TestRouter::debugNoReset('/my/fancy/url/1');

-		// Test array name
-		SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
+        $this->assertEquals('/my/fancy/url/1/', TestRouter::getUrl('fancy1'));
+        $this->assertEquals('/my/fancy/url/2/', TestRouter::getUrl('fancy2'));

-		// Test method name
-		SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setName('fancy2');
+        TestRouter::router()->reset();

-		SimpleRouter::start();
-
-		$this->assertEquals('/my/fancy/url/1/', SimpleRouter::getUrl('fancy1'));
-		$this->assertEquals('/my/fancy/url/2/', SimpleRouter::getUrl('fancy2'));
-
-	}
+    }

 }
@@ -0,0 +1,41 @@
+<?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;
+    }
+
+}
@@ -3,30 +3,32 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';

 class MiddlewareTest extends PHPUnit_Framework_TestCase
 {
-	public function testMiddlewareFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/my/test/url');
+    public function testMiddlewareFound()
+    {
+        $this->setExpectedException(MiddlewareLoadedException::class);

-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
-		});
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
+        });

-		$found = false;
+        TestRouter::debug('/my/test/url', 'get');

-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof MiddlewareLoadedException);
-		}
+    }

-		$this->assertTrue($found);
-	}
+    public function testNestedMiddlewareDontLoad()
+    {
+
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
+            TestRouter::get('/middleware', 'DummyController@method1');
+        });
+
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+
+        TestRouter::debug('/my/test/url', 'get');
+    }

 }
@@ -0,0 +1,27 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterCallbackExceptionHandlerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testCallbackExceptionHandler()
+    {
+        $this->setExpectedException(ExceptionHandlerException::class);
+
+        // Match normal route on alias
+        TestRouter::get('/my-new-url', 'DummyController@method2');
+        TestRouter::get('/my-url', 'DummyController@method1');
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $exception) {
+            throw new ExceptionHandlerException();
+        });
+
+        TestRouter::debugNoReset('/404-url', 'get');
+        TestRouter::router()->reset();
+    }
+
+}
@@ -0,0 +1,42 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterControllerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}
@@ -0,0 +1,70 @@
+<?php
+
+require_once 'Dummy/ResourceController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterResourceTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testResourceStore()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'post');
+
+        $this->assertEquals('store', $response);
+    }
+
+    public function testResourceCreate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/create', 'get');
+
+        $this->assertEquals('create', $response);
+
+    }
+
+    public function testResourceIndex()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'get');
+
+        $this->assertEquals('index', $response);
+    }
+
+    public function testResourceDestroy()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'delete');
+
+        $this->assertEquals('destroy 38', $response);
+    }
+
+
+    public function testResourceEdit()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38/edit', 'get');
+
+        $this->assertEquals('edit 38', $response);
+
+    }
+
+    public function testResourceUpdate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'put');
+
+        $this->assertEquals('update 38', $response);
+
+    }
+
+    public function testResourceGet()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'get');
+
+        $this->assertEquals('show 38', $response);
+
+    }
+
+}
@@ -0,0 +1,78 @@
+<?php
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exceptions/ResponseException.php';
+require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
+require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
+require_once 'Dummy/Handler/ExceptionHandlerThird.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouteRewriteTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Redirects to another route through 3 exception handlers.
+     *
+     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
+     * the exceptionhandler is asking the router to reload.
+     *
+     * That means that the exceptionhandler is loaded again, but this time
+     * the router ignores the same rewrite-route to avoid loop - loads
+     * the second which have same behavior and is also ignored before
+     * throwing the final Exception in ExceptionHandler 3.
+     *
+     * So this tests:
+     * 1. If ExceptionHandlers loads
+     * 2. If ExceptionHandlers load in the correct order
+     * 3. If ExceptionHandlers can rewrite the page on error
+     * 4. If the router can avoid redirect-loop due to developer has started loop.
+     * 5. And finally if we reaches the last exception-handler and that the correct
+     *    exception-type is being thrown.
+     */
+    public function testExceptionHandlerRewrite()
+    {
+        global $stack;
+        $stack = [];
+
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
+
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
+
+                TestRouter::get('/my-path', 'DummyController@method1');
+
+            });
+        });
+
+        try {
+            TestRouter::debug('/my-non-existing-path', 'get');
+        } catch (\ResponseException $e) {
+
+        }
+
+        $expectedStack = [
+            ExceptionHandlerFirst::class,
+            ExceptionHandlerSecond::class,
+            ExceptionHandlerThird::class,
+        ];
+
+        $this->assertEquals($expectedStack, $stack);
+
+    }
+
+    public function testRewriteExceptionMessage()
+    {
+        $this->setExpectedException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            if (strtolower($request->getUri()) == '/my/test') {
+                $request->setRewriteUrl('/another-non-existing');
+
+                return $request;
+            }
+
+        });
+
+        TestRouter::debug('/my/test', 'get');
+    }
+
+}
@@ -2,140 +2,146 @@

 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException as NotFoundHttpException;
+require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
+require_once 'Helpers/TestRouter.php';

 class RouterRouteTest extends PHPUnit_Framework_TestCase
 {
-	protected $result = false;
+    protected $result = false;

-	public function testNotFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
+    public function testMultiParam()
+    {
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {

-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/non-existing-path', 'DummyController@start');
-		});
+            if ($param1 === 'param1' && $param2 === 'param2') {
+                $this->result = true;
+            }

-		$found = false;
+        });

-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof NotFoundHttpException && $e->getCode() == 404);
-		}
+        TestRouter::debug('/test-param1-param2', 'get');

-		$this->assertTrue($found);
-	}
+        $this->assertTrue($this->result);

-	public function testGet()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('get');
+    }

-		SimpleRouter::get('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+    public function testNotFound()
+    {
+        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        TestRouter::get('/non-existing-path', 'DummyController@method1');
+        TestRouter::debug('/test-param1-param2', 'post');
+    }

-	public function testPost()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
+    public function testGet()
+    {
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'get');
+    }

-		SimpleRouter::post('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+    public function testPost()
+    {
+        TestRouter::post('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'post');
+    }

-	public function testPut()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('put');
+    public function testPut()
+    {
+        TestRouter::put('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'put');
+    }

-		SimpleRouter::put('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+    public function testDelete()
+    {
+        TestRouter::delete('/my/test/url', 'DummyController@method1');
+        TestRouter::debug('/my/test/url', 'delete');
+    }

-	public function testDelete()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('delete');
+    public function testMethodNotAllowed()
+    {
+        TestRouter::get('/my/test/url', 'DummyController@method1');

-		SimpleRouter::delete('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
+        try {
+            TestRouter::debug('/my/test/url', 'post');
+        } catch (\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+    }

-	public function testMethodNotAllowed()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
+    public function testSimpleParam()
+    {
+        TestRouter::get('/test-{param1}', 'DummyController@param');
+        $response = TestRouter::debugOutput('/test-param1', 'get');

-		SimpleRouter::get('/my/test/url', 'DummyController@start');
+        $this->assertEquals('param1', $response);
+    }

-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$this->assertEquals(403, $e->getCode());
-		}
-	}
+    public function testPathParamRegex()
+    {
+        TestRouter::get('/{lang}/productscategories/{name}', 'DummyController@param', ['where' => ['lang' => '[a-z]+', 'name' => '[A-Za-z0-9\-]+']]);
+        $response = TestRouter::debugOutput('/it/productscategories/system', 'get');

-	public function testSimpleParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1');
+        $this->assertEquals('it, system', $response);
+    }

-		SimpleRouter::get('/test-{param1}', 'DummyController@param');
-		SimpleRouter::start();
-	}
+    public function testDomainAllowedRoute()
+    {
+        $this->result = false;

-	public function testMultiParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            TestRouter::get('/test', function ($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });

-		SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
-		SimpleRouter::start();
-	}
+        TestRouter::request()->setHost('hello.world.com');
+        TestRouter::debug('/test', 'get');

-	public function testPathParamRegex()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test/path/123123');
+        $this->assertTrue($this->result);

-		SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
-		SimpleRouter::start();
-	}
+    }

-	public function testDomainRoute()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test');
-		SimpleRouter::request()->setHost('hello.world.com');
+    public function testDomainNotAllowedRoute()
+    {
+        $this->result = false;

-		$this->result = false;
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
+            TestRouter::get('/test', function ($subdomain = null) {
+                $this->result = ($subdomain === 'hello');
+            });
+        });

-		SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
-			SimpleRouter::get('/test', function ($subdomain = null) {
-				$this->result = ($subdomain === 'hello');
-			});
-		});
+        TestRouter::request()->setHost('other.world.com');

-		SimpleRouter::start();

-		$this->assertTrue($this->result);
+        TestRouter::debug('/test', 'get');

-	}
+        $this->assertFalse($this->result);
+
+    }
+
+    public function testRegEx()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@method1')->where(['path' => '[a-zA-Z\-]+']);
+        TestRouter::debug('/my/custom-path', 'get');
+    }
+
+    public function testDefaultParameterRegex()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }
+
+    public function testDefaultParameterRegexGroup()
+    {
+        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function() {
+            TestRouter::get('/my/{path}', 'DummyController@param');
+        });
+
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }

 }
@@ -3,99 +3,129 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
+require_once 'Helpers/TestRouter.php';

 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {
-	protected $result = false;

-	protected function getUrl($name = null, $parameters = null, array $getParams = []) {
-		return SimpleRouter::getUrl($name, $parameters, $getParams);
-	}
+    public function testOptionalParameters()
+    {
+        TestRouter::get('/aviso/legal', 'DummyController@method1');
+        TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
+        TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
+        TestRouter::get('/{pagina?}', 'DummyController@method1');

-	public function testUrls()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/');
+        TestRouter::debugNoReset('/aviso/optional', 'get');
+        $this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());

-		// Match normal route on alias
-		SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
+        TestRouter::debugNoReset('/pagina/optional', 'get');
+        $this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());

-		SimpleRouter::get('/about', 'DummyController@about');
+        TestRouter::debugNoReset('/optional', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());

-		SimpleRouter::group(['prefix' => '/admin', 'as' => 'admin'], function() {
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());

-			// Match route with prefix on alias
-			SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'home']);
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());

-			// Match controller with prefix and alias
-			SimpleRouter::controller('/users', 'DummyController', ['as' => 'users']);
+        TestRouter::router()->reset();
+    }

-			// Match controller with prefix and NO alias
-			SimpleRouter::controller('/pages', 'DummyController');
+    public function testSimilarUrls()
+    {
+        // Match normal route on alias
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);

-		});
+        TestRouter::debugNoReset('/url1', 'get');

-		SimpleRouter::group(['prefix' => 'api', 'as' => 'api'], function() {
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());

-			// Match resource controller
-			SimpleRouter::resource('phones', 'DummyController');
+        TestRouter::router()->reset();
+    }

-		});
+    public function testUrls()
+    {
+        // Match normal route on alias
+        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);

-		SimpleRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+        TestRouter::get('/about', 'DummyController@about');

-		// Match controller with no prefix and no alias
-		SimpleRouter::controller('/cats', 'CatsController');
+        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {

-		// Pretend to load page
-		SimpleRouter::start();
+            // Match route with prefix on alias
+            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);

-		$this->assertEquals('/gadgets/iphoneinfo/', $this->getUrl('gadgets.iphone'));
+            // Match controller with prefix and alias
+            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);

-		$this->assertEquals('/api/phones/create/', $this->getUrl('api.phones.create'));
+            // Match controller with prefix and NO alias
+            TestRouter::controller('/pages', 'DummyController');

-		// Should match /
-		$this->assertEquals('/', $this->getUrl('home'));
+        });

-		// Should match /about/
-		$this->assertEquals('/about/', $this->getUrl('DummyController@about'));
+        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {

-		// Should match /admin/
-		$this->assertEquals('/admin/', $this->getUrl('DummyController@start'));
+            // Match resource controller
+            TestRouter::resource('phones', 'DummyController');

-		// Should match /admin/
-		$this->assertEquals('/admin/', $this->getUrl('admin.home'));
+        });

-		// Should match /admin/2/
-		$this->assertEquals('/admin/2/', $this->getUrl('admin.home', ['id' => 2]));
+        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);

-		// Should match /admin/users/
-		$this->assertEquals('/admin/users/', $this->getUrl('admin.users'));
+        // Match controller with no prefix and no alias
+        TestRouter::controller('/cats', 'CatsController');

-		// Should match /admin/users/home/
-		$this->assertEquals('/admin/users/home/', $this->getUrl('admin.users@home'));
+        // Pretend to load page
+        TestRouter::debugNoReset('/', 'get');

-		// Should match /cats/
-		$this->assertEquals('/cats/', $this->getUrl('CatsController'));
+        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));

-		// Should match /cats/view/
-		$this->assertEquals('/cats/view/', $this->getUrl('CatsController', 'view'));
+        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));

-		// Should match /cats/view/
-		//$this->assertEquals('/cats/view/', $this->getUrl('CatsController', ['view']));
+        // Should match /
+        $this->assertEquals('/', TestRouter::getUrl('home'));

-		// Should match /cats/view/666
-		$this->assertEquals('/cats/view/666/', $this->getUrl('CatsController@getView', ['666']));
+        // Should match /about/
+        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));

-		// Should match /funny/man/
-		$this->assertEquals('/funny/man/', $this->getUrl('/funny/man'));
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));

-		// Should match /?jackdaniels=true&cola=yeah
-		$this->assertEquals('/?jackdaniels=true&cola=yeah', $this->getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));

-	}
+        // Should match /admin/2/
+        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
+
+        // Should match /admin/users/
+        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
+
+        // Should match /admin/users/home/
+        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
+
+        // Should match /cats/
+        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
+
+        // Should match /cats/view/
+        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
+
+        // Should match /cats/view/
+        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
+
+        // Should match /cats/view/666
+        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
+
+        // Should match /funny/man/
+        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
+
+        // Should match /?jackdaniels=true&cola=yeah
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+
+        TestRouter::router()->reset();
+
+    }

 }
Author	SHA1	Message	Date
Simon Sessingø	a40f81d5fc	Merge pull request #251 from skipperbent/v3-development V3 development	2017-08-01 21:30:42 +02:00
Simon Sessingø	a5527a0e8c	Merge pull request #250 from skipperbent/bugfix-urlmatch Bugfix urlmatch	2017-08-01 21:30:13 +02:00
Simon Sessingø	3c73de866e	Added code-comments.	2017-08-01 21:25:44 +02:00
Simon Sessingø	883d8a6b0e	Fixes for issue #248	2017-08-01 21:09:18 +02:00
Simon Sessingø	3a7b27796a	Url matching fixes	2017-08-01 18:29:47 +02:00
Simon Sessingø	4cca5186f3	Merge pull request #246 from skipperbent/v3-development V3 development	2017-07-18 11:28:19 +02:00
Simon Sessingø	5437420175	Merge pull request #245 from skipperbent/php5-5-compatibility Fixed PHP 5.5 compatibility (issue: #244 - thanks @thexeos)	2017-07-18 11:27:59 +02:00
Simon Sessingø	410fa3c9f5	Fixed PHP 5.5 compatibility (issue: #244 - thanks @thexeos)	2017-07-18 11:26:45 +02:00
Simon Sessingø	be20fe4dd1	Updated composer.json tags.	2017-07-08 12:20:49 +02:00
Simon Sessingø	0947f6746e	Merge pull request #242 from skipperbent/v3-development V3 development	2017-07-08 12:03:05 +02:00
Simon Sessingø	31c8710ce7	Merge pull request #241 from skipperbent/v-3-3-1 Version 3.3.1	2017-07-08 12:02:41 +02:00
Simon Sessingø	1ac7761d35	Development - Optimized `.gitignore`. - Renamed `XSRF-TOKEN` constant to `CSRF-TOKEN` in `CsrfToken`.	2017-07-08 11:56:57 +02:00
Simon Sessingø	9eb7c5c13c	Removed 'name' as it's set as the default value when calling the `$getItem` function.	2017-07-08 11:49:05 +02:00
Simon Sessingø	5151461a02	Added `setMiddleware` deprecated method in `Route` class.	2017-07-08 11:42:27 +02:00
Simon Sessingø	b07348a3df	Development - Removed temporary `RouterException` class. - Added object-types to parameters in `CallbackExceptionHandler` and `SimpleRouter` classes. - Router now renders groups even if callback is null. - Renamed `setMiddleware` to `addMiddleware` in `Route` class and `IRoute` interface. - `addMiddleware` now accept both object and class strings in `Route` class. - `addExceptionHandler` now accept both object and class strings in `RouteGroup` class. - Added unit-test for rewrite-exception message change: `testRewriteExceptionMessage` in `RouterRewriteTest`. - Fixed typo: renamed `testSimularUrls` to `testSimilarUrls` in `RouterUrlTest`.	2017-07-08 11:21:18 +02:00
Simon Sessingø	d411b31cc2	Changed message-text thrown in `NotFoundHttpException` to show redirected routes (issue: #240 )	2017-07-06 15:46:09 +02:00
Simon Sessingø	ca381d445f	Development - Changed router so it supports both string and object as exception handlers. - Added `Router::error($callback)` method to `Router` class (issue #238). - Fixed issues calling `getController` and `getMethod` when callback is an object (issue #239). - Updated documentation to reflect new changes. - Added `addExceptionHandler` to `IGroupRoute` interface and `RouteGroup` class. - Other minor bugfixes and optimisations.	2017-07-06 15:25:04 +02:00
Simon Sessingø	98ee60859f	Merge pull request #236 from skipperbent/v3-development Development	2017-05-09 07:06:18 +02:00
Simon Sessingø	9dd80dd1d9	Development - Fixed global regex match not working properly. - Feature: added option to change regular expression used for parameters on routes. - Added unit-tests for custom parameter regular expression. - Updated documentation to reflect new features.	2017-05-09 06:43:26 +02:00
Simon Sessingø	fef997422e	Merge pull request #234 from skipperbent/v3-development V3 development	2017-05-09 02:51:58 +02:00
Simon Sessingø	8901e7c125	Development - Added check in `CsrfToken` class to ensure that IV generation is strong and secure. - Minor optimisations mostly related to PHPDocs and PHPStorm code-inspection.	2017-05-09 02:49:41 +02:00
Simon Sessingø	50e8926272	Added .htaccess example to documentation (issue #232 )	2017-05-09 02:31:01 +02:00
Simon Sessingø	27ff761d18	Merge pull request #230 from skipperbent/v3-development V3 development	2017-03-06 02:56:37 +01:00
Simon Sessingø	0a58d36606	Development - Fixed: `RouteController` not matching certain urls. - Made `RouteResource` more strict in url-matching. - Added PHPUnit `RouterControllerTest` class. - Fixed merged `testSimularUrls` method in `RouterUrlTest`.	2017-03-06 02:53:44 +01:00
Simon Sessingø	db024b9588	Added simular routes PHPUnit test	2017-03-06 02:21:13 +01:00
Simon Sessingø	94d0764631	Merge pull request #228 from skipperbent/v3-development Development	2017-03-05 17:10:27 +01:00
Simon Sessingø	ff3f1bdcdd	Development - Fixed issue #227 causing custom resource-routes not to be loaded after latest update. - Optimized `RouteResource` class. - Renamed `IRestController` to `IResourceController`. - Added unit-tests for RouterResource. - Simplified unit-tests with the `TestRouter` custom router class.	2017-03-05 17:09:46 +01:00
Simon Sessingø	3e75d6ec0b	Merge pull request #225 from skipperbent/v3-development Development	2017-03-01 03:39:33 +01:00
Simon Sessingø	8c5d8c2dc9	Development - Fixed: namespace being prepended on `RouterController` routes with absolute namespaces. - Fixed: match domain on `RouteController` and `RouteResource`. - Fixed: strict url-matching on `RouteController`. Fix should provide better url-matching. - Fixed: `RouterResource` always matching first url when having simular urls (ex: `/funny-cat` and `/funny-dog`). - Added `loadRoutes` method to `Router` class so routes now can be loaded without routing the request (useful when running in Cli etc). - Removed `getInstance` from `Router` class. Please use `SimpleRouter::router()` for singleton usage instead. - Added `getRemoteAddr` alias-method for `getIp` in `Request` class. - Added `getValue` to `IInputItem` interface. - Other minor optimizations. - Updated documentation with note on absolute/relative namespaces.	2017-02-26 09:18:35 +01:00
Simon Sessingø	9d2bffcd02	Merge pull request #222 from skipperbent/v3-development Development	2017-02-15 03:29:16 +01:00
Simon Sessingø	2a448fccd2	Development - Fixed: only set default namespace on relative callbacks. - Fixed: default-namespace not being set when calling `SimpleRouter::resource`. - Minor optimisations.	2017-02-15 03:28:34 +01:00
Simon Sessingø	e682cf0b7c	Merge pull request #219 from skipperbent/v3-development V3 development	2017-02-13 06:47:26 +01:00
Simon Sessingø	c87298ee24	Optimisations	2017-02-13 06:45:07 +01:00
Simon Sessingø	79414255e0	Development - Using `$request->setRewriteRoute($route);` rewrite-callback now renders any added middlewares on the route. - Rewrite callbacks now sets default-namespace on route, if defined.	2017-02-13 06:29:22 +01:00
Simon Sessingø	e913dd98da	Merge pull request #217 from skipperbent/v3-development Fixed: replace empty parameter-values with null.	2017-02-12 20:48:02 +01:00
Simon Sessingø	ccd3cf450e	Fixed: replace empty parameter-values with null.	2017-02-12 20:43:49 +01:00
Simon Sessingø	2654ca67db	Merge pull request #214 from skipperbent/v3-development Optimisations	2017-02-09 13:34:32 +01:00
Simon Sessingø	86c3e513c3	Optimisations	2017-02-09 13:33:36 +01:00
Simon Sessingø	ce276bd5b7	Version 3 - Easier rewrite management. - Optimisations. - Updated documentation.	2017-02-09 13:18:05 +01:00
Simon Sessingø	bf069c2d42	Fixed getExtension method in InputFile retuning empty value.	2017-02-01 07:51:35 +01:00
Simon Sessingø	523d49359b	Development - Fixed where method calling itself instead of setWhere. - Added unit-tests for regex.	2017-01-19 18:40:47 +01:00
Simon Sessingø	7cc2652bcd	getRoute optimisations.	2016-11-28 14:13:58 +01:00
Simon Sessingø	e26d55a810	`getUrl` will now use default-parameter value if specificially set to null when using `url()`.	2016-11-28 09:37:05 +01:00
Simon Sessingø	8f3ce68a5e	Optimised route-match behavior	2016-11-28 06:43:26 +01:00
Simon Sessingø	d25351f4f9	Fixed parameters not merged with default values	2016-11-28 05:53:02 +01:00
Simon Sessingø	e8f19fbeae	Simplified `PARAMETERS_REGEX_MATCH` in Route class.	2016-11-28 05:24:12 +01:00
Simon Sessingø	5c89ae2aaf	Moved regex/match functionality to LoadableRoute.	2016-11-28 04:45:46 +01:00
Simon Sessingø	b694a7c0c9	More cleanup	2016-11-28 04:39:34 +01:00
Simon Sessingø	7847b71bbc	Cleanup	2016-11-28 04:38:38 +01:00
Simon Sessingø	d9b97ccf42	Bugfixes	2016-11-28 04:20:34 +01:00
Simon Sessingø	74351e0330	Bugfixes	2016-11-27 01:07:11 +01:00
Simon Sessingø	f5b03e106c	Bugfixes	2016-11-27 00:55:47 +01:00
Simon Sessingø	2c5221051e	Development	2016-11-26 10:40:42 +01:00
Simon Sessingø	aad11ac581	Input optimisations	2016-11-26 05:21:09 +01:00
Simon Sessingø	c1835152b6	Removed PHP 7 specific functionality.	2016-11-26 04:53:05 +01:00
Simon Sessingø	6213f2fb75	Development - Optimised Input-classes. - `get` and `getObject` methods on `Input` now supports filtering on multiple method-types when using the `$method` parameter. - Input classes now know how to parse that stupid nested $_FILES array. - It's now possible to change method-names on ResourceControllers. - Removed `getValue` and `setValue` from `InputFile` classes. - Ensured that request-method are only parsed from $_POST or $_SERVER. - Fixed minor parameter-issues with subdomain routing. - Added PHPDocs. - Added even more unit-tests. - Many small optimisations tweaks.	2016-11-26 04:30:00 +01:00