Merge pull request #318 from skipperbent/v3-development

Version 3.4.6.0
Merge pull request #317 from skipperbent/v3-optimisations
2026-06-17 16:57:53 +00:00 · 2017-11-26 18:08:24 +01:00 · 2017-11-26 18:06:37 +01:00 · 2017-11-26 18:03:14 +01:00 · 2017-11-26 17:38:49 +01:00 · 2017-11-26 17:32:33 +01:00
29 changed files with 1032 additions and 364 deletions
@@ -7,9 +7,31 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a

 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
+### Feedback and development

-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.
+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.

 ---

@@ -22,6 +44,7 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 	- [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)

@@ -34,6 +57,7 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 		- [Optional parameters](#optional-parameters)
 		- [Regular expression constraints](#regular-expression-constraints)
 		- [Regular expression route-match](#regular-expression-route-match)
+		- [Custom regex for matching parameters](#custom-regex-for-matching-parameters)
 	- [Named routes](#named-routes)
 		- [Generating URLs To Named Routes](#generating-urls-to-named-routes)
 	- [Router groups](#router-groups)
@@ -41,6 +65,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)
@@ -48,6 +73,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)
@@ -77,7 +104,6 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 		- [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)
@@ -171,6 +197,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.
@@ -203,12 +286,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.
 *
@@ -228,7 +312,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);
 }

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

 /**
@@ -244,15 +328,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();
 }

@@ -264,6 +355,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;
+}
 ```

 ---
@@ -309,7 +414,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() {
@@ -381,7 +486,7 @@ The example below is using the following regular expression: `/ajax/([\w]+)/?([0

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

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

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

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

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

 Named routes allow the convenient generation of URLs or redirects for specific routes. You may specify a name for a route by chaining the name method onto the route definition:
@@ -464,7 +598,7 @@ SimpleRouter::group(['namespace' => 'Admin'], function () {
 });
 ```

-### Subdomain-routing
+### Sub domain-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:

@@ -488,6 +622,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:
@@ -554,11 +711,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:**

@@ -576,22 +779,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);
 ```

 ---
@@ -633,18 +859,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');
    }
 });
@@ -668,7 +894,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->getUri()->getPath(), '/api') !== false) {

 			response()->json([
 				'error' => $error->getMessage(),
@@ -795,7 +1021,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
@@ -804,11 +1030,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);
@@ -825,13 +1051,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 --

@@ -850,7 +1080,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') {

@@ -883,6 +1113,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.
@@ -896,7 +1127,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']);
 ```

 ---
@@ -906,7 +1137,7 @@ $siteId = input()->get('site_id', 2, ['post', 'get']);
 ## 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.
+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()`.

@@ -1049,7 +1280,7 @@ class CustomRouterRules implement IRouterBootManager {

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

-            if($request->getUri() === $url) {
+            if($request->getUri()->getPath() === $url) {
                $request->setRewriteUrl($rule);
                return $request;
            }
@@ -1102,35 +1333,6 @@ $router->addRoute($route);

 This section contains advanced tips & tricks on extending the usage for parameters.

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

 This is a simple example of an integration into a framework.
@@ -0,0 +1,80 @@
+<?php
+
+use Pecee\SimpleRouter\SimpleRouter as Router;
+
+/**
+ * Get url for a route by using either name/alias, class or method name.
+ *
+ * The name parameter supports the following values:
+ * - Route name
+ * - Controller/resource name (with or without method)
+ * - Controller class name
+ *
+ * When searching for controller/resource by name, you can use this syntax "route.name@method".
+ * You can also use the same syntax when searching for a specific controller-class "MyController@home".
+ * If no arguments is specified, it will return the url for the current loaded route.
+ *
+ * @param string|null $name
+ * @param string|array|null $parameters
+ * @param array|null $getParams
+ * @return string
+ */
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return Router::getUrl($name, $parameters, $getParams);
+}
+
+/**
+ * @return \Pecee\Http\Response
+ */
+function response()
+{
+    return Router::response();
+}
+
+/**
+ * @return \Pecee\Http\Request
+ */
+function request()
+{
+    return Router::request();
+}
+
+/**
+ * Get input class
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param string|array|null $methods Default method
+ * @return \Pecee\Http\Input\Input|string
+ */
+function input($index = null, $defaultValue = null, $methods = null)
+{
+    if ($index !== null) {
+        return request()->getInput()->get($index, $defaultValue, $methods);
+    }
+
+    return request()->getInput();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
+}
+
+/**
+ * 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]);
-    }
-
-}
@@ -35,7 +35,7 @@ class Input
    public function parseInputs()
    {
        /* Parse get requests */
-        if (count($_GET) > 0) {
+        if (count($_GET) !== 0) {
            $this->get = $this->handleGetPost($_GET);
        }

@@ -46,12 +46,12 @@ 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();
        }
    }
@@ -69,7 +69,7 @@ class Input
                continue;
            }

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

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

