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
32 changed files with 956 additions and 639 deletions
@@ -1,23 +1,18 @@
 # 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)
@@ -25,7 +20,6 @@ If you want a great new feature or experience any issues what-so-ever, please fe
 		- [Setting up IIS](#setting-up-iis)
 		- [Configuration](#configuration)
 		- [Helper functions](#helper-functions)
-
 - [Routes](#routes)
 	- [Basic routing](#basic-routing)
 		- [Available methods](#available-methods)
@@ -51,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)
@@ -75,8 +71,7 @@ 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)
@@ -95,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.
@@ -119,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.
@@ -212,17 +235,23 @@ Simply create a new `web.config` file in your projects `public` directory and pa
 </configuration>
 ```

-#### Troubleshoting
+#### Troubleshooting

-If you do not have a favicon.ico file in your project, you can get `404 Router::notFoundException()` constantly.
-To add `favicon.ico` as exception, you can add this line to the `<conditions>` group: 
-```<add input="{REQUEST_FILENAME}" negate="true" pattern="favicon.ico" ignoreCase="true" />```
+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" />```
+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. By sample: 
-```/index.php/test/mypage.php```
+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

@@ -568,9 +597,9 @@ SimpleRouter::group(['namespace' => 'Admin'], function () {
 });
 ```

-### Sub domain-routing
+### 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 () {
@@ -582,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 () {
@@ -681,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:**

@@ -703,36 +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());

-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>
+Router::csrfVerifier($verifier);
 ```

 ---
@@ -759,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;
        }

    }
@@ -809,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()->getPath(), '/api') !== false) {
+		if (stripos($request->getUrl()->getPath(), '/api') !== false) {

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

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

 		}

@@ -1028,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.
@@ -1049,126 +1134,22 @@ $siteId = input('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
@@ -1192,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()->getPath() === $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": {
@@ -18,6 +18,7 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
 * @param string|array|null $parameters
 * @param array|null $getParams
 * @return string
+ * @throws \InvalidArgumentException
 */
 function url($name = null, $parameters = null, $getParams = null)
 {
@@ -73,7 +74,7 @@ function csrf_token()
 {
    $baseVerifier = Router::router()->getCsrfVerifier();
    if ($baseVerifier !== null) {
-        return $baseVerifier->getToken();
+        return $baseVerifier->getTokenProvider()->getToken();
    }

    return null;
@@ -1,80 +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') === 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 $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)));
    }

    /**
@@ -2,9 +2,10 @@

 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
 {
@@ -12,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();
    }

    /**
@@ -30,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;
        }

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

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

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

@@ -67,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;
    }

 }
@@ -12,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
     */
@@ -27,16 +29,20 @@ class Request
     */
    protected $loadedRoute;

+    /**
+     * Request constructor.
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
    public function __construct()
    {
        $this->parseHeaders();
        $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->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()
@@ -56,11 +62,11 @@ class Request
    }

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

    /**
@@ -186,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
@@ -196,11 +212,12 @@ class Request
    }

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

    /**
@@ -227,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;
    }
@@ -279,7 +278,8 @@ class Request
     */
    public function setRewriteUrl($rewriteUrl)
    {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';

        return $this;
    }
@@ -291,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));
    }

    /**
@@ -316,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);
@@ -2,6 +2,8 @@

 namespace Pecee\Http;

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

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

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

    /**
@@ -85,16 +87,18 @@ class Response
    /**
     * Json encode
     * @param array|\JsonSerializable $value
-     * @throws \InvalidArgumentException;
+     * @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($value)
+    public function json($value, $options = null, $dept = 512)
    {
        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.');
+            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);
+        $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);
+
+}
@@ -2,24 +2,31 @@

 namespace Pecee\Http;

-class Uri
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url
 {
    private $originalUrl;
    private $data = [
-        'scheme',
-        'host',
-        'port',
-        'user',
-        'pass',
-        'path',
-        'query',
-        'fragment',
+        '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 = array_merge($this->data, $this->parseUrl(urldecode($url)));
+        $this->data = $this->parseUrl($url) + $this->data;

        if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
            $this->data['path'] = rtrim($this->data['path'], '/') . '/';
@@ -129,13 +136,13 @@ class Uri
     * UTF-8 aware parse_url() replacement.
     * @param string $url
     * @param int $component
-     * @throws \InvalidArgumentException
+     * @throws MalformedUrlException
     * @return array
     */
    public function parseUrl($url, $component = -1)
    {
        $encodedUrl = preg_replace_callback(
-            '%[^:/@?&=#]+%u',
+            '/[^:\/@?&=#]+/u',
            function ($matches) {
                return urlencode($matches[0]);
            },
@@ -145,14 +152,10 @@ class Uri
        $parts = parse_url($encodedUrl, $component);

        if ($parts === false) {
-            throw new \InvalidArgumentException('Malformed URL: ' . $url);
+            throw new MalformedUrlException('Malformed URL: ' . $url);
        }

-        foreach ((array)$parts as $name => $value) {
-            $parts[$name] = urldecode($value);
-        }
-
-        return $parts;
+        return array_map('urldecode', $parts);
    }

    /**
@@ -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 . '/u', $this->url, $matches)) {
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
                $this->parameters = array_fill_keys($matches[1], null);
            }
        }
@@ -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,13 +111,10 @@ 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];
+        foreach (array_keys($params) as $param) {

-            if ($parameters === '' || (is_array($parameters) && count($parameters) === 0)) {
+            if ($parameters === '' || (is_array($parameters) === true && count($parameters) === 0)) {
                $value = '';
            } else {
                $p = (array)$parameters;
@@ -144,8 +134,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            }
        }

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

        return rtrim($url, '/') . '/';
    }
@@ -229,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,7 +33,7 @@ abstract class Route implements IRoute
     *
     * @var bool
     */
-    protected $filterEmptyParams = false;
+    protected $filterEmptyParams = true;

    /**
     * Default regular expression used for parsing parameters.
@@ -56,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) {
@@ -65,6 +71,13 @@ 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();
@@ -73,12 +86,20 @@ abstract class Route implements IRoute
            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 */
-            return call_user_func_array($callback, $this->getParameters());
-
+            return call_user_func_array($callback, $parameters);
        }

        /* When the callback is a class + method */
