Updated documentation.

Development
- Fixed issue with subdomains on groups. - Fixed issue with loadble routes sometimes mistakenly inheriting wrong group. - Routes will now check if group matches before matching any custom regex. - Added setValue method to IInputItem class to streamline the InputFile and InputItem classes. - Other minor optimisations. - Documentation: fixed broken links and cleaned it up.
2026-06-17 16:57:53 +00:00 · 2018-03-29 10:14:08 +02:00 · 2018-03-03 23:37:14 +01:00 · 2018-02-27 08:58:57 +01:00 · 2018-02-27 08:20:25 +01:00 · 2018-02-27 00:19:44 +01:00
36 changed files with 1512 additions and 672 deletions
@@ -1,30 +1,25 @@
 # Simple PHP router
 Simple, fast and yet powerful PHP router that is easy to get integrated and in any project. Heavily inspired by the way Laravel handles routing, with both simplicity and expandability in mind.

-**Note: this documentation is currently work-in-progress. Feel free to contribute.**
-
-### Notes
-
-The goal of this project is to create a router that is more or less 100% compatible with the Laravel documentation, while remaining as simple as possible, and as easy to integrate and change without compromising either speed or complexity. Being lightweight is the #1 priority.
-
-### Ideas and issues
-
-If you want a great new feature or experience any issues what-so-ever, please feel free to leave an issue and i'll look into it whenever possible.
+**Please note that this documentation is currently work-in-progress. Feel free to contribute.**

 ---

 ## Table of Contents

 - [Getting started](#getting-started)
-	- [Requirements](#requirements)
 	- [Notes](#notes-1)
+	- [Requirements](#requirements)
+	- [Feedback and development](#feedback-and-development)
+	    - [Issues guidelines](#issues-guidelines)
+	    - [Contribution development guidelines](#contribution-development-guidelines)
 	- [Features](#features)
 	- [Installation](#installation)
 		- [Setting up Apache](#setting-up-apache)
 		- [Setting up Nginx](#setting-up-nginx)
+		- [Setting up IIS](#setting-up-iis)
 		- [Configuration](#configuration)
 		- [Helper functions](#helper-functions)
-
 - [Routes](#routes)
 	- [Basic routing](#basic-routing)
 		- [Available methods](#available-methods)
@@ -42,6 +37,7 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 		- [Namespaces](#namespaces)
 		- [Subdomain-routing](#subdomain-routing)
 		- [Route prefixes](#route-prefixes)
+	- [Partial groups](#partial-groups)
 	- [Form Method Spoofing](#form-method-spoofing)
 	- [Accessing The Current Route](#accessing-the-current-route)
 	- [Other examples](#other-examples)
@@ -49,6 +45,8 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 - [CSRF-protection](#csrf-protection)
 	- [Adding CSRF-verifier](#adding-csrf-verifier)
 	- [Getting CSRF-token](#getting-csrf-token)
+	- [Custom CSRF-verifier](#custom-csrf-verifier)
+	- [Custom Token-provider](#custom-token-provider)

 - [Middlewares](#middlewares)
 	- [Example](#example)
@@ -73,12 +71,10 @@ If you want a great new feature or experience any issues what-so-ever, please fe

 - [Advanced](#advanced)
 	- [Url rewriting](#url-rewriting)
-		- [Rewrite using callback](#rewrite-using-callback)
-		- [Rewrite using url](#rewrite-using-url)
+		- [Changing current route](#changing-current-route)
 		- [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)

 - [Credits](#credits)
@@ -94,12 +90,10 @@ Add the latest version of Simple PHP Router running this command.
 composer require pecee/simple-router
 ```

-## Requirements
-
- PHP 5.5 or greater
-
 ## Notes

+The goal of this project is to create a router that is more or less 100% compatible with the Laravel documentation, while remaining as simple as possible, and as easy to integrate and change without compromising either speed or complexity. Being lightweight is the #1 priority.
+
 We've included a simple demo project for the router which can be found in the `demo-project` folder. This project should give you a basic understanding of how to setup and use simple-php-router project.

 Please note that the demo-project only covers how to integrate the `simple-php-router` in a project without an existing framework. If you are using a framework in your project, the implementation might vary.
@@ -118,6 +112,36 @@ You can find the demo-project here: [https://github.com/skipperbent/simple-route
 - How to get ExceptionHandlers, Middlewares and Controllers working.
 - How to setup your webservers.

+## Requirements
+
+- PHP 5.5 or greater
+
+### Feedback and development
+
+If you are missing a feature, experience problems or have ideas or feedback that you want us to hear, please feel free to create an issue.
+
+###### Issues guidelines
+
+- Please be as detailed as possible in the description when creating a new issue. This will help others to more easily understand- and solve your issue.
+For example: if you are experiencing issues, you should provide the necessary steps to reproduce the error within your description.
+
+- We love to hear out any ideas or feedback to the library.
+
+[Create a new issue here](https://github.com/skipperbent/simple-php-router/issues/new)
+
+###### Contribution development guidelines
+
+- Please try to follow the PSR-2 codestyle guidelines.
+
+- Please create your pull requests to the development base that matches the version number you want to change.
+For example when pushing changes to version 3, the pull request should use the `v3-development` base/branch.
+
+- Create detailed descriptions for your commits, as these will be used in the changelog for new releases.
+
+- When changing existing functionality, please ensure that the unit-tests working.
+
+- When adding new stuff, please remember to add new unit-tests for the functionality.
+
 ## Features

 - Basic routing (`GET`, `POST`, `PUT`, `PATCH`, `UPDATE`, `DELETE`) with support for custom multiple verbs.
@@ -172,6 +196,63 @@ RewriteCond %{SCRIPT_FILENAME} !-l
 RewriteRule ^(.*)$ index.php/$1
 ```

+### Setting up IIS
+
+On IIS you have to add some lines your `web.config` file in the `public` folder or create a new one. If rewriting is not working for you, please check that your IIS version have included the `url rewrite` module or download and install them from Microsoft web site.
+
+#### web.config example
+
+Below is an example of an working `web.config` file used by simple-php-router.
+
+Simply create a new `web.config` 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). If the `web.config` file already exists, add the `<rewrite>` section inside the `<system.webServer>` branch.
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+	<rewrite>
+	  <rules>
+		<!-- Remove slash '/' from the en of the url -->
+		<rule name="RewriteRequestsToPublic">
+		  <match url="^(.*)$" />
+		  <conditions logicalGrouping="MatchAll" trackAllCaptures="false">
+		  </conditions>
+		  <action type="Rewrite" url="/{R:0}" />
+		</rule>
+
+		<!-- When requested file or folder don't exists, will request again through index.php -->
+		<rule name="Imported Rule 1" stopProcessing="true">
+		  <match url="^(.*)$" ignoreCase="true" />
+		  <conditions logicalGrouping="MatchAll">
+			<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+			<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+		  </conditions>
+		  <action type="Rewrite" url="/index.php/{R:1}" appendQueryString="true" />
+		</rule>
+	  </rules>
+	</rewrite>
+    </system.webServer>
+</configuration>
+```
+
+#### Troubleshooting
+
+If you do not have a `favicon.ico` file in your project, you can get a `NotFoundHttpException` (404 - not found).
+To add `favicon.ico` to the IIS ignore-list, add the following line to the `<conditions>` group:
+```
+<add input="{REQUEST_FILENAME}" negate="true" pattern="favicon.ico" ignoreCase="true" />
+```
+
+You can also make one exception for files with some extensions:
+```
+<add input="{REQUEST_FILENAME}" pattern="\.ico|\.png|\.css|\.jpg" negate="true" ignoreCase="true" />
+```
+
+If you are using `$_SERVER['ORIG_PATH_INFO']`, you will get `\index.php\` as part of the returned value. For example:
+```
+/index.php/test/mypage.php
+```
+
 ### 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.
@@ -204,12 +285,13 @@ SimpleRouter::start();

 ### Helper functions

-We recommend that you add these helper functions to your project. Theese will allow you to access functionality of the router more easily.
+We recommend that you add these helper functions to your project. These will allow you to access functionality of the router more easily.

-To implement the functions below, simply copy the code to a new file and require the file before initializing the router.
+To implement the functions below, simply copy the code to a new file and require the file before initializing the router or copy the `helpers.php` we've included in this library.

 ```php
-<?php
+use Pecee\SimpleRouter\SimpleRouter as Router;
+
 /**
 * Get url for a route by using either name/alias, class or method name.
 *
@@ -229,7 +311,7 @@ To implement the functions below, simply copy the code to a new file and require
 */
 function url($name = null, $parameters = null, $getParams = null)
 {
-    return SimpleRouter::getUrl($name, $parameters, $getParams);
+    return Router::getUrl($name, $parameters, $getParams);
 }

 /**
@@ -237,7 +319,7 @@ function url($name = null, $parameters = null, $getParams = null)
 */
 function response()
 {
-    return SimpleRouter::response();
+    return Router::response();
 }

 /**
@@ -245,15 +327,22 @@ function response()
 */
 function request()
 {
-    return SimpleRouter::request();
+    return Router::request();
 }

 /**
 * Get input class
- * @return \Pecee\Http\Input\Input
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param string|array|null $methods Default method
+ * @return \Pecee\Http\Input\Input|string
 */
-function input()
+function input($index = null, $defaultValue = null, $methods = null)
 {
+    if ($index !== null) {
+        return request()->getInput()->get($index, $defaultValue, $methods);
+    }
+
    return request()->getInput();
 }

@@ -265,6 +354,20 @@ function redirect($url, $code = null)

    response()->redirect($url);
 }
+
+/**
+ * Get current csrf-token
+ * @return string|null
+ */
+function csrf_token()
+{
+    $baseVerifier = Router::router()->getCsrfVerifier();
+    if ($baseVerifier !== null) {
+        return $baseVerifier->getToken();
+    }
+
+    return null;
+}
 ```

 ---
@@ -310,7 +413,7 @@ SimpleRouter::any('foo', function() {
 });
 ```

-We've created a simple method which matches `GET` and `POST` which is most commenly used:
+We've created a simple method which matches `GET` and `POST` which is most commonly used:

 ```php
 SimpleRouter::form('foo', function() {
@@ -395,12 +498,12 @@ SimpleRouter::all('/ajax/abc/123', function($param1, $param2) {

 ### Custom regex for matching parameters

-By default simple-php-router uses the `\w` regular expression when 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. 
+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. 
+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.

@@ -496,7 +599,7 @@ SimpleRouter::group(['namespace' => 'Admin'], function () {

 ### Subdomain-routing

-Route groups may also be used to handle sub-domain routing. Sub-domains may be assigned route parameters just like route URIs, allowing you to capture a portion of the sub-domain for usage in your route or controller. The sub-domain may be specified using the `domain` key on the group attribute array:
+Route groups may also be used to handle sub-domain routing. Sub-domains may be assigned route parameters just like route urls, allowing you to capture a portion of the sub-domain for usage in your route or controller. The sub-domain may be specified using the `domain` key on the group attribute array:

 ```php
 SimpleRouter::group(['domain' => '{account}.myapp.com'], function () {
@@ -508,7 +611,7 @@ SimpleRouter::group(['domain' => '{account}.myapp.com'], function () {

 ### Route prefixes

-The `prefix` group attribute may be used to prefix each route in the group with a given URI. For example, you may want to prefix all route URIs within the group with `admin`:
+The `prefix` group attribute may be used to prefix each route in the group with a given url. For example, you may want to prefix all route urls within the group with `admin`:

 ```php
 SimpleRouter::group(['prefix' => '/admin'], function () {
@@ -518,6 +621,29 @@ SimpleRouter::group(['prefix' => '/admin'], function () {
 });
 ```

+## Partial groups
+
+Partial router groups has the same benefits as a normal group, but supports parameters and are only rendered once the url has matched.
+
+This can be extremely useful in situations, where you only want special routes to be added, when a certain criteria or logic has been met.
+
+**NOTE:** Use partial groups with caution as routes added within are only rendered and available once the url of the partial-group has matched. This can cause `url()` not to find urls for the routes added within.
+
+**Example:**
+
+```php
+SimpleRouter::partialGroup('/admin/{applicationId}', function ($applicationId) {
+
+    SimpleRouter::get('/', function($applicationId) {
+
+        // Matches The "/admin/applicationId" URL
+
+    });
+
+});
+```
+
+
 ## Form Method Spoofing

 HTML forms do not support `PUT`, `PATCH` or `DELETE` actions. So, when defining `PUT`, `PATCH` or `DELETE` routes that are called from an HTML form, you will need to add a hidden `_method` field to the form. The value sent with the `_method` field will be used as the HTTP request method:
@@ -584,11 +710,57 @@ SimpleRouter::get('/page/404', 'ControllerPage@notFound', ['as' => 'page.notfoun

 # CSRF Protection

-Any forms posting to `POST`, `PUT` or `DELETE` routes should include the CSRF-token. We strongly recommend that you create your enable CSRF-verification on your site.
+Any forms posting to `POST`, `PUT` or `DELETE` routes should include the CSRF-token. We strongly recommend that you enable CSRF-verification on your site to maximize security.

-Create a new class and extend the ```BaseCsrfVerifier``` middleware class provided with simple-php-router.
+You can use the `BaseCsrfVerifier` to enable CSRF-validation on all request. If you need to disable verification for specific urls, please refer to the "Custom CSRF-verifier" section below.

-Add the property ```except``` with an array of the urls to the routes you would like to exclude/whitelist from the CSRF validation. Using ```*``` at the end for the url will match the entire url.
+By default simple-php-router will use the `CookieTokenProvider` class. This provider will store the security-token in a cookie on the clients machine.
+If you want to store the token elsewhere, please refer to the "Creating custom Token Provider" section below.
+
+## Adding CSRF-verifier
+
+When you've created your CSRF-verifier you need to tell simple-php-router that it should use it. You can do this by adding the following line in your `routes.php` file:
+
+```php
+Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
+```
+
+## Getting CSRF-token
+
+When posting to any of the urls that has CSRF-verification enabled, you need post your CSRF-token or else the request will get rejected.
+
+You can get the CSRF-token by calling the helper method:
+
+```php
+csrf_token();
+```
+
+You can also get the token directly:
+
+```php
+return Router::router()->getCsrfVerifier()->getTokenProvider()->getToken();
+```
+
+The default name/key for the input-field is `csrf_token` and is defined in the `POST_KEY` constant in the `BaseCsrfVerifier` class.
+You can change the key by overwriting the constant in your own CSRF-verifier class.
+
+**Example:**
+
+The example below will post to the current url with a hidden field "`csrf_token`".
+
+```html
+<form method="post" action="<?= url(); ?>">
+    <input type="hidden" name="csrf_token" value="<?= csrf_token(); ?>">
+    <!-- other input elements here -->
+</form>
+```
+
+## Custom CSRF-verifier
+
+Create a new class and extend the `BaseCsrfVerifier` middleware class provided by default with the simple-php-router library.
+
+Add the property `except` with an array of the urls to the routes you want to exclude/whitelist from the CSRF validation.
+Using ```*``` at the end for the url will match the entire url.

 **Here's a basic example on a CSRF-verifier class:**

@@ -606,22 +778,45 @@ class CsrfVerifier extends BaseCsrfVerifier
 }
 ```

-## Adding CSRF-verifier
+## Custom Token Provider

-When you've created your CSRF verifier - you need to tell simple-php-router that it should use it. You can do this by adding the following line in your `routes.php` file:
+By default the `BaseCsrfVerifier` will use the `CookieTokenProvider` to store the token in a cookie on the clients machine.
+
+If you need to store the token elsewhere, you can do that by creating your own class and implementing the `ITokenProvider` class.

 ```php
-Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
+class SessionTokenProvider implements ITokenProvider
+{
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh()
+    {
+        // Implement your own functionality here...
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate($token)
+    {
+        // Implement your own functionality here...
+    }
+
+}
 ```

-## Getting CSRF-token
-
-When posting to any of the urls that has CSRF-verification enabled, you need post your CSRF-token or else the request will get rejected.
-
-You can get the CSRF-token by calling the helper method:
+Next you need to set your custom `ITokenProvider` implementation on your `BaseCsrfVerifier` class in your routes file:

 ```php
-csrf_token();
+$verifier = new \dscuz\Middleware\CsrfVerifier();
+$verifier->setTokenProvider(new SessionTokenProvider());
+
+Router::csrfVerifier($verifier);
 ```

 ---
@@ -648,7 +843,7 @@ class CustomMiddleware implements Middleware {
        // If authentication failed, redirect request to user-login page.
        if($request->user === null) {
            $request->setRewriteUrl(url('user.login'));
-            return $request;
+            return;
        }

    }
@@ -663,18 +858,18 @@ ExceptionHandler are classes that handles all exceptions. ExceptionsHandlers mus

 ## Handling 404, 403 and other errors

-If you simply want to catch a 404 (page not found) etc. you can use the `Router::error($callback)` static helper method. 
+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 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) {
+    if($exception instanceof NotFoundHttpException && $exception->getCode() == 404) {
        response()->redirect('/not-found');
    }
 });
@@ -698,7 +893,7 @@ class CustomExceptionHandler implements IExceptionHandler

 		/* You can use the exception handler to format errors depending on the request and type. */

-		if (stripos($request->getUri(), '/api') !== false) {
+		if (stripos($request->getUrl()->getPath(), '/api') !== false) {

 			response()->json([
 				'error' => $error->getMessage(),
@@ -713,7 +908,7 @@ class CustomExceptionHandler implements IExceptionHandler
 			// Render custom 404-page

 			$request->setRewriteCallback('Demo\Controllers\PageController@notFound');
-			return $request;
+			return;

 		}

@@ -825,7 +1020,7 @@ If items is grouped in the html, it will return an array of items.
 **Note:** `get` will automatically trim the value and ensure that it's not empty. If it's empty the `$defaultValue` will be returned.

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

 ### Get parameter object
@@ -834,11 +1029,11 @@ Will return an instance of `InputItem` or `InputFile` depending on the type.

 You can use this in your html as it will render the value of the item.
 However if you want to compare value in your if statements, you have to use
-the `getValue` or use the `input()->get()` instead.
+the `getValue` or use the `input()` instead.

 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.
+**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()` instead.

 ```php
 $object = input()->getObject($index, $defaultValue = null, $methods = null);
@@ -855,13 +1050,17 @@ $object = input()->getObject($index, $defaultValue = null, $methods = null);
 * $defaultValue is returned if the value is empty.
 */

-$id = input()->get($index, $defaultValue);
+$id = input()->get($index, $defaultValue, $method);
+
+# -- shortcut to above --
+
+$id = input($index, $defaultValue, $method);

 # -- match specific --

-$object = input()->get($index, $defaultValue, 'get');
-$object = input()->get($index, $defaultValue, 'post');
-$object = input()->get($index, $defaultValue, 'file');
+$object = input($index, $defaultValue, 'get');
+$object = input($index, $defaultValue, 'post');
+$object = input($index, $defaultValue, 'file');

 # -- or --

@@ -880,7 +1079,7 @@ $object = input()->findFile($index, $defaultValue);
 */

 /* @var $image \Pecee\Http\Input\InputFile */
-foreach(input()->get('images', []) as $image)
+foreach(input('images', []) as $image)
 {
    if($image->getMime() === 'image/jpeg') {

@@ -913,6 +1112,7 @@ All object implements the `IInputItem` interface and will always contain these m
 - `getValue()` - returns the value of the input.

 `InputFile` has the same methods as above along with some other file-specific methods like:
+- `getFilename` - get the filename.
 - `getTmpName()` - get file temporary name.
 - `getSize()` - get file size.
 - `move($destination)` - move file to destination.
@@ -926,7 +1126,7 @@ Below example requires you to have the helper functions added. Please refer to t

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

 ---
@@ -934,126 +1134,22 @@ $siteId = input()->get('site_id', 2, ['post', 'get']);
 # Advanced

 ## Url rewriting
-Sometimes it can be useful to manipulate the route about to be loaded.
-simple-php-router allows you to easily change the route about to be executed.
-All information about the current route is stored in the ```\Pecee\SimpleRouter\Router``` instance's `loadedRoute` property.

-For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
+### Changing current route
+
+Sometimes it can be useful to manipulate the route about to be loaded.
+simple-php-router allows you to easily manipulate and change the routes which are about to be rendered.
+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 helper function `request()` instead of calling the class directly `\Pecee\SimpleRouter\SimpleRouter::router()`.


 ```php
-use Pecee\SimpleRouter;
-$request = SimpleRouter::request();
-$request->setRewriteCallback('Example\MyCustomClass@hello');
+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;
-
-    }
-}
+request()->setRewriteUrl('/my-rewrite-url');
 ```

 ### Bootmanager: loading routes dynamically
@@ -1077,11 +1173,10 @@ class CustomRouterRules implement IRouterBootManager {

        foreach($rewriteRules as $url => $rule) {

-            // If the current uri matches the url, we use our custom route
+            // If the current url matches the rewrite url, we use our custom route

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

@@ -9,7 +9,12 @@
    "simple-php-router",
    "laravel",
    "pecee",
-    "php"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
  ],
  "license": "MIT",
  "support": {
@@ -0,0 +1,81 @@
+<?php
+
+use Pecee\SimpleRouter\SimpleRouter as Router;
+
+/**
+ * Get url for a route by using either name/alias, class or method name.
+ *
+ * The name parameter supports the following values:
+ * - Route name
+ * - Controller/resource name (with or without method)
+ * - Controller class name
+ *
+ * When searching for controller/resource by name, you can use this syntax "route.name@method".
+ * You can also use the same syntax when searching for a specific controller-class "MyController@home".
+ * If no arguments is specified, it will return the url for the current loaded route.
+ *
+ * @param string|null $name
+ * @param string|array|null $parameters
+ * @param array|null $getParams
+ * @return string
+ * @throws \InvalidArgumentException
+ */
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return Router::getUrl($name, $parameters, $getParams);
+}
+
+/**
+ * @return \Pecee\Http\Response
+ */
+function response()
+{
+    return Router::response();
+}
+
+/**
+ * @return \Pecee\Http\Request
+ */
+function request()
+{
+    return Router::request();
+}
+
+/**
+ * Get input class
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param string|array|null $methods Default method
+ * @return \Pecee\Http\Input\Input|string
+ */
+function input($index = null, $defaultValue = null, $methods = null)
+{
+    if ($index !== null) {
+        return request()->getInput()->get($index, $defaultValue, $methods);
+    }
+
+    return request()->getInput();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
+}
+
+/**
+ * Get current csrf-token
+ * @return string|null
+ */
+function csrf_token()
+{
+    $baseVerifier = Router::router()->getCsrfVerifier();
+    if ($baseVerifier !== null) {
+        return $baseVerifier->getTokenProvider()->getToken();
+    }
+
+    return null;
+}
@@ -1,79 +0,0 @@
-<?php
-namespace Pecee;
-
-class CsrfToken
-{
-    const CSRF_KEY = 'CSRF-TOKEN';
-
-    protected $token;
-
-    /**
-     * Generate random identifier for CSRF token
-     *
-     * @throws \RuntimeException
-     * @return string
-     */
-    public static function generateToken()
-    {
-        if (function_exists('random_bytes')) {
-            return bin2hex(random_bytes(32));
-        }
-
-        $isSourceStrong = false;
-
-        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
-        if ($isSourceStrong === false || $random === false) {
-            throw new \RuntimeException('IV generation failed');
-        }
-
-        return $random;
-    }
-
-    /**
-     * Validate valid CSRF token
-     *
-     * @param string $token
-     * @return bool
-     */
-    public function validate($token)
-    {
-        if ($token !== null && $this->getToken() !== null) {
-            return hash_equals($token, $this->getToken());
-        }
-
-        return false;
-    }
-
-    /**
-     * Set csrf token cookie
-     *
-     * @param $token
-     */
-    public function setToken($token)
-    {
-        setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
-    }
-
-    /**
-     * Get csrf token
-     * @return string|null
-     */
-    public function getToken()
-    {
-        if ($this->hasToken() === true) {
-            return $_COOKIE[static::CSRF_KEY];
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns whether the csrf token has been defined
-     * @return bool
-     */
-    public function hasToken()
-    {
-        return isset($_COOKIE[static::CSRF_KEY]);
-    }
-
-}
@@ -0,0 +1,6 @@
+<?php
+namespace Pecee\Exceptions;
+
+class InvalidArgumentException extends \InvalidArgumentException {
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Exceptions;
+
+class MalformedUrlException extends \Exception
+{
+
+}
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Input;

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

    public function getValue();

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

 }
@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\Http\Input;

+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Request;

 class Input
@@ -25,6 +27,10 @@ class Input
     */
    protected $request;

+    /**
+     * Input constructor.
+     * @param Request $request
+     */
    public function __construct(Request $request)
    {
        $this->request = $request;
@@ -32,10 +38,14 @@ class Input
        $this->parseInputs();
    }

+    /**
+     * Parse input values
+     *
+     */
    public function parseInputs()
    {
        /* Parse get requests */
-        if (count($_GET) > 0) {
+        if (count($_GET) !== 0) {
            $this->get = $this->handleGetPost($_GET);
        }

@@ -46,16 +56,19 @@ class Input
            parse_str(file_get_contents('php://input'), $postVars);
        }

-        if (count($postVars) > 0) {
+        if (count($postVars) !== 0) {
            $this->post = $this->handleGetPost($postVars);
        }

        /* Parse get requests */
-        if (count($_FILES) > 0) {
+        if (count($_FILES) !== 0) {
            $this->file = $this->parseFiles();
        }
    }

+    /**
+     * @return array
+     */
    public function parseFiles()
    {
        $list = [];
@@ -65,15 +78,19 @@ class Input
            // Handle array input
            if (is_array($value['name']) === false) {
                $values['index'] = $key;
-                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
+                try {
+                    $list[$key] = InputFile::createFromArray($values + $value);
+                } catch(InvalidArgumentException $e ){
+
+                }
                continue;
            }

-            $keys = [];
+            $keys = [$key];

            $files = $this->rearrangeFiles($value['name'], $keys, $value);

-            if (isset($list[$key])) {
+            if (isset($list[$key]) === true) {
                $list[$key][] = $files;
            } else {
                $list[$key] = $files;
@@ -87,48 +104,44 @@ class Input
    protected function rearrangeFiles(array $values, &$index, $original)
    {

+        $originalIndex = $index[0];
+        array_shift($index);
+
        $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) {
+            if (is_array($original['name'][$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'),
-                ]);
+                try {
+
+                    $file = InputFile::createFromArray([
+                        'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
+                        'name'     => $original['name'][$key],
+                        'error'    => $original['error'][$key],
+                        'tmp_name' => $original['tmp_name'][$key],
+                        'type'     => $original['type'][$key],
+                        'size'     => $original['size'][$key],
+                    ]);
+
+                    if (isset($output[$key]) === true) {
+                        $output[$key][] = $file;
+                        continue;
+                    }

-                if (isset($output[$key])) {
-                    $output[$key][] = $file;
-                } else {
                    $output[$key] = $file;
-                }
+                    continue;

-                continue;
+                } catch(InvalidArgumentException $e) {
+
+                }
            }

            $index[] = $key;

            $files = $this->rearrangeFiles($value, $index, $original);

-            if (isset($output[$key])) {
+            if (isset($output[$key]) === true) {
                $output[$key][] = $files;
            } else {
                $output[$key] = $files;
@@ -143,13 +156,7 @@ class Input
    {
        $list = [];

-        $max = count($array) - 1;
-        $keys = array_keys($array);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $value = $array[$key];
+        foreach ($array as $key => $value) {

            // Handle array input
            if (is_array($value) === false) {
@@ -217,15 +224,15 @@ class Input

        $element = null;

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

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

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

@@ -269,21 +276,21 @@ class Input
     */
    public function all(array $filter = null)
    {
-        $output = $_POST;
+        $output = $_GET + $_POST;

        if ($this->request->getMethod() === 'post') {

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

            if (strpos(trim($contents), '{') === 0) {
-                $output = json_decode($contents, true);
-                if ($output === false) {
-                    $output = [];
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output += $post;
                }
            }
        }

-        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output);
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
    }

 }
@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http\Input;

+use Pecee\Exceptions\InvalidArgumentException;
+
 class InputFile implements IInputItem
 {
    public $index;
@@ -8,39 +11,41 @@ class InputFile implements IInputItem
    public $filename;
    public $size;
    public $type;
-    public $error;
+    public $errors;
    public $tmpName;

    public function __construct($index)
    {
        $this->index = $index;

+        $this->errors = 0;
+
        // Make the name human friendly, by replace _ with space
-        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
    }

    /**
     * Create from array
     *
     * @param array $values
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
     * @return static
     */
    public static function createFromArray(array $values)
    {
-        if (!isset($values['index'])) {
-            throw new \InvalidArgumentException('Index key is required');
+        if (isset($values['index']) === false) {
+            throw new InvalidArgumentException('Index key is required');
        }

        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */

-        $values = array_merge([
+        $values += [
            'tmp_name' => null,
            'type'     => null,
            'size'     => null,
            'name'     => null,
            'error'    => null,
-        ], $values);
+        ];

        return (new static($values['index']))
            ->setSize($values['size'])
@@ -215,7 +220,7 @@ class InputFile implements IInputItem
     */
    public function getError()
    {
-        return $this->error;
+        return $this->errors;
    }

    /**
@@ -226,7 +231,7 @@ class InputFile implements IInputItem
     */
    public function setError($error)
    {
-        $this->error = (int)$error;
+        $this->errors = (int)$error;

        return $this;
    }
@@ -261,14 +266,26 @@ class InputFile implements IInputItem
        return $this->getFilename();
    }

+    /**
+     * @param string $value
+     * @return static
+     */
+    public function setValue($value)
+    {
+        $this->filename = $value;
+
+        return $this;
+    }
+
    public function toArray()
    {
        return [
            'tmp_name' => $this->tmpName,
            'type'     => $this->type,
            'size'     => $this->size,
-            'name'     => $this->filename,
-            'error'    => $this->error,
+            'name'     => $this->name,
+            'error'    => $this->errors,
+            'filename' => $this->filename,
        ];
    }

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Input;

 class InputItem implements IInputItem
@@ -13,7 +14,7 @@ class InputItem implements IInputItem
        $this->value = $value;

        // Make the name human friendly, by replace _ with space
-        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
    }

    /**
@@ -1,9 +1,11 @@
 <?php
+
 namespace Pecee\Http\Middleware;

-use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
+use Pecee\Http\Security\CookieTokenProvider;
+use Pecee\Http\Security\ITokenProvider;

 class BaseCsrfVerifier implements IMiddleware
 {
@@ -11,15 +13,15 @@ class BaseCsrfVerifier implements IMiddleware
    const HEADER_KEY = 'X-CSRF-TOKEN';

    protected $except;
-    protected $csrfToken;
-    protected $token;
+    protected $tokenProvider;

+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
    public function __construct()
    {
-        $this->csrfToken = new CsrfToken();
-
-        // Generate or get the CSRF-Token from Cookie.
-        $this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
+        $this->tokenProvider = new CookieTokenProvider();
    }

    /**
@@ -29,7 +31,7 @@ class BaseCsrfVerifier implements IMiddleware
     */
    protected function skip(Request $request)
    {
-        if ($this->except === null || is_array($this->except) === false) {
+        if ($this->except === null || count($this->except) === 0) {
            return false;
        }

@@ -41,9 +43,9 @@ class BaseCsrfVerifier implements IMiddleware
            $url = rtrim($url, '/');
            if ($url[strlen($url) - 1] === '*') {
                $url = rtrim($url, '*');
-                $skip = (stripos($request->getUri(), $url) === 0);
+                $skip = (stripos($request->getUrl()->getOriginalUrl(), $url) === 0);
            } else {
-                $skip = ($url === rtrim($request->getUri(), '/'));
+                $skip = ($url === $request->getUrl()->getOriginalUrl());
            }

            if ($skip === true) {
@@ -54,6 +56,12 @@ class BaseCsrfVerifier implements IMiddleware
        return false;
    }

+    /**
+     * Handle request
+     *
+     * @param Request $request
+     * @throws TokenMismatchException
+     */
    public function handle(Request $request)
    {

@@ -66,34 +74,29 @@ class BaseCsrfVerifier implements IMiddleware
                $token = $request->getHeader(static::HEADER_KEY);
            }

-            if ($this->csrfToken->validate($token) === false) {
-                throw new TokenMismatchException('Invalid csrf-token.');
+            if ($this->tokenProvider->validate($token) === false) {
+                throw new TokenMismatchException('Invalid CSRF-token.');
            }

        }

+        // Refresh existing token
+        $this->tokenProvider->refresh();
+
    }

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

-    public function hasToken()
+    /**
+     * Set token provider
+     * @param ITokenProvider $provider
+     */
+    public function setTokenProvider(ITokenProvider $provider)
    {
-        if ($this->token !== null) {
-            return true;
-        }
-
-        return $this->csrfToken->hasToken();
-    }
-
-    public function getToken()
-    {
-        return $this->token;
+        $this->tokenProvider = $provider;
    }

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

 use Pecee\Http\Input\Input;
@@ -11,10 +12,12 @@ class Request
    private $data = [];
    protected $headers;
    protected $host;
-    protected $uri;
+    protected $url;
    protected $method;
    protected $input;

+    protected $hasRewrite = false;
+
    /**
     * @var ILoadableRoute|null
     */
@@ -26,26 +29,27 @@ class Request
     */
    protected $loadedRoute;

+    /**
+     * Request constructor.
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
    public function __construct()
    {
        $this->parseHeaders();
-        $this->host = $this->getHeader('http-host');
-        $this->uri = $this->getHeader('request-uri');
+        $this->setHost($this->getHeader('http-host'));
+
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUrl($this->getHeader('unencoded-url', $this->getHeader('request-uri')));
+
        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
    }

    protected function parseHeaders()
    {
        $this->headers = [];

-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-            $key = $keys[$i];
-            $value = $_SERVER[$key];
-
+        foreach ($_SERVER as $key => $value) {
            $this->headers[strtolower($key)] = $value;
            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
        }
@@ -58,11 +62,11 @@ class Request
    }

    /**
-     * @return string
+     * @return Url
     */
-    public function getUri()
+    public function getUrl()
    {
-        return $this->uri;
+        return $this->url;
    }

    /**
@@ -164,24 +168,7 @@ class Request
     */
    public function getHeader($name, $defaultValue = null)
    {
-        if (isset($this->headers[strtolower($name)])) {
-            return $this->headers[strtolower($name)];
-        }
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $name = $_SERVER[$key];
-
-            if ($key === $name) {
-                return $name;
-            }
-        }
-
-        return $defaultValue;
+        return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
    }

    /**
@@ -205,6 +192,16 @@ class Request
        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
    }

+    /**
+     * Returns true if the request is made through Ajax
+     *
+     * @return bool
+     */
+    public function isAjax()
+    {
+        return (strtolower($this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
+    }
+
    /**
     * Get accept formats
     * @return array
@@ -215,11 +212,12 @@ class Request
    }

    /**
-     * @param string $uri
+     * @param string|Url $url
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
-    public function setUri($uri)
+    public function setUrl($url)
    {
-        $this->uri = $uri;
+        $this->url = ($url instanceof Url) ? $url : new Url($url);
    }

    /**
@@ -246,26 +244,8 @@ class Request
     */
    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);
-
-            }
-
-        }
+        $this->hasRewrite = true;
+        $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);

        return $this;
    }
@@ -298,7 +278,8 @@ class Request
     */
    public function setRewriteUrl($rewriteUrl)
    {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';

        return $this;
    }
@@ -310,7 +291,9 @@ class Request
     */
    public function setRewriteCallback($callback)
    {
-        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+        $this->hasRewrite = true;
+
+        return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
    }

    /**
@@ -335,6 +318,23 @@ class Request
        return $this;
    }

+    public function hasRewrite()
+    {
+        return $this->hasRewrite;
+    }
+
+    public function setHasRewrite($value)
+    {
+        $this->hasRewrite = $value;
+
+        return $this;
+    }
+
+    public function isRewrite($url)
+    {
+        return ($this->rewriteUrl === $url);
+    }
+
    public function __isset($name)
    {
        return array_key_exists($name, $this->data);
@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http;

+use Pecee\Exceptions\InvalidArgumentException;
+
 class Response
 {
    protected $request;
@@ -36,12 +39,12 @@ class Response
        }

        $this->header('location: ' . $url);
-        die();
+        exit(0);
    }

    public function refresh()
    {
-        $this->redirect($this->request->getUri());
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
    }

    /**
@@ -82,14 +85,21 @@ class Response
    }

    /**
-     * Json encode array
-     * @param array $value
+     * Json encode
+     * @param array|\JsonSerializable $value
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws InvalidArgumentException
     */
-    public function json(array $value)
+    public function json($value, $options = null, $dept = 512)
    {
-        $this->header('Content-Type: application/json');
-        echo json_encode($value);
-        die();
+        if (($value instanceof \JsonSerializable) === false && is_array($value) === false) {
+            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
+        }
+
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
+        exit(0);
    }

    /**
@@ -0,0 +1,129 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+use Pecee\Http\Security\Exceptions\SecurityException;
+
+class CookieTokenProvider implements ITokenProvider
+{
+    const CSRF_KEY = 'CSRF-TOKEN';
+
+    protected $token;
+    protected $cookieTimeoutMinutes = 120;
+
+    /**
+     * CookieTokenProvider constructor.
+     * @throws SecurityException
+     */
+    public function __construct()
+    {
+        $this->token = $this->getToken();
+
+        if ($this->token === null) {
+            $this->token = $this->generateToken();
+        }
+    }
+
+    /**
+     * Generate random identifier for CSRF token
+     *
+     * @return string
+     * @throws SecurityException
+     */
+    public function generateToken()
+    {
+        if (function_exists('random_bytes') === true) {
+            try {
+                return bin2hex(random_bytes(32));
+            } catch(\Exception $e) {
+                throw new SecurityException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+            }
+        }
+
+        $isSourceStrong = false;
+
+        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
+        if ($isSourceStrong === false || $random === false) {
+            throw new SecurityException('IV generation failed');
+        }
+
+        return $random;
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate($token)
+    {
+        if ($token !== null && $this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
+
+        return false;
+    }
+
+    /**
+     * Set csrf token cookie
+     * Overwrite this method to save the token to another storage like session etc.
+     *
+     * @param string $token
+     */
+    public function setToken($token)
+    {
+        $this->token = $token;
+        setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
+    }
+
+    /**
+     * Get csrf token
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken($defaultValue = null)
+    {
+        $this->token = ($this->hasToken() === true) ? $_COOKIE[static::CSRF_KEY] : null;
+
+        return ($this->token !== null) ? $this->token : $defaultValue;
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh()
+    {
+        if ($this->token !== null) {
+            $this->setToken($this->token);
+        }
+    }
+
+    /**
+     * Returns whether the csrf token has been defined
+     * @return bool
+     */
+    public function hasToken()
+    {
+        return isset($_COOKIE[static::CSRF_KEY]);
+    }
+
+    /**
+     * Get timeout for cookie in minutes
+     * @return int
+     */
+    public function getCookieTimeoutMinutes()
+    {
+        return $this->cookieTimeoutMinutes;
+    }
+
+    /**
+     * Set cookie timeout in minutes
+     * @param $minutes
+     */
+    public function setCookieTimeoutMinutes($minutes)
+    {
+        $this->cookieTimeoutMinutes = $minutes;
+    }
+
+}
@@ -0,0 +1,6 @@
+<?php
+namespace Pecee\Http\Security\Exceptions;
+
+class SecurityException extends \Exception {
+
+}
@@ -0,0 +1,21 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+interface ITokenProvider
+{
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh();
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate($token);
+
+}
@@ -0,0 +1,175 @@
+<?php
+
+namespace Pecee\Http;
+
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url
+{
+    private $originalUrl;
+    private $data = [
+        'scheme'   => null,
+        'host'     => null,
+        'port'     => null,
+        'user'     => null,
+        'pass'     => null,
+        'path'     => null,
+        'query'    => null,
+        'fragment' => null,
+    ];
+
+    /**
+     * Url constructor.
+     * @param string $url
+     * @throws MalformedUrlException
+     */
+    public function __construct($url)
+    {
+        $this->originalUrl = $url;
+        $this->data = $this->parseUrl($url) + $this->data;
+
+        if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
+            $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+        }
+
+    }
+
+    /**
+     * Check if url is using a secure protocol like https
+     * @return bool
+     */
+    public function isSecure()
+    {
+        return (strtolower($this->getScheme()) === 'https');
+    }
+
+    /**
+     * Checks if url is relative
+     * @return bool
+     */
+    public function isRelative()
+    {
+        return ($this->getHost() === null);
+    }
+
+    /**
+     * Get url scheme
+     * @return string|null
+     */
+    public function getScheme()
+    {
+        return $this->data['scheme'];
+    }
+
+    /**
+     * Get url host
+     * @return string|null
+     */
+    public function getHost()
+    {
+        return $this->data['host'];
+    }
+
+    /**
+     * Get url port
+     * @return int|null
+     */
+    public function getPort()
+    {
+        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
+    }
+
+    /**
+     * Parse username from url
+     * @return string|null
+     */
+    public function getUserName()
+    {
+        return $this->data['user'];
+    }
+
+    /**
+     * Parse password from url
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return $this->data['pass'];
+    }
+
+    /**
+     * Get path from url
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->data['path'];
+    }
+
+    /**
+     * Get querystring from url
+     * @return string|null
+     */
+    public function getQueryString()
+    {
+        return $this->data['query'];
+    }
+
+    /**
+     * Get fragment from url (everything after #)
+     * @return string|null
+     */
+    public function getFragment()
+    {
+        return $this->data['fragment'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl()
+    {
+        return $this->originalUrl;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @throws MalformedUrlException
+     * @return array
+     */
+    public function parseUrl($url, $component = -1)
+    {
+        $encodedUrl = preg_replace_callback(
+            '/[^:\/@?&=#]+/u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new MalformedUrlException('Malformed URL: ' . $url);
+        }
+
+        return array_map('urldecode', $parts);
+    }
+
+    /**
+     * Returns data array with information about the url
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function __toString()
+    {
+        return $this->getOriginalUrl();
+    }
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+interface IPartialGroupRoute
+{
+
+}
@@ -21,7 +21,7 @@ interface IRoute
     *
     * @param Request $request
     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
-     * @return void
+     * @return string
     */
    public function renderRoute(Request $request);

@@ -28,24 +28,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    public function loadMiddleware(Request $request)
    {
-        $max = count($this->getMiddlewares());
+        foreach ($this->getMiddlewares() as $middleware) {

-        if ($max > 0) {
-
-            for ($i = 0; $i < $max; $i++) {
-
-                $middleware = $this->getMiddlewares()[$i];
-
-                if (is_object($middleware) === false) {
-                    $middleware = $this->loadClass($middleware);
-                }
-
-                if (($middleware instanceof IMiddleware) === false) {
-                    throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
-                }
-
-                $middleware->handle($request);
+            if (is_object($middleware) === false) {
+                $middleware = $this->loadClass($middleware);
            }
+
+            if (($middleware instanceof IMiddleware) === false) {
+                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+            }
+
+            $middleware->handle($request);
        }
    }

@@ -57,7 +50,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            return null;
        }

-        return (preg_match($this->regex, $request->getHost() . $url) > 0);
+        return ((bool)preg_match($this->regex, $request->getHost() . $url) !== false);
    }

    /**
@@ -74,7 +67,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute

            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);

-            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
                $this->parameters = array_fill_keys($matches[1], null);
            }
        }
@@ -92,7 +85,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Used when calling the url() helper.
     *
     * @param string|null $method
-     * @param array|null $parameters
+     * @param string|array|null $parameters
     * @param string|null $name
     * @return string
     */
@@ -102,7 +95,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute

        $group = $this->getGroup();

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

@@ -118,16 +111,19 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        /* 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 = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
+        foreach (array_keys($params) as $param) {

-            /* If parameter is specifically set to null - use the original-defined value */
-            if ($value === null && isset($this->originalParameters[$param])) {
-                $value = $this->originalParameters[$param];
+            if ($parameters === '' || (is_array($parameters) === true && count($parameters) === 0)) {
+                $value = '';
+            } else {
+                $p = (array)$parameters;
+                $value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
+
+                /* 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) {
@@ -138,7 +134,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            }
        }

-        $url .= join('/', $unknownParams);
+        $url = '/' . ltrim($url, '/') . implode('/', $unknownParams);

        return rtrim($url, '/') . '/';
    }
@@ -222,15 +218,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     */
    public function setSettings(array $values, $merge = false)
    {
-        if (isset($values['as'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
            if ($this->name !== null && $merge !== false) {
-                $this->setName($values['as'] . '.' . $this->name);
-            } else {
-                $this->setName($values['as']);
+                $name .= '.' . $this->name;
            }
+
+            $this->setName($name);
        }

-        if (isset($values['prefix'])) {
+        if (isset($values['prefix']) === true) {
            $this->setUrl($values['prefix'] . $this->getUrl());
        }

@@ -33,10 +33,16 @@ abstract class Route implements IRoute
     *
     * @var bool
     */
-    protected $filterEmptyParams = false;
-    protected $defaultParameterRegex = null;
+    protected $filterEmptyParams = true;
+
+    /**
+     * Default regular expression used for parsing parameters.
+     * @var string|null
+     */
+    protected $defaultParameterRegex;
    protected $paramModifiers = '{}';
    protected $paramOptionalSymbol = '?';
+    protected $urlRegex = '/^%s\/?$/u';
    protected $group;
    protected $parent;
    protected $callback;
@@ -50,6 +56,12 @@ abstract class Route implements IRoute
    protected $originalParameters = [];
    protected $middlewares = [];

+    /**
+     * Load class by name
+     * @param string $name
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
    protected function loadClass($name)
    {
        if (class_exists($name) === false) {
@@ -59,22 +71,35 @@ abstract class Route implements IRoute
        return new $name();
    }

+    /**
+     * Render route
+     *
+     * @param Request $request
+     * @return string|mixed
+     * @throws NotFoundHttpException
+     */
    public function renderRoute(Request $request)
    {
        $callback = $this->getCallback();

        if ($callback === null) {
-            return;
+            return null;
+        }
+
+        $parameters = $this->getParameters();
+
+        /* Filter parameters with null-value */
+
+        if ($this->filterEmptyParams === true) {
+            $parameters = array_filter($parameters, function ($var) {
+                return ($var !== null);
+            });
        }

        /* Render callback function */
        if (is_callable($callback) === true) {
-
            /* When the callback is a function */
-            call_user_func_array($callback, $this->getParameters());
-
-            return;
-
+            return call_user_func_array($callback, $parameters);
        }

        /* When the callback is a class + method */
@@ -91,17 +116,7 @@ abstract class Route implements IRoute
            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);
+        return call_user_func_array([$class, $method], $parameters);
    }

    protected function parseParameters($route, $url, $parameterRegex = null)
@@ -113,9 +128,11 @@ abstract class Route implements IRoute
        // Ensures that hostnames/domains will work with parameters
        $url = '/' . ltrim($url, '/');

-        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+            $urlRegex = preg_quote($route, '/');
+        } else {

-            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', $route);

            foreach ($urlParts as $key => $t) {

@@ -138,35 +155,31 @@ abstract class Route implements IRoute
                        }
                    }

-                    $regex = sprintf('(?:\/|\-)' . $parameters[2][$key] . '(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
-
+                    $regex = sprintf('(?:\/|\-)%1$s(?P<%2$s>%3$s)%1$s', $parameters[2][$key], $name, $regex);
                }

                $urlParts[$key] = preg_quote($t, '/') . $regex;
            }

-            $urlRegex = join('', $urlParts);
+            $urlRegex = implode('', $urlParts);

-        } else {
-            $urlRegex = preg_quote($route, '/');
        }

-        if (preg_match('/^' . $urlRegex . '\/?/', $url, $matches) > 0) {
+        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+            return null;
+        }

-            $values = [];
+        $values = [];

-            if (isset($parameters[1]) === true) {
+        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;
-                }
+            /* Only take matched parameters with name */
+            foreach ((array)$parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
            }
-
-            return $values;
        }

-        return null;
+        return $values;
    }

    /**
@@ -236,6 +249,9 @@ abstract class Route implements IRoute
    {
        $this->group = $group;

+        /* Add/merge parent settings with child */
+        $this->setSettings($group->toArray(), true);
+
        return $this;
    }

@@ -357,15 +373,15 @@ abstract class Route implements IRoute
            $values['namespace'] = $this->namespace;
        }

-        if (count($this->requestMethods) > 0) {
+        if (count($this->requestMethods) !== 0) {
            $values['method'] = $this->requestMethods;
        }

-        if (count($this->where) > 0) {
+        if (count($this->where) !== 0) {
            $values['where'] = $this->where;
        }

-        if (count($this->middlewares) > 0) {
+        if (count($this->middlewares) !== 0) {
            $values['middleware'] = $this->middlewares;
        }

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

-        if (isset($values['method'])) {
+        if (isset($values['method']) === true) {
            $this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
        }

-        if (isset($values['where'])) {
+        if (isset($values['where']) === true) {
            $this->setWhere(array_merge($this->where, (array)$values['where']));
        }

-        if (isset($values['parameters'])) {
+        if (isset($values['parameters']) === true) {
            $this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
        }

        // Push middleware if multiple
-        if (isset($values['middleware'])) {
+        if (isset($values['middleware']) === true) {
            $this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
        }

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

@@ -459,7 +475,7 @@ abstract class Route implements IRoute
        /* Sort the parameters after the user-defined param order, if any */
        $parameters = [];

-        if (count($this->originalParameters) > 0) {
+        if (count($this->originalParameters) !== 0) {
            $parameters = $this->originalParameters;
        }

@@ -478,7 +494,7 @@ abstract class Route implements IRoute
         * 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) {
+        if (count($parameters) !== 0 && count($this->originalParameters) === 0) {
            $this->originalParameters = $parameters;
        }

@@ -528,7 +544,7 @@ abstract class Route implements IRoute
    }

    /**
-     * @return string|array
+     * @return array
     */
    public function getMiddlewares()
    {
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
@@ -76,19 +77,20 @@ class RouteController extends LoadableRoute implements IControllerRoute

        $group = $this->getGroup();

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

-        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . implode('/', $parameters);

        return '/' . trim($url, '/') . '/';
    }

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);
@@ -100,7 +102,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
        $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
        $path = explode('/', $strippedUrl);

-        if (count($path) > 0) {
+        if (count($path) !== 0) {

            $method = (isset($path[0]) === false || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
            $this->method = $request->getMethod() . ucfirst($method);
@@ -171,7 +173,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     */
    public function setSettings(array $values, $merge = false)
    {
-        if (isset($values['names'])) {
+        if (isset($values['names']) === true) {
            $this->names = $values['names'];
        }

@@ -28,7 +28,7 @@ class RouteGroup extends Route implements IGroupRoute

            $parameters = $this->parseParameters($domain, $request->getHost(), '.*');

-            if ($parameters !== null && count($parameters) > 0) {
+            if ($parameters !== null && count($parameters) !== 0) {

                $this->parameters = $parameters;

@@ -48,6 +48,10 @@ class RouteGroup extends Route implements IGroupRoute
     */
    public function matchRoute($url, Request $request)
    {
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
        /* Skip if prefix doesn't match */
        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
            return false;
@@ -146,24 +150,27 @@ class RouteGroup extends Route implements IGroupRoute
    public function setSettings(array $values, $merge = false)
    {

-        if (isset($values['prefix'])) {
+        if (isset($values['prefix']) === true) {
            $this->setPrefix($values['prefix'] . $this->prefix);
        }

-        if (isset($values['exceptionHandler'])) {
+        if ($merge === false && isset($values['exceptionHandler']) === true) {
            $this->setExceptionHandlers((array)$values['exceptionHandler']);
        }

-        if (isset($values['domain'])) {
+        if ($merge === false && isset($values['domain']) === true) {
            $this->setDomains((array)$values['domain']);
        }

-        if (isset($values['as'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
            if ($this->name !== null && $merge !== false) {
-                $this->name = $values['as'] . '.' . $this->name;
-            } else {
-                $this->name = $values['as'];
+                $name .= '.' . $this->name;
            }
+
+            $this->name = $name;
        }

        parent::setSettings($values, $merge);
@@ -188,7 +195,7 @@ class RouteGroup extends Route implements IGroupRoute
            $values['as'] = $this->name;
        }

-        if (count($this->parameters) > 0) {
+        if (count($this->parameters) !== 0) {
            $values['parameters'] = $this->parameters;
        }

@@ -0,0 +1,40 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+
+class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
+{
+    protected $urlRegex = '/^%s\/?/u';
+
+    /**
+     * Method called to check if route matches
+     *
+     * @param string $url
+     * @param Request $request
+     * @return bool
+     */
+    public function matchRoute($url, Request $request)
+    {
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+        
+        if ($this->prefix !== null) {
+            /* Parse parameters from current route */
+            $parameters = $this->parseParameters($this->prefix, $url);
+
+            /* If no custom regular expression or parameters was found on this route, we stop */
+            if ($parameters === null) {
+                return false;
+            }
+
+            /* Set the parameters */
+            $this->setParameters((array)$parameters);
+        }
+
+        return $this->matchDomain($request);
+    }
+
+}
@@ -79,8 +79,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);
@@ -209,11 +210,11 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     */
    public function setSettings(array $values, $merge = false)
    {
-        if (isset($values['names'])) {
+        if (isset($values['names']) === true) {
            $this->names = $values['names'];
        }

-        if (isset($values['methods'])) {
+        if (isset($values['methods']) === true) {
            $this->methodNames = $values['methods'];
        }

@@ -14,8 +14,9 @@ class RouteUrl extends LoadableRoute

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);
@@ -2,6 +2,7 @@

 namespace Pecee\SimpleRouter;

+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
@@ -10,17 +11,12 @@ use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IControllerRoute;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;

 class Router
 {

-    /**
-     * The instance of this class
-     * @var static
-     */
-    protected static $instance;
-
    /**
     * Current request
     * @var Request
@@ -70,11 +66,18 @@ class Router
     */
    protected $exceptionHandlers;

+    /**
+     * Router constructor.
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
    public function __construct()
    {
        $this->reset();
    }

+    /**
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
    public function reset()
    {
        $this->processingRoute = false;
@@ -94,92 +97,98 @@ class Router
    public function addRoute(IRoute $route)
    {
        /*
-         * If a route is currently being processed, that means that the
-         * route being added are rendered from the parent routes callback,
-         * so we add them to the stack instead.
+         * If a route is currently being processed, that means that the route being added are rendered from the parent
+         * routes callback, so we add them to the stack instead.
         */
        if ($this->processingRoute === true) {
            $this->routeStack[] = $route;
-        } else {
-            $this->routes[] = $route;
+            return $route;
        }

+        $this->routes[] = $route;
        return $route;
    }

+    /**
+     * Render and process any new routes added.
+     *
+     * @param IRoute $route
+     * @throws NotFoundHttpException
+     */
+    protected function renderAndProcess(IRoute $route) {
+
+        $this->processingRoute = true;
+        $route->renderRoute($this->request);
+        $this->processingRoute = false;
+
+        if (count($this->routeStack) !== 0) {
+
+            /* Pop and grab the routes added when executing group callback earlier */
+            $stack = $this->routeStack;
+            $this->routeStack = [];
+
+            /* Route any routes added to the stack */
+            $this->processRoutes($stack, $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)
+    protected function processRoutes(array $routes, IGroupRoute $group = null)
    {
        // Loop through each route-request
-        $max = count($routes) - 1;
-
        $exceptionHandlers = [];

-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+        // Stop processing routes if no valid route is found.
+        if($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+            return;
+        }
+
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();

        /* @var $route IRoute */
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $routes[$i];
-
-            /* @var $route IGroupRoute */
-            if ($route instanceof IGroupRoute) {
-
-                $group = $route;
-
-                $this->processingRoute = true;
-                $route->renderRoute($this->request);
-                $this->processingRoute = false;
-
-                if ($route->matchRoute($url, $this->request) === true) {
-
-                    /* Add exception handlers */
-                    if (count($route->getExceptionHandlers()) > 0) {
-                        /** @noinspection AdditionOperationOnArraysInspection */
-                        $exceptionHandlers += $route->getExceptionHandlers();
-                    }
-
-                }
-            }
+        foreach ($routes as $route) {

            if ($group !== null) {
-
                /* Add the parent group */
                $route->setGroup($group);
            }

-            if ($parent !== null) {
+            /* @var $route IGroupRoute */
+            if ($route instanceof IGroupRoute) {

-                /* Add the parent route */
-                $route->setParent($parent);
+                if ($route->matchRoute($url, $this->request) === true) {

-                /* Add/merge parent settings with child */
-                $route->setSettings($parent->toArray(), true);
+                    /* Add exception handlers */
+                    if (count($route->getExceptionHandlers()) !== 0) {
+                        /** @noinspection AdditionOperationOnArraysInspection */
+                        $exceptionHandlers += $route->getExceptionHandlers();
+                    }

+                    /* Only render partial group if it matches */
+                    if ($route instanceof IPartialGroupRoute === true) {
+                        $this->renderAndProcess($route);
+                    }
+
+                }
+
+                if ($route instanceof IPartialGroupRoute === false) {
+                    $this->renderAndProcess($route);
+                }
+
+                continue;
            }

-            if ($route instanceof ILoadableRoute) {
+            if ($route instanceof ILoadableRoute === true) {

                /* Add the route to the map, so we can find the active one when all routes has been loaded */
                $this->processedRoutes[] = $route;
            }
-
-            if (count($this->routeStack) > 0) {
-
-                /* Pop and grab the routes added when executing group callback earlier */
-                $stack = $this->routeStack;
-                $this->routeStack = [];
-
-                /* Route any routes added to the stack */
-                $this->processRoutes($stack, $route, $group);
-            }
        }

        $this->exceptionHandlers = array_merge($exceptionHandlers, $this->exceptionHandlers);
@@ -193,21 +202,23 @@ class Router
    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);
-            }
+        /* @var $manager IRouterBootManager */
+        foreach ($this->bootManagers as $manager) {
+            $manager->boot($this->request);
        }

        /* Loop through each route-request */
        $this->processRoutes($this->routes);
    }

+    /**
+     * Routes the request
+     *
+     * @param bool $rewrite
+     * @return string|mixed
+     * @throws HttpException
+     * @throws \Exception
+     */
    public function routeRequest($rewrite = false)
    {
        $routeNotAllowed = false;
@@ -222,54 +233,48 @@ class Router
                    /* Verify csrf token for request */
                    $this->csrfVerifier->handle($this->request);
                }
+            } else {
+                $this->request->setHasRewrite(false);
            }

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

            /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $key => $route) {

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

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

                    $route->loadMiddleware($this->request);

-                    $rewriteRoute = $this->request->getRewriteRoute();
+                    if ($this->hasRewrite($url) === true) {
+                        unset($this->processedRoutes[$key]);

-                    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;
+                        return $this->routeRequest(true);
                    }

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

-                    break;
+                    $this->request->setLoadedRoute($route);
+
+                    $output = $route->renderRoute($this->request);
+
+                    if ($output !== null) {
+                        return $output;
+                    }
+
+                    if ($this->hasRewrite($url) === true) {
+                        unset($this->processedRoutes[$key]);
+
+                        return $this->routeRequest(true);
+                    }
                }
            }

@@ -278,7 +283,8 @@ class Router
        }

        if ($routeNotAllowed === true) {
-            $this->handleException(new HttpException('Route or method not allowed', 403));
+            $message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod());
+            $this->handleException(new HttpException($message, 403));
        }

        if ($this->request->getLoadedRoute() === null) {
@@ -286,25 +292,52 @@ class Router
            $rewriteUrl = $this->request->getRewriteUrl();

            if ($rewriteUrl !== null) {
-                $message = sprintf('Route not found: "%s" (rewrite from: "%s")', $rewriteUrl, $this->request->getUri());
+                $message = sprintf('Route not found: "%s" (rewrite from: "%s")', $rewriteUrl, $this->request->getUrl()->getPath());
            } else {
-                $message = sprintf('Route not found: "%s"', $this->request->getUri());
+                $message = sprintf('Route not found: "%s"', $this->request->getUrl()->getPath());
            }

            $this->handleException(new NotFoundHttpException($message, 404));
        }
+
+        return null;
    }

+    protected function hasRewrite($url)
+    {
+
+        /* If the request has changed */
+        if ($this->request->hasRewrite() === true) {
+
+            if ($this->request->getRewriteRoute() !== null) {
+                /* Render rewrite-route */
+                $this->processedRoutes[] = $this->request->getRewriteRoute();
+
+                return true;
+            }
+
+            if ($this->request->isRewrite($url) === false) {
+
+                /* Render rewrite-url */
+                $this->processedRoutes = array_values($this->processedRoutes);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param \Exception $e
+     * @throws HttpException
+     * @throws \Exception
+     * @return string
+     */
    protected function handleException(\Exception $e)
    {
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
-
-        $max = count($this->exceptionHandlers);
-
        /* @var $handler IExceptionHandler */
-        for ($i = 0; $i < $max; $i++) {
-
-            $handler = $this->exceptionHandlers[$i];
+        foreach ($this->exceptionHandlers as $key => $handler) {

            if (is_object($handler) === false) {
                $handler = new $handler();
@@ -314,27 +347,19 @@ class Router
                throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
            }

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

-                $rewriteRoute = $this->request->getRewriteRoute();
+                $handler->handleError($this->request, $e);

-                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]);
+                if ($this->request->hasRewrite() === true) {
+                    unset($this->exceptionHandlers[$key]);
                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
-                    $this->routeRequest(true);

-                    return;
+                    return $this->routeRequest(true);
                }
+
+            } catch (\Exception $e) {
+
            }
        }

@@ -343,7 +368,7 @@ class Router

    public function arrayToParams(array $getParams = [], $includeEmpty = true)
    {
-        if (count($getParams) > 0) {
+        if (count($getParams) !== 0) {

            if ($includeEmpty === false) {
                $getParams = array_filter($getParams, function ($item) {
@@ -365,12 +390,8 @@ class Router
     */
    public function findRoute($name)
    {
-        $max = count($this->processedRoutes) - 1;
-
        /* @var $route ILoadableRoute */
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $this->processedRoutes[$i];
+        foreach ($this->processedRoutes as $route) {

            /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
            if ($route->hasName($name)) {
@@ -424,13 +445,17 @@ class Router
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
     * @return string
     */
    public function getUrl($name = null, $parameters = null, $getParams = null)
    {
        if ($getParams !== null && is_array($getParams) === false) {
-            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
+            throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
+        }
+
+        if ($name === '' && $parameters === '') {
+            return '/';
        }

        /* Only merge $_GET when all parameters are null */
@@ -442,9 +467,7 @@ class Router

        /* Return current route if no options has been specified */
        if ($name === null && $parameters === null) {
-            $url = rtrim(parse_url($this->request->getUri(), PHP_URL_PATH), '/');
-
-            return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
+            return $this->request->getUrl()->getPath() . $this->arrayToParams($getParams);
        }

        $loadedRoute = $this->request->getLoadedRoute();
@@ -467,15 +490,11 @@ class Router

            /* Loop through all the routes to see if we can find a match */

-            $max = count($this->processedRoutes) - 1;
-
            /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $route) {

                /* Check if the route contains the name/alias */
-                if ($route->hasName($controller)) {
+                if ($route->hasName($controller) === true) {
                    return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
                }

@@ -488,7 +507,7 @@ class Router
        }

        /* No result so we assume that someone is using a hardcoded url and join everything together. */
-        $url = trim(join('/', array_merge((array)$name, (array)$parameters)), '/');
+        $url = trim(implode('/', array_merge((array)$name, (array)$parameters)), '/');

        return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
    }
@@ -520,6 +539,16 @@ class Router
        $this->bootManagers[] = $bootManager;
    }

+    /**
+     * Get routes that has been processed.
+     *
+     * @return array
+     */
+    public function getProcessedRoutes()
+    {
+        return $this->processedRoutes;
+    }
+
    /**
     * @return array
     */
@@ -10,12 +10,13 @@

 namespace Pecee\SimpleRouter;

+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IRoute;
+use Pecee\SimpleRouter\Route\RoutePartialGroup;
 use Pecee\SimpleRouter\Route\RouteController;
 use Pecee\SimpleRouter\Route\RouteGroup;
 use Pecee\SimpleRouter\Route\RouteResource;
@@ -42,14 +43,13 @@ class SimpleRouter
    protected static $router;

    /**
-     * Start/route request
-     *
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws HttpException
-     * @throws NotFoundHttpException
+     * @throws \Exception
     */
    public static function start()
    {
-        static::router()->routeRequest();
+        echo static::router()->routeRequest();
    }

    /**
@@ -66,6 +66,7 @@ class SimpleRouter
     * Base CSRF verifier
     *
     * @param BaseCsrfVerifier $baseCsrfVerifier
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
    {
@@ -77,6 +78,7 @@ class SimpleRouter
     * Perfect if you want to load pretty-urls from a file or database.
     *
     * @param IRouterBootManager $bootManager
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function addBootManager(IRouterBootManager $bootManager)
    {
@@ -89,7 +91,9 @@ class SimpleRouter
     * @param string $url
     * @param string|\Closure $callback
     * @param array|null $settings
+     *
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function get($url, $callback, array $settings = null)
    {
@@ -103,6 +107,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function post($url, $callback, array $settings = null)
    {
@@ -116,6 +121,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function put($url, $callback, array $settings = null)
    {
@@ -129,6 +135,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function patch($url, $callback, array $settings = null)
    {
@@ -142,6 +149,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function options($url, $callback, array $settings = null)
    {
@@ -155,6 +163,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function delete($url, $callback, array $settings = null)
    {
@@ -166,19 +175,48 @@ class SimpleRouter
     *
     * @param array $settings
     * @param \Closure $callback
-     * @throws \InvalidArgumentException
     * @return RouteGroup
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws InvalidArgumentException
     */
    public static function group(array $settings = [], \Closure $callback)
    {
+        if (is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        }
+
        $group = new RouteGroup();
        $group->setCallback($callback);
        $group->setSettings($settings);

+        static::router()->addRoute($group);
+
+        return $group;
+    }
+
+    /**
+     * Special group that has the same benefits as group but supports
+     * parameters and which are only rendered when the url matches.
+     *
+     * @param string $url
+     * @param \Closure $callback
+     * @param array $settings
+     * @return RoutePartialGroup
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws InvalidArgumentException
+     */
+    public static function partialGroup($url, \Closure $callback, array $settings = [])
+    {
        if (is_callable($callback) === false) {
-            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
        }

+        $settings['prefix'] = $url;
+
+        $group = new RoutePartialGroup();
+        $group->setSettings($settings);
+        $group->setCallback($callback);
+
        static::router()->addRoute($group);

        return $group;
@@ -192,6 +230,7 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function basic($url, $callback, array $settings = null)
    {
@@ -207,6 +246,7 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function form($url, $callback, array $settings = null)
    {
@@ -221,6 +261,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function match(array $requestMethods, $url, $callback, array $settings = null)
    {
@@ -244,6 +285,7 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function all($url, $callback, array $settings = null)
    {
@@ -266,6 +308,7 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteController|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function controller($url, $controller, array $settings = null)
    {
@@ -288,6 +331,7 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteResource|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function resource($url, $controller, array $settings = null)
    {
@@ -308,6 +352,7 @@ class SimpleRouter
     *
     * @param \Closure $callback
     * @return CallbackExceptionHandler $callbackHandler
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function error(\Closure $callback)
    {
@@ -340,8 +385,9 @@ class SimpleRouter
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
-     * @throws \Exception
+     * @throws \Pecee\Exceptions\InvalidArgumentException
     * @return string
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function getUrl($name = null, $parameters = null, $getParams = null)
    {
@@ -352,6 +398,7 @@ class SimpleRouter
     * Get the request
     *
     * @return \Pecee\Http\Request
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function request()
    {
@@ -362,6 +409,7 @@ class SimpleRouter
     * Get the response object
     *
     * @return Response
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function response()
    {
@@ -376,6 +424,7 @@ class SimpleRouter
     * Returns the router instance
     *
     * @return Router
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function router()
    {
@@ -392,14 +441,14 @@ class SimpleRouter
     * @param IRoute $route
     * @return IRoute
     */
-    protected static function addDefaultNamespace(IRoute $route)
+    public static function addDefaultNamespace(IRoute $route)
    {
        if (static::$defaultNamespace !== null) {

            $callback = $route->getCallback();

            /* Only add default namespace on relative callbacks */
-            if ($callback === null || $callback[0] !== '\\') {
+            if ($callback === null || (is_string($callback) === true && $callback[0] !== '\\')) {

                $namespace = static::$defaultNamespace;

@@ -7,7 +7,7 @@ class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
 	    global $stack;
 	    $stack[] = static::class;

-		$request->setUri('/');
+		$request->setUrl('/');
 		return $request;
 	}

@@ -7,7 +7,7 @@ class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
        global $stack;
        $stack[] = static::class;

-        $request->setUri('/');
+        $request->setUrl('/');
        return $request;
 	}

@@ -0,0 +1,16 @@
+<?php
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class RewriteMiddleware implements IMiddleware {
+
+    public function handle(Request $request) {
+
+        $request->setRewriteCallback(function() {
+            return 'ok';
+        });
+
+    }
+
+}
@@ -3,18 +3,18 @@
 class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
 {

-    public static function debugNoReset($testUri, $testMethod = 'get')
+    public static function debugNoReset($testUrl, $testMethod = 'get')
    {
-        static::request()->setUri($testUri);
+        static::request()->setUrl($testUrl);
        static::request()->setMethod($testMethod);

        static::start();
    }

-    public static function debug($testUri, $testMethod = 'get')
+    public static function debug($testUrl, $testMethod = 'get')
    {
        try {
-            static::debugNoReset($testUri, $testMethod);
+            static::debugNoReset($testUrl, $testMethod);
        } catch(\Exception $e) {
            static::router()->reset();
            throw $e;
@@ -24,13 +24,13 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter

    }

-    public static function debugOutput($testUri, $testMethod = 'get')
+    public static function debugOutput($testUrl, $testMethod = 'get')
    {
        $response = null;

        // Route request
        ob_start();
-        static::debug($testUri, $testMethod);
+        static::debug($testUrl, $testMethod);
        $response = ob_get_contents();
        ob_end_clean();

@@ -0,0 +1,29 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterPartialGroupTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testParameters()
+    {
+        $result1 = null;
+        $result2 = null;
+
+        TestRouter::partialGroup('{param1}/{param2}', function ($param1 = null, $param2 = null) use (&$result1, &$result2) {
+            $result1 = $param1;
+            $result2 = $param2;
+
+            TestRouter::get('/', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/param1/param2', 'get');
+
+        $this->assertEquals('param1', $result1);
+        $this->assertEquals('param2', $result2);
+    }
+
+}
@@ -5,6 +5,7 @@ require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
 require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
 require_once 'Dummy/Handler/ExceptionHandlerThird.php';
 require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Middlewares/RewriteMiddleware.php';

 class RouteRewriteTest extends PHPUnit_Framework_TestCase
 {
@@ -33,9 +34,9 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
        global $stack;
        $stack = [];

-        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () use ($stack) {

-            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () use ($stack) {

                TestRouter::get('/my-path', 'DummyController@method1');

@@ -64,10 +65,8 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase

        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {

-            if (strtolower($request->getUri()) == '/my/test') {
+            if (strtolower($request->getUrl()->getPath()) === '/my/test/') {
                $request->setRewriteUrl('/another-non-existing');
-
-                return $request;
            }

        });
@@ -75,4 +74,104 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
        TestRouter::debug('/my/test', 'get');
    }

+    public function testRewriteUrlFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new2', function () {
+            echo 'ok';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteCallbackFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            return 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new/2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteRouteFromRoute()
+    {
+
+        TestRouter::get('/match', function () {
+            TestRouter::request()->setRewriteRoute(new \Pecee\SimpleRouter\Route\RouteUrl('/match', function () {
+                return 'ok';
+            }));
+        });
+
+        TestRouter::get('/old1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/old/2', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/match');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testMiddlewareRewrite()
+    {
+
+        TestRouter::group(['middleware' => 'RewriteMiddleware'], function () {
+            TestRouter::get('/', function () {
+                return 'fail';
+            });
+
+            TestRouter::get('no/match', function () {
+                return 'fail';
+            });
+        });
+
+        $output = TestRouter::debugOutput('/');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
 }
@@ -125,6 +125,20 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
        TestRouter::debug('/my/custom-path', 'get');
    }

+    public function testParameterDefaultValue() {
+
+        $defaultVariable = null;
+
+        TestRouter::get('/my/{path?}', function($path = 'working') use(&$defaultVariable) {
+            $defaultVariable = $path;
+        });
+
+        TestRouter::debug('/my/');
+
+        $this->assertEquals('working', $defaultVariable);
+
+    }
+
    public function testDefaultParameterRegex()
    {
        TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);
@@ -8,6 +8,48 @@ require_once 'Helpers/TestRouter.php';
 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {

+    public function testIssue253()
+    {
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
+
+        TestRouter::debugNoReset('/page/22', 'get');
+        $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/', 'get');
+        $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUnicodeCharacters()
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
+        $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        // Test danish characters
+        TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+        TestRouter::debugNoReset('/kategori/økse', 'get');
+        $this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
+        TestRouter::debugNoReset('/test/Dermatología');
+
+        $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
+
+        $this->assertEquals('Dermatología', $parameters['param']);
+
+        TestRouter::router()->reset();
+    }
+
    public function testOptionalParameters()
    {
        TestRouter::get('/aviso/legal', 'DummyController@method1');