@@ -87,6 +87,9 @@ class Input
    protected function rearrangeFiles(array $values, &$index, $original)
    {

+        $originalIndex = $index[0];
+        array_shift($index);
+
        $output = [];

        $getItem = function ($key, $property = 'name') use ($original, $index) {
@@ -107,7 +110,7 @@ class Input
            if (is_array($getItem($key)) === false) {

                $file = InputFile::createFromArray([
-                    'index'    => $key,
+                    'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
                    'filename' => $getItem($key),
                    'error'    => $getItem($key, 'error'),
                    'tmp_name' => $getItem($key, 'tmp_name'),
@@ -128,7 +131,7 @@ class Input

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

-            if (isset($output[$key])) {
+            if (isset($output[$key]) === true) {
                $output[$key][] = $files;
            } else {
                $output[$key] = $files;
@@ -217,15 +220,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);
        }

@@ -16,7 +16,7 @@ class InputFile implements IInputItem
        $this->index = $index;

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

    /**
@@ -28,7 +28,7 @@ class InputFile implements IInputItem
     */
    public static function createFromArray(array $values)
    {
-        if (!isset($values['index'])) {
+        if (isset('index', $values) === false) {
            throw new \InvalidArgumentException('Index key is required');
        }

@@ -39,6 +39,7 @@ class InputFile implements IInputItem
            'type'     => null,
            'size'     => null,
            'name'     => null,
+            'filename' => null,
            'error'    => null,
        ], $values);

@@ -47,7 +48,7 @@ class InputFile implements IInputItem
            ->setError($values['error'])
            ->setType($values['type'])
            ->setTmpName($values['tmp_name'])
-            ->setFilename($values['name']);
+            ->setFilename($values['filename']);

    }

@@ -267,8 +268,9 @@ class InputFile implements IInputItem
            'tmp_name' => $this->tmpName,
            'type'     => $this->type,
            'size'     => $this->size,
-            'name'     => $this->filename,
+            'name'     => $this->name,
            'error'    => $this->error,
+            'filename' => $this->filename,
        ];
    }

@@ -13,7 +13,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,11 @@ class BaseCsrfVerifier implements IMiddleware
    const HEADER_KEY = 'X-CSRF-TOKEN';

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

    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 +27,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 +39,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->getUri()->getPath(), $url) === 0);
            } else {
-                $skip = ($url === rtrim($request->getUri(), '/'));
+                $skip = ($url === $request->getUri()->getPath());
            }

            if ($skip === true) {
@@ -66,34 +64,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;
@@ -29,8 +30,11 @@ class Request
    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->setUri(new Uri($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'));
    }
@@ -39,13 +43,7 @@ class Request
    {
        $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,7 +56,7 @@ class Request
    }

    /**
-     * @return string
+     * @return Uri
     */
    public function getUri()
    {
@@ -164,24 +162,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;
    }

    /**
@@ -215,9 +196,9 @@ class Request
    }

    /**
-     * @param string $uri
+     * @param Uri $uri
     */
-    public function setUri($uri)
+    public function setUri(Uri $uri)
    {
        $this->uri = $uri;
    }
@@ -246,26 +227,7 @@ 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->rewriteRoute = SimpleRouter::addDefaultNamespace($route);

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

 class Response
@@ -41,7 +42,7 @@ class Response

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

    /**
@@ -82,14 +83,19 @@ class Response
    }

    /**
-     * Json encode array
-     * @param array $value
+     * Json encode
+     * @param array|\JsonSerializable $value
+     * @throws \InvalidArgumentException;
     */
-    public function json(array $value)
+    public function json($value)
    {
-        $this->header('Content-Type: application/json');
+        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');
        echo json_encode($value);
-        die();
+        exit(0);
    }

    /**
@@ -0,0 +1,119 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+class CookieTokenProvider implements ITokenProvider
+{
+    const CSRF_KEY = 'CSRF-TOKEN';
+
+    protected $token;
+    protected $cookieTimeoutMinutes = 120;
+
+    public function __construct()
+    {
+        $this->token = $this->getToken();
+
+        if ($this->token === null) {
+            $this->token = $this->generateToken();
+        }
+    }
+
+    /**
+     * Generate random identifier for CSRF token
+     *
+     * @throws \RuntimeException
+     * @return string
+     */
+    public function generateToken()
+    {
+        if (function_exists('random_bytes') === true) {
+            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
+     * 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,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,164 @@
+<?php
+
+namespace Pecee\Http;
+
+class Uri
+{
+    private $originalUrl;
+    private $data = [
+        'scheme' => '',
+        'host' => '',
+        'port' => '',
+        'user' => '',
+        'pass' => '',
+        'path' => '',
+        'query' => '',
+        'fragment' => '',
+    ];
+
+    public function __construct($url)
+    {
+        $this->originalUrl = $url;
+        $this->data = $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 \InvalidArgumentException
+     * @return array
+     */
+    public function parseUrl($url, $component = -1)
+    {
+        $parts = parse_url(urlencode($url), $component);
+
+        if ($parts === false) {
+            throw new \InvalidArgumentException('Malformed URL: ' . $url);
+        }
+
+        foreach ((array)$parts as $name => $value) {
+            $parts[$name] = urldecode($value);
+        }
+
+        return $parts;
+    }
+
+    /**
+     * Returns data array with information about the url
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function __toString()
+    {
+        return $this->getOriginalUrl();
+    }
+
+}
@@ -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);

@@ -30,7 +30,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
    {
        $max = count($this->getMiddlewares());

-        if ($max > 0) {
+        if ($max !== 0) {

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

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

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

    /**
@@ -74,7 +74,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 (preg_match_all('/' . $regex . '/u', $this->url, $matches) === 1) {
                $this->parameters = array_fill_keys($matches[1], null);
            }
        }
@@ -92,7 +92,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 +102,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;
        }

@@ -123,11 +123,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute

        for ($i = $max; $i >= 0; $i--) {
            $param = $keys[$i];
-            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$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 ($parameters === '' || (is_array($parameters) && 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,6 +144,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            }
        }

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

        return rtrim($url, '/') . '/';
@@ -34,9 +34,15 @@ abstract class Route implements IRoute
     * @var bool
     */
    protected $filterEmptyParams = false;
-    protected $defaultParameterRegex = null;
+
+    /**
+     * 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;
@@ -64,16 +70,14 @@ abstract class Route implements IRoute
        $callback = $this->getCallback();

        if ($callback === null) {
-            return;
+            return 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, $this->getParameters());

        }

@@ -101,7 +105,7 @@ abstract class Route implements IRoute
            });
        }

-        call_user_func_array([$class, $method], $parameters);
+        return call_user_func_array([$class, $method], $parameters);
    }

    protected function parseParameters($route, $url, $parameterRegex = null)
@@ -110,7 +114,10 @@ abstract class Route implements IRoute

        $parameters = [];

-        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+        // Ensures that hostnames/domains will work with parameters
+        $url = '/' . ltrim($url, '/');
+
+        if (preg_match_all('/' . $regex . '/u', $route, $parameters) !== 0) {

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

@@ -135,7 +142,7 @@ abstract class Route implements IRoute
                        }
                    }

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

                }

@@ -148,14 +155,14 @@ abstract class Route implements IRoute
            $urlRegex = preg_quote($route, '/');
        }

-        if (preg_match('/^' . $urlRegex . '(\/?)$/', $url, $matches) > 0) {
+        if (preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === 1) {

            $values = [];

            if (isset($parameters[1]) === true) {

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

@@ -382,28 +389,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']);
        }

@@ -456,7 +463,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;
        }

@@ -475,7 +482,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;
        }

@@ -53,7 +53,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
        if (strpos($name, '.') !== false) {
            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
            if ($found !== false) {
-                $method = $found;
+                $method = (string)$found;
            }
        }

@@ -76,7 +76,7 @@ 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];
        }

@@ -87,9 +87,6 @@ class RouteController extends LoadableRoute implements IControllerRoute

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
-
        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

@@ -100,7 +97,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);
@@ -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;

@@ -146,19 +146,19 @@ 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) {
            if ($this->name !== null && $merge !== false) {
                $this->name = $values['as'] . '.' . $this->name;
            } else {
@@ -188,7 +188,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,36 @@
+<?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->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,9 +79,6 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
-
        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

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

    public function matchRoute($url, Request $request)
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
-
        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

@@ -10,6 +10,7 @@ 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
@@ -122,39 +123,13 @@ class Router

        $exceptionHandlers = [];

-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->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();
-                    }
-
-                }
-            }
-
-            if ($group !== null) {
-
-                /* Add the parent group */
-                $route->setGroup($group);
-            }
-
            if ($parent !== null) {

                /* Add the parent route */
@@ -165,13 +140,48 @@ class Router

            }

+            if ($group !== null) {
+
+                /* Add the parent group */
+                $route->setGroup($group);
+            }
+
+            /* @var $route IGroupRoute */
+            if ($route instanceof IGroupRoute) {
+
+                $group = $route;
+
+                if ($route->matchRoute($url, $this->request) === 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) {
+                        $this->processingRoute = true;
+                        $route->renderRoute($this->request);
+                        $this->processingRoute = false;
+                    }
+
+                }
+
+                if (($route instanceof IPartialGroupRoute) === false) {
+                    $this->processingRoute = true;
+                    $route->renderRoute($this->request);
+                    $this->processingRoute = false;
+                }
+            }
+
            if ($route instanceof ILoadableRoute) {

                /* 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) {
+            if (count($this->routeStack) !== 0) {

                /* Pop and grab the routes added when executing group callback earlier */
                $stack = $this->routeStack;
@@ -193,7 +203,7 @@ class Router
    public function loadRoutes()
    {
        /* Initialize boot-managers */
-        if (count($this->bootManagers) > 0) {
+        if (count($this->bootManagers) !== 0) {

            $max = count($this->bootManagers) - 1;

@@ -224,7 +234,7 @@ class Router
                }
            }

-            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();

            $max = count($this->processedRoutes) - 1;

@@ -237,7 +247,7 @@ class Router
                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;
                    }
@@ -248,9 +258,8 @@ class Router

                    if ($rewriteRoute !== null) {
                        $rewriteRoute->loadMiddleware($this->request);
-                        $rewriteRoute->renderRoute($this->request);

-                        return;
+                        return $rewriteRoute->renderRoute($this->request);
                    }

                    /* If the request has changed */
@@ -259,17 +268,15 @@ class Router
                    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;
+                    return $route->renderRoute($this->request);
                }
            }

@@ -278,7 +285,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->getUri()->getPath(), $this->request->getMethod());
+            $this->handleException(new HttpException($message, 403));
        }

        if ($this->request->getLoadedRoute() === null) {
@@ -286,18 +294,26 @@ 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->getUri()->getPath());
            } else {
-                $message = sprintf('Route not found: "%s"', $this->request->getUri());
+                $message = sprintf('Route not found: "%s"', $this->request->getUri()->getPath());
            }

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