@@ -95,16 +116,6 @@ 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);
-            });
-        }
-
        return call_user_func_array([$class, $method], $parameters);
    }

@@ -117,9 +128,11 @@ abstract class Route implements IRoute
        // Ensures that hostnames/domains will work with parameters
        $url = '/' . ltrim($url, '/');

-        if (preg_match_all('/' . $regex . '/u', $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) {

@@ -143,34 +156,30 @@ abstract class Route implements IRoute
                    }

                    $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(sprintf($this->urlRegex, $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 ((array)$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;
    }

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

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

@@ -361,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;
        }

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

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

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

@@ -532,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,17 +77,21 @@ 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)
    {
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

@@ -97,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);
@@ -168,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 ($merge === false && isset($values['exceptionHandler'])) {
+        if ($merge === false && isset($values['exceptionHandler']) === true) {
            $this->setExceptionHandlers((array)$values['exceptionHandler']);
        }

-        if ($merge === false && 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;
        }

@@ -17,6 +17,10 @@ class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
     */
    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);
@@ -79,6 +79,10 @@ class RouteResource extends LoadableRoute implements IControllerRoute

    public function matchRoute($url, Request $request)
    {
+        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

@@ -206,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,6 +14,10 @@ class RouteUrl extends LoadableRoute

    public function matchRoute($url, Request $request)
    {
+        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;
@@ -16,12 +17,6 @@ use Pecee\SimpleRouter\Route\IRoute;
 class Router
 {

-    /**
-     * The instance of this class
-     * @var static
-     */
-    protected static $instance;
-
    /**
     * Current request
     * @var Request
@@ -71,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;
@@ -95,53 +97,64 @@ 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()->getPath();
+        // 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];
-
-            if ($parent !== null) {
-
-                /* Add the parent route */
-                $route->setParent($parent);
-
-                /* Add/merge parent settings with child */
-                $route->setSettings($parent->toArray(), true);
-
-            }
+        foreach ($routes as $route) {

            if ($group !== null) {
-
                /* Add the parent group */
                $route->setGroup($group);
            }
@@ -149,47 +162,33 @@ class Router
            /* @var $route IGroupRoute */
            if ($route instanceof IGroupRoute) {

-                $group = $route;
-
                if ($route->matchRoute($url, $this->request) === true) {

                    /* Add exception handlers */
-                    if (count($route->getExceptionHandlers()) > 0) {
+                    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 === true) {
+                        $this->renderAndProcess($route);
                    }

                }

-                if (($route instanceof IPartialGroupRoute) === false) {
-                    $this->processingRoute = true;
-                    $route->renderRoute($this->request);
-                    $this->processingRoute = false;
+                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);
@@ -203,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;
@@ -232,51 +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()->getPath();
-
-            $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 ($rewriteRoute !== null) {
-                        $rewriteRoute->loadMiddleware($this->request);
-
-                        return $rewriteRoute->renderRoute($this->request);
-                    }
-
-                    /* If the request has changed */
-                    $rewriteUrl = $this->request->getRewriteUrl();
-
-                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                        unset($this->processedRoutes[$i]);
-                        $this->processedRoutes = array_values($this->processedRoutes);
+                    if ($this->hasRewrite($url) === true) {
+                        unset($this->processedRoutes[$key]);

                        return $this->routeRequest(true);
                    }

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

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

@@ -285,7 +283,7 @@ class Router
        }

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

@@ -294,9 +292,9 @@ class Router
            $rewriteUrl = $this->request->getRewriteUrl();

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

            $this->handleException(new NotFoundHttpException($message, 404));
@@ -305,6 +303,31 @@ class Router
        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
@@ -313,14 +336,8 @@ class Router
     */
    protected function handleException(\Exception $e)
    {
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
-
-        $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();
@@ -332,25 +349,13 @@ class Router

            try {

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

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

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

            } catch (\Exception $e) {
@@ -363,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) {
@@ -385,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)) {
@@ -444,13 +445,13 @@ 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 === '') {
@@ -466,7 +467,7 @@ class Router

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

        $loadedRoute = $this->request->getLoadedRoute();
@@ -489,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);
                }

@@ -510,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);
    }
@@ -542,6 +539,16 @@ class Router
        $this->bootManagers[] = $bootManager;
    }