+    /**
+     * @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();
+        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();

        $max = count($this->exceptionHandlers);

@@ -314,27 +330,31 @@ 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();
+                if ($handler->handleError($this->request, $e) !== null) {

-                if ($rewriteRoute !== null) {
-                    $rewriteRoute->loadMiddleware($this->request);
-                    $rewriteRoute->renderRoute($this->request);
+                    $rewriteRoute = $this->request->getRewriteRoute();

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

-                $rewriteUrl = $this->request->getRewriteUrl();
+            } catch (\Exception $e) {

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

@@ -343,7 +363,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) {
@@ -433,6 +453,10 @@ class Router
            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
        }

+        if ($name === '' && $parameters === '') {
+            return '/';
+        }
+
        /* Only merge $_GET when all parameters are null */
        if ($name === null && $parameters === null && $getParams === null) {
            $getParams = $_GET;
@@ -442,9 +466,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->getUri()->getPath() . $this->arrayToParams($getParams);
        }

        $loadedRoute = $this->request->getLoadedRoute();
@@ -573,4 +595,4 @@ class Router
        return $this;
    }

-}
+}
@@ -16,6 +16,7 @@ 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;
@@ -49,7 +50,7 @@ class SimpleRouter
     */
    public static function start()
    {
-        static::router()->routeRequest();
+        echo static::router()->routeRequest();
    }

    /**
@@ -171,14 +172,41 @@ class SimpleRouter
     */
    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 array $settings
+     * @param \Closure $callback
+     * @throws \InvalidArgumentException
+     * @return RoutePartialGroup
+     */
+    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');
        }

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

        return $group;
@@ -392,14 +420,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->setUri(new \Pecee\Http\Uri('/'));
 		return $request;
 	}

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

-        $request->setUri('/');
+        $request->setUri(new \Pecee\Http\Uri('/'));
        return $request;
 	}

@@ -5,7 +5,7 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter

    public static function debugNoReset($testUri, $testMethod = 'get')
    {
-        static::request()->setUri($testUri);
+        static::request()->setUri(new \Pecee\Http\Uri($testUri));
        static::request()->setMethod($testMethod);

        static::start();
@@ -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);
+    }
+
+}
@@ -64,7 +64,7 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase

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

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

                return $request;
@@ -8,6 +8,73 @@ 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');
+        TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
+        TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
+        TestRouter::get('/{pagina?}', 'DummyController@method1');
+
+        TestRouter::debugNoReset('/aviso/optional', 'get');
+        $this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/pagina/optional', 'get');
+        $this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/optional', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::router()->reset();
+    }
+
    public function testSimilarUrls()
    {
        // Match normal route on alias