+    /**
+     * Get routes that has been processed.
+     *
+     * @return array
+     */
+    public function getProcessedRoutes()
+    {
+        return $this->processedRoutes;
+    }
+
    /**
     * @return array
     */
@@ -595,4 +602,4 @@ class Router
        return $this;
    }

-}
+}
@@ -10,11 +10,11 @@

 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;
@@ -43,10 +43,9 @@ class SimpleRouter
    protected static $router;

    /**
-     * Start/route request
-     *
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws HttpException
-     * @throws NotFoundHttpException
+     * @throws \Exception
     */
    public static function start()
    {
@@ -67,6 +66,7 @@ class SimpleRouter
     * Base CSRF verifier
     *
     * @param BaseCsrfVerifier $baseCsrfVerifier
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
    {
@@ -78,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)
    {
@@ -90,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)
    {
@@ -104,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)
    {
@@ -117,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)
    {
@@ -130,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)
    {
@@ -143,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)
    {
@@ -156,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)
    {
@@ -167,13 +175,14 @@ 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');
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
        }

        $group = new RouteGroup();
@@ -190,15 +199,16 @@ class SimpleRouter
     * parameters and which are only rendered when the url matches.
     *
     * @param string $url
-     * @param array $settings
     * @param \Closure $callback
-     * @throws \InvalidArgumentException
+     * @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;
@@ -220,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)
    {
@@ -235,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)
    {
@@ -249,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)
    {
@@ -272,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)
    {
@@ -294,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)
    {
@@ -316,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)
    {
@@ -336,6 +352,7 @@ class SimpleRouter
     *
     * @param \Closure $callback
     * @return CallbackExceptionHandler $callbackHandler
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function error(\Closure $callback)
    {
@@ -368,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)
    {
@@ -380,6 +398,7 @@ class SimpleRouter
     * Get the request
     *
     * @return \Pecee\Http\Request
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function request()
    {
@@ -390,6 +409,7 @@ class SimpleRouter
     * Get the response object
     *
     * @return Response
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function response()
    {
@@ -404,6 +424,7 @@ class SimpleRouter
     * Returns the router instance
     *
     * @return Router
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function router()
    {
@@ -420,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(new \Pecee\Http\Uri('/'));
+		$request->setUrl('/');
 		return $request;
 	}

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

-        $request->setUri(new \Pecee\Http\Uri('/'));
+        $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(new \Pecee\Http\Uri($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();

@@ -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()->getPath()) == '/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\-]+']);
Author	SHA1	Message	Date
Simon Sessingø	d4cdc0844d	Updated documentation.	2018-03-29 10:14:08 +02:00
Simon Sessingo	d279d5598d	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.	2018-03-03 23:37:14 +01:00
Simon Sessingo	be39010be3	Throw correct exception-types.	2018-02-27 08:58:57 +01:00
Simon Sessingo	79c82c90cc	Fixed issue with PDO exception not returning correct type for error-code.	2018-02-27 08:20:25 +01:00
Simon Sessingo	6d7d07669b	Optimisations	2018-02-27 00:19:44 +01:00
Simon Sessingo	98bf95bfc9	Added back getPath.	2018-02-27 00:14:01 +01:00
Simon Sessingo	b051bcf02b	Stop router from processing routes if no valid route is found.	2018-02-27 00:12:45 +01:00
Simon Sessingo	b8d5106f4e	Removed getPath from url.	2018-02-27 00:00:54 +01:00
Simon Sessingo	cfc9ac138a	Fixed setUrl issue.	2018-02-26 23:48:09 +01:00
Simon Sessingo	a25be983b8	Development - Renamed Uri class to Url. - Renamed setUri and getUri to setUrl and getUrl. - Added custom Exceptions and ensured that router only throws HttpExceptions. - Added isAjax method to Request class. - Added better phpDocs. - Other minor optimisations.	2018-02-26 23:21:26 +01:00
Simon Sessingø	a0c5bbdcc0	Merge pull request #367 from skipperbent/v3-rewrite-update Simplified url-rewriting and callback handling.	2018-02-24 05:36:37 +01:00
Simon Sessingo	50c6499efb	Simplified url-rewriting and callback handling.	2018-02-24 05:35:05 +01:00
Simon Sessingo	55a96a441e	Set default value to 0 to triggering error when calling getErrors on empty object.	2018-02-19 23:04:26 +01:00
Simon Sessingo	6b8c823427	Fixed: refresh now returns correct original url (params, querystrings etc).	2018-02-19 16:34:22 +01:00
Simon Sessingø	932dfbf2b7	Merge pull request #357 from skipperbent/v3-optimisations Optimisations	2018-02-14 12:38:07 +01:00
Simon Sessingo	8d87aab35b	Optimisations	2018-02-05 05:27:47 +01:00
Simon Sessingo	fc2e2e1e82	Fixed Input::all when php://input is not availible	2018-01-14 15:53:44 +01:00
Simon Sessingø	71518431a9	Merge pull request #348 from skipperbent/v3-fix-default-value Fixed parameter default-value being overwritten (issue: #347).	2018-01-06 03:31:03 +01:00
Simon Sessingø	cec240ab0c	Merge pull request #349 from skipperbent/feature-get-processed-routes Added getProcessedRoutes method to Router class.	2018-01-06 03:30:55 +01:00
Simon Sessingo	4d2b584936	Fixed parameter default-value being overwritten (issue: #347 ).	2018-01-06 03:27:27 +01:00
Simon Sessingo	a102c70700	Added getProcessedRoutes method to Router class.	2018-01-06 01:23:00 +01:00
Simon Sessingo	f2d106c649	_method is not supported as fallback for every request-type.	2017-12-17 10:37:33 +01:00
Simon Sessingo	72d33dd497	Compatibility: setUri can be both string and Uri object.	2017-12-17 09:51:56 +01:00
Simon Sessingo	e23dd37435	Reverted changes	2017-12-16 23:29:00 +01:00
Simon Sessingo	aa5ec47051	Removed key check in __get as it's already performed in the __isset method.	2017-12-16 23:24:31 +01:00
Simon Sessingo	155729074b	Fixed filtering on get-params in all method.	2017-12-16 12:48:10 +01:00
Simon Sessingø	0be7bfcfd9	Fixed utf-8 header issue (issue: #333 )	2017-12-09 23:56:37 +01:00
Simon Sessingø	7f8d90eef8	Added $options and $debt param to json method in Response class.	2017-12-06 19:04:48 +01:00
Simon Sessingø	4bb784bcec	Merge pull request #329 from skipperbent/v3-optimisations Optimisations	2017-12-02 20:30:02 +01:00
Simon Sessingo	c4ee1b9186	Optimisations	2017-12-02 19:30:30 +01:00
Simon Sessingø	efd5159604	Bugfixes - Fixed issue with parsing parameters on some occasion. - Optimisations.	2017-11-27 02:03:12 +01:00
Simon Sessingø	bdfc36ed5c	More Input-related optimisations.	2017-11-27 00:00:19 +01:00
Simon Sessingø	d921ae8105	Bugfixes - Fixed minor issues with File Input-parsing. - Optimized Input class.	2017-11-26 23:42:28 +01:00
Simon Sessingø	af2be14ccb	Fixed url parsing issues	2017-11-26 18:45:06 +01:00
Simon Sessingø	fae2e84c98	Fixed typo	2017-11-26 18:29:00 +01:00
Simon Sessingø	c90c74b88f	Merge pull request #317 from skipperbent/v3-optimisations V3 optimisations	2017-11-26 18:06:37 +01:00
Simon Sessingø	05f2493304	Development - Optimized Uri class. - Request class now uses SimpleRouter to get default-namespace as was originally the intended behavior. - Documentation changes.	2017-11-26 18:03:14 +01:00
Simon Sessingø	0856caa9de	Merge branch 'v3-development' of github.com:skipperbent/simple-php-router into v3-optimisations	2017-11-26 17:38:49 +01:00
Simon Sessingø	35dc26d741	Optimisations - Fixed issue with `InputFile` not setting file-name properly. - Fixed issue with `InputFile` not setting the correct index when posting certain arrays. - Made Csrf-token cookie provider more versitile by creating new `CookieTokenProvider` and `ITokenProvider` classes. - Strict-checks optimisations. - Updated documentation to reflect new changes.	2017-11-26 17:32:33 +01:00
Simon Sessingø	f2819f866e	Merge pull request #314 from skipperbent/v3-documentation-spelling Fixed spelling in documentation	2017-11-25 01:34:01 +01:00
Simon Sessingø	b9aa348b38	Merge branch 'v3-development' of github.com:skipperbent/simple-php-router into v3-development	2017-11-25 01:32:24 +01:00
Simon Sessingø	c29c52ae16	Fixed default-namespace causing router to break on closures.	2017-11-25 01:31:43 +01:00
Simon Sessingo	6547c07113	Fixed spelling in documentation	2017-11-20 21:53:41 +01:00
Simon Sessingø	fde77969c0	Merge pull request #310 from skipperbent/v3-csrftoken-update Csrf-token are now refreshed on each page-load to avoid timeout.	2017-11-10 13:02:23 +01:00
Simon Sessingø	c3072e8886	Csrf-token are now refreshed on each page-load to avoid timeout.	2017-11-10 12:59:59 +01:00