From f23d569757c79e491d775dcf3966ea927944eaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Tue, 20 Mar 2018 03:38:55 +0100
Subject: [PATCH 01/25] Added support for PHP7

---
 .codeclimate.yml                              |  22 +++
 .scrutinizer.yml                              |  13 ++
 .travis.yml                                   |  13 ++
 README.md                                     |  14 +-
 composer.json                                 |   5 +-
 helpers.php                                   |  11 +-
 phpunit.xml                                   |  24 ++++
 src/Pecee/Controllers/IResourceController.php |  29 ++--
 .../Handlers/CallbackExceptionHandler.php     |   5 +-
 src/Pecee/Handlers/IExceptionHandler.php      |   4 +-
 src/Pecee/Http/Input/IInputItem.php           |  12 +-
 src/Pecee/Http/Input/InputFile.php            |  60 ++++----
 .../Input/{Input.php => InputHandler.php}     |  44 +++---
 src/Pecee/Http/Input/InputItem.php            |  12 +-
 .../Http/Middleware/BaseCsrfVerifier.php      |  24 ++--
 src/Pecee/Http/Middleware/IMiddleware.php     |   4 +-
 src/Pecee/Http/Request.php                    | 129 +++++++++++-------
 src/Pecee/Http/Response.php                   |  21 ++-
 .../Http/Security/CookieTokenProvider.php     |  39 ++----
 src/Pecee/Http/Security/ITokenProvider.php    |  12 +-
 src/Pecee/Http/Url.php                        |  31 +++--
 src/Pecee/SimpleRouter/IRouterBootManager.php |   4 +-
 .../SimpleRouter/Route/IControllerRoute.php   |  20 +--
 src/Pecee/SimpleRouter/Route/IGroupRoute.php  |  18 +--
 .../SimpleRouter/Route/ILoadableRoute.php     |  17 +--
 src/Pecee/SimpleRouter/Route/IRoute.php       |  67 +++++----
 .../SimpleRouter/Route/LoadableRoute.php      |  34 ++---
 src/Pecee/SimpleRouter/Route/Route.php        |  96 ++++++-------
 .../SimpleRouter/Route/RouteController.php    |  30 ++--
 src/Pecee/SimpleRouter/Route/RouteGroup.php   |  38 +++---
 .../SimpleRouter/Route/RoutePartialGroup.php  |   6 +-
 .../SimpleRouter/Route/RouteResource.php      |  22 +--
 src/Pecee/SimpleRouter/Route/RouteUrl.php     |   4 +-
 src/Pecee/SimpleRouter/Router.php             |  76 +++++------
 src/Pecee/SimpleRouter/SimpleRouter.php       |  84 +++++++-----
 test/Dummy/ResourceController.php             |  39 ------
 .../SimpleRouter}/Dummy/DummyController.php   |   0
 .../SimpleRouter}/Dummy/DummyMiddleware.php   |   4 +-
 .../Exception}/ExceptionHandlerException.php  |   1 +
 .../Exception}/MiddlewareLoadedException.php  |   0
 .../Dummy/Exception}/ResponseException.php    |   0
 .../Dummy/Handler/ExceptionHandler.php        |   2 +-
 .../Dummy/Handler/ExceptionHandlerFirst.php   |   3 +-
 .../Dummy/Handler/ExceptionHandlerSecond.php  |   3 +-
 .../Dummy/Handler/ExceptionHandlerThird.php   |   2 +-
 .../Dummy/Middleware}/RewriteMiddleware.php   |   2 +-
 .../SimpleRouter/Dummy/ResourceController.php |  46 +++++++
 .../Pecee/SimpleRouter}/GroupTest.php         |   6 +-
 .../Pecee/SimpleRouter}/MiddlewareTest.php    |   7 +-
 .../RouterCallbackExceptionHandlerTest.php    |   9 +-
 .../SimpleRouter}/RouterControllerTest.php    |   3 +-
 .../SimpleRouter}/RouterPartialGroupTest.php  |   3 +-
 .../SimpleRouter}/RouterResourceTest.php      |   3 +-
 .../Pecee/SimpleRouter}/RouterRewriteTest.php |   9 +-
 .../Pecee/SimpleRouter}/RouterRouteTest.php   |  17 ++-
 .../Pecee/SimpleRouter}/RouterUrlTest.php     |   3 +-
 {test/Helpers => tests}/TestRouter.php        |   0
 tests/bootstrap.php                           |   4 +
 58 files changed, 678 insertions(+), 532 deletions(-)
 create mode 100644 .codeclimate.yml
 create mode 100644 .scrutinizer.yml
 create mode 100644 .travis.yml
 create mode 100644 phpunit.xml
 rename src/Pecee/Http/Input/{Input.php => InputHandler.php} (84%)
 delete mode 100644 test/Dummy/ResourceController.php
 rename {test => tests/Pecee/SimpleRouter}/Dummy/DummyController.php (100%)
 rename {test => tests/Pecee/SimpleRouter}/Dummy/DummyMiddleware.php (61%)
 rename {test/Dummy/Exceptions => tests/Pecee/SimpleRouter/Dummy/Exception}/ExceptionHandlerException.php (98%)
 rename {test/Dummy/Exceptions => tests/Pecee/SimpleRouter/Dummy/Exception}/MiddlewareLoadedException.php (100%)
 rename {test/Dummy/Exceptions => tests/Pecee/SimpleRouter/Dummy/Exception}/ResponseException.php (100%)
 rename {test => tests/Pecee/SimpleRouter}/Dummy/Handler/ExceptionHandler.php (89%)
 rename {test => tests/Pecee/SimpleRouter}/Dummy/Handler/ExceptionHandlerFirst.php (87%)
 rename {test => tests/Pecee/SimpleRouter}/Dummy/Handler/ExceptionHandlerSecond.php (86%)
 rename {test => tests/Pecee/SimpleRouter}/Dummy/Handler/ExceptionHandlerThird.php (92%)
 rename {test/Dummy/Middlewares => tests/Pecee/SimpleRouter/Dummy/Middleware}/RewriteMiddleware.php (79%)
 create mode 100644 tests/Pecee/SimpleRouter/Dummy/ResourceController.php
 rename {test => tests/Pecee/SimpleRouter}/GroupTest.php (94%)
 rename {test => tests/Pecee/SimpleRouter}/MiddlewareTest.php (83%)
 rename {test => tests/Pecee/SimpleRouter}/RouterCallbackExceptionHandlerTest.php (69%)
 rename {test => tests/Pecee/SimpleRouter}/RouterControllerTest.php (89%)
 rename {test => tests/Pecee/SimpleRouter}/RouterPartialGroupTest.php (86%)
 rename {test => tests/Pecee/SimpleRouter}/RouterResourceTest.php (94%)
 rename {test => tests/Pecee/SimpleRouter}/RouterRewriteTest.php (93%)
 rename {test => tests/Pecee/SimpleRouter}/RouterRouteTest.php (91%)
 rename {test => tests/Pecee/SimpleRouter}/RouterUrlTest.php (98%)
 rename {test/Helpers => tests}/TestRouter.php (100%)
 create mode 100644 tests/bootstrap.php

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 0000000..467daf9
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,22 @@
+engines:
+  phpmd:
+    enabled: true
+    checks:
+      Design/TooManyPublicMethods:
+        enabled: true
+      Naming/ShortVariable:
+        enabled: true
+      CleanCode/StaticAccess:
+        enabled: true
+      Controversial/CamelCaseMethodName:
+        enabled: true
+  fixme:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - php:
+ratings:
+  paths:
+  - src/**
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..0608e7a
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,13 @@
+build:
+    tests:
+        override:
+            -
+                command: './vendor/bin/phpunit --coverage-clover=coverage.clover'
+                coverage:
+                    file: 'coverage.clover'
+                    format: 'clover'
+checks:
+    php:
+        code_rating: true
+        duplication: true
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..72c98f1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+sudo: false
+
+language: php
+
+php:
+  - 7.1
+
+before_script:
+  - curl -sS http://getcomposer.org/installer | php
+  - php composer.phar install --prefer-source --no-interaction
+
+script:
+  - ./vendor/bin/phpunit
diff --git a/README.md b/README.md
index f8c2c00..5a333b6 100644
--- a/README.md
+++ b/README.md
@@ -308,6 +308,8 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
  * @param string|array|null $parameters
  * @param array|null $getParams
  * @return string
+ * @throws \InvalidArgumentException
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function url($name = null, $parameters = null, $getParams = null)
 {
@@ -316,6 +318,7 @@ function url($name = null, $parameters = null, $getParams = null)
 
 /**
  * @return \Pecee\Http\Response
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function response()
 {
@@ -324,6 +327,7 @@ function response()
 
 /**
  * @return \Pecee\Http\Request
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function request()
 {
@@ -335,15 +339,16 @@ function request()
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\Input|string
+ * @return \Pecee\Http\Input\InputHandler|string
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function input($index = null, $defaultValue = null, $methods = null)
 {
     if ($index !== null) {
-        return request()->getInput()->get($index, $defaultValue, $methods);
+        return request()->getInputHandler()->get($index, $defaultValue, $methods);
     }
 
-    return request()->getInput();
+    return request()->getInputHandler();
 }
 
 function redirect($url, $code = null)
@@ -358,12 +363,13 @@ function redirect($url, $code = null)
 /**
  * Get current csrf-token
  * @return string|null
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function csrf_token()
 {
     $baseVerifier = Router::router()->getCsrfVerifier();
     if ($baseVerifier !== null) {
-        return $baseVerifier->getToken();
+        return $baseVerifier->getTokenProvider()->getToken();
     }
 
     return null;
diff --git a/composer.json b/composer.json
index 2fee7b4..9c88dd6 100644
--- a/composer.json
+++ b/composer.json
@@ -27,10 +27,11 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.7.7"
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
   },
   "autoload": {
     "psr-4": {
diff --git a/helpers.php b/helpers.php
index 71ae2fb..2c4d86d 100644
--- a/helpers.php
+++ b/helpers.php
@@ -19,6 +19,7 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
  * @param array|null $getParams
  * @return string
  * @throws \InvalidArgumentException
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function url($name = null, $parameters = null, $getParams = null)
 {
@@ -27,6 +28,7 @@ function url($name = null, $parameters = null, $getParams = null)
 
 /**
  * @return \Pecee\Http\Response
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function response()
 {
@@ -35,6 +37,7 @@ function response()
 
 /**
  * @return \Pecee\Http\Request
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function request()
 {
@@ -46,15 +49,16 @@ function request()
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\Input|string
+ * @return \Pecee\Http\Input\InputHandler|string
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function input($index = null, $defaultValue = null, $methods = null)
 {
     if ($index !== null) {
-        return request()->getInput()->get($index, $defaultValue, $methods);
+        return request()->getInputHandler()->get($index, $defaultValue, $methods);
     }
 
-    return request()->getInput();
+    return request()->getInputHandler();
 }
 
 function redirect($url, $code = null)
@@ -69,6 +73,7 @@ function redirect($url, $code = null)
 /**
  * Get current csrf-token
  * @return string|null
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
 function csrf_token()
 {
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..6e8f0c6
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        colors="true"
+        bootstrap="tests/bootstrap.php"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        syntaxCheck="false">
+    <testsuites>
+        <testsuite name="SimpleRouter Test Suite">
+            <directory>tests/Pecee/SimpleRouter/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Pecee/Controllers/IResourceController.php b/src/Pecee/Controllers/IResourceController.php
index 502017f..5900467 100644
--- a/src/Pecee/Controllers/IResourceController.php
+++ b/src/Pecee/Controllers/IResourceController.php
@@ -1,47 +1,48 @@
 <?php
+
 namespace Pecee\Controllers;
 
 interface IResourceController
 {
 
     /**
-     * @return void
+     * @return string|null
      */
-    public function index();
+    public function index(): ?string;
 
     /**
      * @param mixed $id
-     * @return void
+     * @return string|null
      */
-    public function show($id);
+    public function show($id): ?string;
 
     /**
-     * @return void
+     * @return string|null
      */
-    public function store();
+    public function store(): ?string;
 
     /**
-     * @return void
+     * @return string|null
      */
-    public function create();
+    public function create(): ?string;
 
     /**
      * View
      * @param mixed $id
-     * @return void
+     * @return string|null
      */
-    public function edit($id);
+    public function edit($id): ?string;
 
     /**
      * @param mixed $id
-     * @return void
+     * @return string|null
      */
-    public function update($id);
+    public function update($id): ?string;
 
     /**
      * @param mixed $id
-     * @return void
+     * @return string|null
      */
-    public function destroy($id);
+    public function destroy($id): ?string;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Handlers/CallbackExceptionHandler.php b/src/Pecee/Handlers/CallbackExceptionHandler.php
index 435a752..bc82f05 100644
--- a/src/Pecee/Handlers/CallbackExceptionHandler.php
+++ b/src/Pecee/Handlers/CallbackExceptionHandler.php
@@ -25,12 +25,11 @@ class CallbackExceptionHandler implements IExceptionHandler
     /**
      * @param Request $request
      * @param \Exception $error
-     * @return Request|null
      */
-    public function handleError(Request $request, \Exception $error)
+    public function handleError(Request $request, \Exception $error): void
     {
         /* Fire exceptions */
-        return call_user_func($this->callback,
+        \call_user_func($this->callback,
             $request,
             $error
         );
diff --git a/src/Pecee/Handlers/IExceptionHandler.php b/src/Pecee/Handlers/IExceptionHandler.php
index d27237f..5cd21d8 100644
--- a/src/Pecee/Handlers/IExceptionHandler.php
+++ b/src/Pecee/Handlers/IExceptionHandler.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Handlers;
 
 use Pecee\Http\Request;
@@ -8,8 +9,7 @@ interface IExceptionHandler
     /**
      * @param Request $request
      * @param \Exception $error
-     * @return Request|null
      */
-    public function handleError(Request $request, \Exception $error);
+    public function handleError(Request $request, \Exception $error): void;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Input/IInputItem.php b/src/Pecee/Http/Input/IInputItem.php
index c59913c..1913001 100644
--- a/src/Pecee/Http/Input/IInputItem.php
+++ b/src/Pecee/Http/Input/IInputItem.php
@@ -5,17 +5,17 @@ namespace Pecee\Http\Input;
 interface IInputItem
 {
 
-    public function getIndex();
+    public function getIndex(): string;
 
-    public function setIndex($index);
+    public function setIndex($index): self;
 
-    public function getName();
+    public function getName(): string;
 
-    public function setName($name);
+    public function setName($name): self;
 
-    public function getValue();
+    public function getValue(): string;
 
-    public function setValue($value);
+    public function setValue($value): self;
 
     public function __toString();
 
diff --git a/src/Pecee/Http/Input/InputFile.php b/src/Pecee/Http/Input/InputFile.php
index 2945480..1710efa 100644
--- a/src/Pecee/Http/Input/InputFile.php
+++ b/src/Pecee/Http/Input/InputFile.php
@@ -31,7 +31,7 @@ class InputFile implements IInputItem
      * @throws InvalidArgumentException
      * @return static
      */
-    public static function createFromArray(array $values)
+    public static function createFromArray(array $values): self
     {
         if (isset($values['index']) === false) {
             throw new InvalidArgumentException('Index key is required');
@@ -59,7 +59,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getIndex()
+    public function getIndex(): string
     {
         return $this->index;
     }
@@ -67,9 +67,9 @@ class InputFile implements IInputItem
     /**
      * Set input index
      * @param string $index
-     * @return static $this
+     * @return static
      */
-    public function setIndex($index)
+    public function setIndex($index): IInputItem
     {
         $this->index = $index;
 
@@ -79,7 +79,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getSize()
+    public function getSize(): string
     {
         return $this->size;
     }
@@ -87,9 +87,9 @@ class InputFile implements IInputItem
     /**
      * Set file size
      * @param int $size
-     * @return static $this
+     * @return static
      */
-    public function setSize($size)
+    public function setSize($size): IInputItem
     {
         $this->size = $size;
 
@@ -100,7 +100,7 @@ class InputFile implements IInputItem
      * Get mime-type of file
      * @return string
      */
-    public function getMime()
+    public function getMime(): string
     {
         return $this->getType();
     }
@@ -108,7 +108,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -116,9 +116,9 @@ class InputFile implements IInputItem
     /**
      * Set type
      * @param string $type
-     * @return static $this
+     * @return static
      */
-    public function setType($type)
+    public function setType($type): IInputItem
     {
         $this->type = $type;
 
@@ -130,7 +130,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getExtension()
+    public function getExtension(): string
     {
         return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
     }
@@ -140,7 +140,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -150,9 +150,9 @@ class InputFile implements IInputItem
      * Useful for adding validation etc.
      *
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setName($name)
+    public function setName($name): IInputItem
     {
         $this->name = $name;
 
@@ -163,9 +163,9 @@ class InputFile implements IInputItem
      * Set filename
      *
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setFilename($name)
+    public function setFilename($name): IInputItem
     {
         $this->filename = $name;
 
@@ -177,7 +177,7 @@ class InputFile implements IInputItem
      *
      * @return string mixed
      */
-    public function getFilename()
+    public function getFilename(): string
     {
         return $this->filename;
     }
@@ -188,7 +188,7 @@ class InputFile implements IInputItem
      * @param string $destination
      * @return bool
      */
-    public function move($destination)
+    public function move($destination): bool
     {
         return move_uploaded_file($this->tmpName, $destination);
     }
@@ -198,7 +198,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getContents()
+    public function getContents(): string
     {
         return file_get_contents($this->tmpName);
     }
@@ -208,7 +208,7 @@ class InputFile implements IInputItem
      *
      * @return bool
      */
-    public function hasError()
+    public function hasError(): bool
     {
         return ($this->getError() !== 0);
     }
@@ -218,7 +218,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getError()
+    public function getError(): string
     {
         return $this->errors;
     }
@@ -227,9 +227,9 @@ class InputFile implements IInputItem
      * Set error
      *
      * @param int $error
-     * @return static $this
+     * @return static
      */
-    public function setError($error)
+    public function setError($error): IInputItem
     {
         $this->errors = (int)$error;
 
@@ -239,7 +239,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getTmpName()
+    public function getTmpName(): string
     {
         return $this->tmpName;
     }
@@ -247,9 +247,9 @@ class InputFile implements IInputItem
     /**
      * Set file temp. name
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setTmpName($name)
+    public function setTmpName($name): IInputItem
     {
         $this->tmpName = $name;
 
@@ -261,7 +261,7 @@ class InputFile implements IInputItem
         return $this->getTmpName();
     }
 
-    public function getValue()
+    public function getValue(): string
     {
         return $this->getFilename();
     }
@@ -270,14 +270,14 @@ class InputFile implements IInputItem
      * @param string $value
      * @return static
      */
-    public function setValue($value)
+    public function setValue($value): IInputItem
     {
         $this->filename = $value;
 
         return $this;
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'tmp_name' => $this->tmpName,
diff --git a/src/Pecee/Http/Input/Input.php b/src/Pecee/Http/Input/InputHandler.php
similarity index 84%
rename from src/Pecee/Http/Input/Input.php
rename to src/Pecee/Http/Input/InputHandler.php
index b40dfef..416a8e3 100644
--- a/src/Pecee/Http/Input/Input.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -5,7 +5,7 @@ namespace Pecee\Http\Input;
 use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Request;
 
-class Input
+class InputHandler
 {
     /**
      * @var array
@@ -42,26 +42,26 @@ class Input
      * Parse input values
      *
      */
-    public function parseInputs()
+    public function parseInputs() : void
     {
         /* Parse get requests */
-        if (count($_GET) !== 0) {
+        if (\count($_GET) !== 0) {
             $this->get = $this->handleGetPost($_GET);
         }
 
         /* Parse post requests */
         $postVars = $_POST;
 
-        if (in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
+        if (\in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
             parse_str(file_get_contents('php://input'), $postVars);
         }
 
-        if (count($postVars) !== 0) {
+        if (\count($postVars) !== 0) {
             $this->post = $this->handleGetPost($postVars);
         }
 
         /* Parse get requests */
-        if (count($_FILES) !== 0) {
+        if (\count($_FILES) !== 0) {
             $this->file = $this->parseFiles();
         }
     }
@@ -69,14 +69,14 @@ class Input
     /**
      * @return array
      */
-    public function parseFiles()
+    public function parseFiles() : array
     {
         $list = [];
 
         foreach ((array)$_FILES as $key => $value) {
 
             // Handle array input
-            if (is_array($value['name']) === false) {
+            if (\is_array($value['name']) === false) {
                 $values['index'] = $key;
                 try {
                     $list[$key] = InputFile::createFromArray($values + $value);
@@ -101,7 +101,7 @@ class Input
         return $list;
     }
 
-    protected function rearrangeFiles(array $values, &$index, $original)
+    protected function rearrangeFiles(array $values, &$index, $original) : array
     {
 
         $originalIndex = $index[0];
@@ -111,7 +111,7 @@ class Input
 
         foreach ($values as $key => $value) {
 
-            if (is_array($original['name'][$key]) === false) {
+            if (\is_array($original['name'][$key]) === false) {
 
                 try {
 
@@ -152,14 +152,14 @@ class Input
         return $output;
     }
 
-    protected function handleGetPost(array $array)
+    protected function handleGetPost(array $array) : array
     {
         $list = [];
 
         foreach ($array as $key => $value) {
 
             // Handle array input
-            if (is_array($value) === false) {
+            if (\is_array($value) === false) {
                 $list[$key] = new InputItem($key, $value);
                 continue;
             }
@@ -181,7 +181,7 @@ class Input
      */
     public function findPost($index, $defaultValue = null)
     {
-        return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
+        return $this->post[$index] ?? $defaultValue;
     }
 
     /**
@@ -193,7 +193,7 @@ class Input
      */
     public function findFile($index, $defaultValue = null)
     {
-        return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
+        return $this->file[$index] ?? $defaultValue;
     }
 
     /**
@@ -205,7 +205,7 @@ class Input
      */
     public function findGet($index, $defaultValue = null)
     {
-        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
+        return $this->get[$index] ?? $defaultValue;
     }
 
     /**
@@ -218,25 +218,25 @@ class Input
      */
     public function getObject($index, $defaultValue = null, $methods = null)
     {
-        if ($methods !== null && is_string($methods) === true) {
+        if ($methods !== null && \is_string($methods) === true) {
             $methods = [$methods];
         }
 
         $element = null;
 
-        if ($methods === null || in_array('get', $methods, false) === true) {
+        if ($methods === null || \in_array('get', $methods, true) === true) {
             $element = $this->findGet($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods, false) === true)) {
+        if (($element === null && $methods === null) || ($methods !== null && \in_array('post', $methods, true) === true)) {
             $element = $this->findPost($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods, false) === true)) {
+        if (($element === null && $methods === null) || ($methods !== null && \in_array('file', $methods, true) === true)) {
             $element = $this->findFile($index);
         }
 
-        return ($element !== null) ? $element : $defaultValue;
+        return $element ?? $defaultValue;
     }
 
     /**
@@ -264,7 +264,7 @@ class Input
      * @param string $index
      * @return bool
      */
-    public function exists($index)
+    public function exists($index) : bool
     {
         return ($this->getObject($index) !== null);
     }
@@ -274,7 +274,7 @@ class Input
      * @param array|null $filter Only take items in filter
      * @return array
      */
-    public function all(array $filter = null)
+    public function all(array $filter = null) : array
     {
         $output = $_GET + $_POST;
 
diff --git a/src/Pecee/Http/Input/InputItem.php b/src/Pecee/Http/Input/InputItem.php
index 7ca4b93..de00aa7 100644
--- a/src/Pecee/Http/Input/InputItem.php
+++ b/src/Pecee/Http/Input/InputItem.php
@@ -20,12 +20,12 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getIndex()
+    public function getIndex(): string
     {
         return $this->index;
     }
 
-    public function setIndex($index)
+    public function setIndex($index): IInputItem
     {
         $this->index = $index;
 
@@ -35,7 +35,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -45,7 +45,7 @@ class InputItem implements IInputItem
      * @param string $name
      * @return static $this
      */
-    public function setName($name)
+    public function setName($name): IInputItem
     {
         $this->name = $name;
 
@@ -55,7 +55,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
         return $this->value;
     }
@@ -65,7 +65,7 @@ class InputItem implements IInputItem
      * @param string $value
      * @return static $this
      */
-    public function setValue($value)
+    public function setValue($value): IInputItem
     {
         $this->value = $value;
 
diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
index 67e57dd..613058a 100644
--- a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
+++ b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
@@ -9,8 +9,8 @@ use Pecee\Http\Security\ITokenProvider;
 
 class BaseCsrfVerifier implements IMiddleware
 {
-    const POST_KEY = 'csrf-token';
-    const HEADER_KEY = 'X-CSRF-TOKEN';
+    public const POST_KEY = 'csrf-token';
+    public const HEADER_KEY = 'X-CSRF-TOKEN';
 
     protected $except;
     protected $tokenProvider;
@@ -29,21 +29,21 @@ class BaseCsrfVerifier implements IMiddleware
      * @param Request $request
      * @return bool
      */
-    protected function skip(Request $request)
+    protected function skip(Request $request): bool
     {
-        if ($this->except === null || count($this->except) === 0) {
+        if ($this->except === null || \count($this->except) === 0) {
             return false;
         }
 
-        $max = count($this->except) - 1;
+        $max = \count($this->except) - 1;
 
         for ($i = $max; $i >= 0; $i--) {
             $url = $this->except[$i];
 
             $url = rtrim($url, '/');
-            if ($url[strlen($url) - 1] === '*') {
+            if ($url[\strlen($url) - 1] === '*') {
                 $url = rtrim($url, '*');
-                $skip = (stripos($request->getUrl()->getOriginalUrl(), $url) === 0);
+                $skip = $request->getUrl()->contains($url);
             } else {
                 $skip = ($url === $request->getUrl()->getOriginalUrl());
             }
@@ -62,12 +62,12 @@ class BaseCsrfVerifier implements IMiddleware
      * @param Request $request
      * @throws TokenMismatchException
      */
-    public function handle(Request $request)
+    public function handle(Request $request): void
     {
 
-        if ($this->skip($request) === false && in_array($request->getMethod(), ['post', 'put', 'delete'], false) === true) {
+        if ($this->skip($request) === false && \in_array($request->getMethod(), ['post', 'put', 'delete'], true) === true) {
 
-            $token = $request->getInput()->get(static::POST_KEY, null, 'post');
+            $token = $request->getInputHandler()->get(static::POST_KEY, null, 'post');
 
             // If the token is not posted, check headers for valid x-csrf-token
             if ($token === null) {
@@ -85,7 +85,7 @@ class BaseCsrfVerifier implements IMiddleware
 
     }
 
-    public function getTokenProvider()
+    public function getTokenProvider(): ITokenProvider
     {
         return $this->tokenProvider;
     }
@@ -94,7 +94,7 @@ class BaseCsrfVerifier implements IMiddleware
      * Set token provider
      * @param ITokenProvider $provider
      */
-    public function setTokenProvider(ITokenProvider $provider)
+    public function setTokenProvider(ITokenProvider $provider): void
     {
         $this->tokenProvider = $provider;
     }
diff --git a/src/Pecee/Http/Middleware/IMiddleware.php b/src/Pecee/Http/Middleware/IMiddleware.php
index 731144d..68daf8b 100644
--- a/src/Pecee/Http/Middleware/IMiddleware.php
+++ b/src/Pecee/Http/Middleware/IMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Middleware;
 
 use Pecee\Http\Request;
@@ -7,8 +8,7 @@ interface IMiddleware
 {
     /**
      * @param Request $request
-     * @return Request|null
      */
-    public function handle(Request $request);
+    public function handle(Request $request): void;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 2f0f381..696e5fa 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -2,7 +2,7 @@
 
 namespace Pecee\Http;
 
-use Pecee\Http\Input\Input;
+use Pecee\Http\Input\InputHandler;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
 use Pecee\SimpleRouter\SimpleRouter;
@@ -14,7 +14,7 @@ class Request
     protected $host;
     protected $url;
     protected $method;
-    protected $input;
+    protected $inputHandler;
 
     protected $hasRewrite = false;
 
@@ -25,9 +25,9 @@ class Request
     protected $rewriteUrl;
 
     /**
-     * @var ILoadableRoute|null
+     * @var array
      */
-    protected $loadedRoute;
+    protected $loadedRoutes = [];
 
     /**
      * Request constructor.
@@ -41,11 +41,11 @@ class Request
         // Check if special IIS header exist, otherwise use default.
         $this->setUrl($this->getHeader('unencoded-url', $this->getHeader('request-uri')));
 
-        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->get('_method', $this->getHeader('request-method')));
     }
 
-    protected function parseHeaders()
+    protected function parseHeaders(): void
     {
         $this->headers = [];
 
@@ -56,7 +56,7 @@ class Request
 
     }
 
-    public function isSecure()
+    public function isSecure(): bool
     {
         return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
     }
@@ -64,23 +64,23 @@ class Request
     /**
      * @return Url
      */
-    public function getUrl()
+    public function getUrl(): Url
     {
         return $this->url;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getHost()
+    public function getHost(): ?string
     {
         return $this->host;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getMethod()
+    public function getMethod(): ?string
     {
         return $this->method;
     }
@@ -89,7 +89,7 @@ class Request
      * Get http basic auth user
      * @return string|null
      */
-    public function getUser()
+    public function getUser(): ?string
     {
         return $this->getHeader('php-auth-user');
     }
@@ -98,7 +98,7 @@ class Request
      * Get http basic auth password
      * @return string|null
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->getHeader('php-auth-pw');
     }
@@ -107,16 +107,16 @@ class Request
      * Get all headers
      * @return array
      */
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
 
     /**
      * Get id address
-     * @return string
+     * @return string|null
      */
-    public function getIp()
+    public function getIp(): ?string
     {
         if ($this->getHeader('http-cf-connecting-ip') !== null) {
             return $this->getHeader('http-cf-connecting-ip');
@@ -133,27 +133,27 @@ class Request
      * Get remote address/ip
      *
      * @alias static::getIp
-     * @return string
+     * @return string|null
      */
-    public function getRemoteAddr()
+    public function getRemoteAddr(): ?string
     {
         return $this->getIp();
     }
 
     /**
      * Get referer
-     * @return string
+     * @return string|null
      */
-    public function getReferer()
+    public function getReferer(): ?string
     {
         return $this->getHeader('http-referer');
     }
 
     /**
      * Get user agent
-     * @return string
+     * @return string|null
      */
-    public function getUserAgent()
+    public function getUserAgent(): ?string
     {
         return $this->getHeader('http-user-agent');
     }
@@ -166,18 +166,18 @@ class Request
      *
      * @return string|null
      */
-    public function getHeader($name, $defaultValue = null)
+    public function getHeader($name, $defaultValue = null): ?string
     {
-        return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
+        return $this->headers[strtolower($name)] ?? $defaultValue;
     }
 
     /**
      * Get input class
-     * @return Input
+     * @return InputHandler
      */
-    public function getInput()
+    public function getInputHandler(): InputHandler
     {
-        return $this->input;
+        return $this->inputHandler;
     }
 
     /**
@@ -187,9 +187,9 @@ class Request
      *
      * @return bool
      */
-    public function isFormatAccepted($format)
+    public function isFormatAccepted($format): bool
     {
-        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
+        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) !== false);
     }
 
     /**
@@ -197,7 +197,7 @@ class Request
      *
      * @return bool
      */
-    public function isAjax()
+    public function isAjax(): bool
     {
         return (strtolower($this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
     }
@@ -206,7 +206,7 @@ class Request
      * Get accept formats
      * @return array
      */
-    public function getAcceptFormats()
+    public function getAcceptFormats(): array
     {
         return explode(',', $this->getHeader('http-accept'));
     }
@@ -215,7 +215,7 @@ class Request
      * @param string|Url $url
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public function setUrl($url)
+    public function setUrl($url): void
     {
         $this->url = ($url instanceof Url) ? $url : new Url($url);
     }
@@ -223,7 +223,7 @@ class Request
     /**
      * @param string $host
      */
-    public function setHost($host)
+    public function setHost($host): void
     {
         $this->host = $host;
     }
@@ -231,7 +231,7 @@ class Request
     /**
      * @param string $method
      */
-    public function setMethod($method)
+    public function setMethod($method): void
     {
         $this->method = $method;
     }
@@ -242,7 +242,7 @@ class Request
      * @param ILoadableRoute $route
      * @return static
      */
-    public function setRewriteRoute(ILoadableRoute $route)
+    public function setRewriteRoute(ILoadableRoute $route): self
     {
         $this->hasRewrite = true;
         $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
@@ -255,7 +255,7 @@ class Request
      *
      * @return ILoadableRoute|null
      */
-    public function getRewriteRoute()
+    public function getRewriteRoute(): ?ILoadableRoute
     {
         return $this->rewriteRoute;
     }
@@ -263,9 +263,9 @@ class Request
     /**
      * Get rewrite url
      *
-     * @return string
+     * @return string|null
      */
-    public function getRewriteUrl()
+    public function getRewriteUrl(): ?string
     {
         return $this->rewriteUrl;
     }
@@ -276,7 +276,7 @@ class Request
      * @param string $rewriteUrl
      * @return static
      */
-    public function setRewriteUrl($rewriteUrl)
+    public function setRewriteUrl(string $rewriteUrl): self
     {
         $this->hasRewrite = true;
         $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';
@@ -286,10 +286,10 @@ class Request
 
     /**
      * Set rewrite callback
-     * @param string $callback
+     * @param string|\Closure $callback
      * @return static
      */
-    public function setRewriteCallback($callback)
+    public function setRewriteCallback($callback): self
     {
         $this->hasRewrite = true;
 
@@ -300,37 +300,60 @@ class Request
      * Get loaded route
      * @return ILoadableRoute|null
      */
-    public function getLoadedRoute()
+    public function getLoadedRoute(): ?ILoadableRoute
     {
-        return $this->loadedRoute;
+        return (\count($this->loadedRoutes) > 0) ? end($this->loadedRoutes) : null;
     }
 
     /**
-     * Set loaded route
+     * Get all loaded routes
      *
-     * @param ILoadableRoute $route
+     * @return array
+     */
+    public function getLoadedRoutes(): array
+    {
+        return $this->loadedRoutes;
+    }
+
+    /**
+     * Set loaded routes
+     *
+     * @param array $routes
      * @return static
      */
-    public function setLoadedRoute(ILoadableRoute $route)
+    public function setLoadedRoutes(array $routes): self
     {
-        $this->loadedRoute = $route;
+        $this->loadedRoutes = $routes;
 
         return $this;
     }
 
-    public function hasRewrite()
+    /**
+     * Added loaded route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function addLoadedRoute(ILoadableRoute $route): self
+    {
+        $this->loadedRoutes[] = $route;
+
+        return $this;
+    }
+
+    public function hasRewrite(): bool
     {
         return $this->hasRewrite;
     }
 
-    public function setHasRewrite($value)
+    public function setHasRewrite($value): self
     {
         $this->hasRewrite = $value;
 
         return $this;
     }
 
-    public function isRewrite($url)
+    public function isRewrite($url): bool
     {
         return ($this->rewriteUrl === $url);
     }
@@ -347,7 +370,7 @@ class Request
 
     public function __get($name)
     {
-        return isset($this->data[$name]) ? $this->data[$name] : null;
+        return $this->data[$name] ?? null;
     }
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Response.php b/src/Pecee/Http/Response.php
index f9f46f1..9920132 100644
--- a/src/Pecee/Http/Response.php
+++ b/src/Pecee/Http/Response.php
@@ -19,7 +19,7 @@ class Response
      * @param int $code
      * @return static
      */
-    public function httpCode($code)
+    public function httpCode($code): self
     {
         http_response_code($code);
 
@@ -32,7 +32,7 @@ class Response
      * @param string $url
      * @param int $httpCode
      */
-    public function redirect($url, $httpCode = null)
+    public function redirect($url, $httpCode = null): void
     {
         if ($httpCode !== null) {
             $this->httpCode($httpCode);
@@ -42,7 +42,7 @@ class Response
         exit(0);
     }
 
-    public function refresh()
+    public function refresh(): void
     {
         $this->redirect($this->request->getUrl()->getOriginalUrl());
     }
@@ -52,7 +52,7 @@ class Response
      * @param string $name
      * @return static
      */
-    public function auth($name = '')
+    public function auth($name = ''): self
     {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
@@ -62,7 +62,7 @@ class Response
         return $this;
     }
 
-    public function cache($eTag, $lastModified = 2592000)
+    public function cache($eTag, $lastModified = 2592000): self
     {
 
         $this->headers([
@@ -77,8 +77,7 @@ class Response
         if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
 
             $this->header('HTTP/1.1 304 Not Modified');
-
-            exit();
+            exit(0);
         }
 
         return $this;
@@ -91,9 +90,9 @@ class Response
      * @param int $dept JSON debt.
      * @throws InvalidArgumentException
      */
-    public function json($value, $options = null, $dept = 512)
+    public function json($value, $options = null, $dept = 512): void
     {
-        if (($value instanceof \JsonSerializable) === false && is_array($value) === false) {
+        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.');
         }
 
@@ -107,7 +106,7 @@ class Response
      * @param string $value
      * @return static
      */
-    public function header($value)
+    public function header($value): self
     {
         header($value);
 
@@ -119,7 +118,7 @@ class Response
      * @param array $headers
      * @return static
      */
-    public function headers(array $headers)
+    public function headers(array $headers): self
     {
         foreach ($headers as $header) {
             $this->header($header);
diff --git a/src/Pecee/Http/Security/CookieTokenProvider.php b/src/Pecee/Http/Security/CookieTokenProvider.php
index 209067f..a44f639 100644
--- a/src/Pecee/Http/Security/CookieTokenProvider.php
+++ b/src/Pecee/Http/Security/CookieTokenProvider.php
@@ -6,7 +6,7 @@ use Pecee\Http\Security\Exceptions\SecurityException;
 
 class CookieTokenProvider implements ITokenProvider
 {
-    const CSRF_KEY = 'CSRF-TOKEN';
+    public const CSRF_KEY = 'CSRF-TOKEN';
 
     protected $token;
     protected $cookieTimeoutMinutes = 120;
@@ -30,24 +30,13 @@ class CookieTokenProvider implements ITokenProvider
      * @return string
      * @throws SecurityException
      */
-    public function generateToken()
+    public function generateToken(): string
     {
-        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());
-            }
+        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;
     }
 
     /**
@@ -56,7 +45,7 @@ class CookieTokenProvider implements ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token)
+    public function validate($token): bool
     {
         if ($token !== null && $this->getToken() !== null) {
             return hash_equals($token, $this->getToken());
@@ -71,7 +60,7 @@ class CookieTokenProvider implements ITokenProvider
      *
      * @param string $token
      */
-    public function setToken($token)
+    public function setToken($token): void
     {
         $this->token = $token;
         setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
@@ -82,17 +71,17 @@ class CookieTokenProvider implements ITokenProvider
      * @param string|null $defaultValue
      * @return string|null
      */
-    public function getToken($defaultValue = null)
+    public function getToken($defaultValue = null): ?string
     {
         $this->token = ($this->hasToken() === true) ? $_COOKIE[static::CSRF_KEY] : null;
 
-        return ($this->token !== null) ? $this->token : $defaultValue;
+        return $this->token ?? $defaultValue;
     }
 
     /**
      * Refresh existing token
      */
-    public function refresh()
+    public function refresh(): void
     {
         if ($this->token !== null) {
             $this->setToken($this->token);
@@ -103,7 +92,7 @@ class CookieTokenProvider implements ITokenProvider
      * Returns whether the csrf token has been defined
      * @return bool
      */
-    public function hasToken()
+    public function hasToken(): bool
     {
         return isset($_COOKIE[static::CSRF_KEY]);
     }
@@ -112,7 +101,7 @@ class CookieTokenProvider implements ITokenProvider
      * Get timeout for cookie in minutes
      * @return int
      */
-    public function getCookieTimeoutMinutes()
+    public function getCookieTimeoutMinutes(): int
     {
         return $this->cookieTimeoutMinutes;
     }
@@ -121,7 +110,7 @@ class CookieTokenProvider implements ITokenProvider
      * Set cookie timeout in minutes
      * @param $minutes
      */
-    public function setCookieTimeoutMinutes($minutes)
+    public function setCookieTimeoutMinutes($minutes): void
     {
         $this->cookieTimeoutMinutes = $minutes;
     }
diff --git a/src/Pecee/Http/Security/ITokenProvider.php b/src/Pecee/Http/Security/ITokenProvider.php
index 6b1ee72..7b6307f 100644
--- a/src/Pecee/Http/Security/ITokenProvider.php
+++ b/src/Pecee/Http/Security/ITokenProvider.php
@@ -8,7 +8,7 @@ interface ITokenProvider
     /**
      * Refresh existing token
      */
-    public function refresh();
+    public function refresh(): void;
 
     /**
      * Validate valid CSRF token
@@ -16,6 +16,14 @@ interface ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token);
+    public function validate($token): bool;
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken($defaultValue = null);
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index 6256c3e..e863a76 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -38,7 +38,7 @@ class Url
      * Check if url is using a secure protocol like https
      * @return bool
      */
-    public function isSecure()
+    public function isSecure(): bool
     {
         return (strtolower($this->getScheme()) === 'https');
     }
@@ -47,7 +47,7 @@ class Url
      * Checks if url is relative
      * @return bool
      */
-    public function isRelative()
+    public function isRelative(): bool
     {
         return ($this->getHost() === null);
     }
@@ -56,7 +56,7 @@ class Url
      * Get url scheme
      * @return string|null
      */
-    public function getScheme()
+    public function getScheme(): ?string
     {
         return $this->data['scheme'];
     }
@@ -65,7 +65,7 @@ class Url
      * Get url host
      * @return string|null
      */
-    public function getHost()
+    public function getHost(): ?string
     {
         return $this->data['host'];
     }
@@ -74,7 +74,7 @@ class Url
      * Get url port
      * @return int|null
      */
-    public function getPort()
+    public function getPort(): ?int
     {
         return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
     }
@@ -83,7 +83,7 @@ class Url
      * Parse username from url
      * @return string|null
      */
-    public function getUserName()
+    public function getUserName(): ?string
     {
         return $this->data['user'];
     }
@@ -92,7 +92,7 @@ class Url
      * Parse password from url
      * @return string|null
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->data['pass'];
     }
@@ -101,7 +101,7 @@ class Url
      * Get path from url
      * @return string
      */
-    public function getPath()
+    public function getPath(): ?string
     {
         return $this->data['path'];
     }
@@ -110,7 +110,7 @@ class Url
      * Get querystring from url
      * @return string|null
      */
-    public function getQueryString()
+    public function getQueryString(): ?string
     {
         return $this->data['query'];
     }
@@ -119,7 +119,7 @@ class Url
      * Get fragment from url (everything after #)
      * @return string|null
      */
-    public function getFragment()
+    public function getFragment(): ?string
     {
         return $this->data['fragment'];
     }
@@ -127,7 +127,7 @@ class Url
     /**
      * @return string
      */
-    public function getOriginalUrl()
+    public function getOriginalUrl(): string
     {
         return $this->originalUrl;
     }
@@ -139,7 +139,7 @@ class Url
      * @throws MalformedUrlException
      * @return array
      */
-    public function parseUrl($url, $component = -1)
+    public function parseUrl($url, $component = -1): array
     {
         $encodedUrl = preg_replace_callback(
             '/[^:\/@?&=#]+/u',
@@ -158,11 +158,16 @@ class Url
         return array_map('urldecode', $parts);
     }
 
+    public function contains($value): bool
+    {
+        return (stripos($this->getOriginalUrl(), $value) === false);
+    }
+
     /**
      * Returns data array with information about the url
      * @return array
      */
-    public function getData()
+    public function getData(): array
     {
         return $this->data;
     }
diff --git a/src/Pecee/SimpleRouter/IRouterBootManager.php b/src/Pecee/SimpleRouter/IRouterBootManager.php
index 08090ed..c3686ec 100644
--- a/src/Pecee/SimpleRouter/IRouterBootManager.php
+++ b/src/Pecee/SimpleRouter/IRouterBootManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter;
 
 use Pecee\Http\Request;
@@ -9,7 +10,6 @@ interface IRouterBootManager
      * Called when router loads it's routes
      *
      * @param Request $request
-     * @return Request
      */
-    public function boot(Request $request);
+    public function boot(Request $request): void;
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IControllerRoute.php b/src/Pecee/SimpleRouter/Route/IControllerRoute.php
index 9b1e79b..6f102db 100644
--- a/src/Pecee/SimpleRouter/Route/IControllerRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IControllerRoute.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 interface IControllerRoute extends IRoute
@@ -8,7 +9,7 @@ interface IControllerRoute extends IRoute
      *
      * @return string
      */
-    public function getController();
+    public function getController(): string;
 
     /**
      * Set controller class-name
@@ -16,21 +17,6 @@ interface IControllerRoute extends IRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller);
-
-    /**
-     * Return active method
-     *
-     * @return string
-     */
-    public function getMethod();
-
-    /**
-     * Set active method
-     *
-     * @param string $method
-     * @return static
-     */
-    public function setMethod($method);
+    public function setController($controller): self;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IGroupRoute.php b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
index ff3a69d..7a60142 100644
--- a/src/Pecee/SimpleRouter/Route/IGroupRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
@@ -13,7 +13,7 @@ interface IGroupRoute extends IRoute
      * @param Request $request
      * @return bool
      */
-    public function matchDomain(Request $request);
+    public function matchDomain(Request $request): bool;
 
     /**
      * Add exception handler
@@ -36,35 +36,35 @@ interface IGroupRoute extends IRoute
      *
      * @return array
      */
-    public function getExceptionHandlers();
+    public function getExceptionHandlers(): array;
 
     /**
      * Get domains for domain.
      *
      * @return array
      */
-    public function getDomains();
+    public function getDomains(): array;
 
     /**
      * Set allowed domains for group.
      *
      * @param array $domains
-     * @return $this
+     * @return static
      */
-    public function setDomains(array $domains);
+    public function setDomains(array $domains): self;
 
     /**
      * Set prefix that child-routes will inherit.
      *
      * @param string $prefix
-     * @return string
+     * @return static
      */
-    public function setPrefix($prefix);
+    public function setPrefix($prefix): self;
 
     /**
      * Get prefix.
      *
-     * @return string
+     * @return string|null
      */
-    public function getPrefix();
+    public function getPrefix(): ?string;
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
index d1d08c9..c1a3472 100644
--- a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
@@ -14,7 +15,7 @@ interface ILoadableRoute extends IRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null);
+    public function findUrl($method = null, $parameters = null, $name = null): string;
 
     /**
      * Loads and renders middlewares-classes
@@ -30,9 +31,9 @@ interface ILoadableRoute extends IRoute
     /**
      * Returns the provided name for the router.
      *
-     * @return string
+     * @return string|null
      */
-    public function getName();
+    public function getName(): string;
 
     /**
      * Check if route has given name.
@@ -40,22 +41,22 @@ interface ILoadableRoute extends IRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name);
+    public function hasName($name): bool;
 
     /**
      * Sets the router name, which makes it easier to obtain the url or router at a later point.
      *
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setName($name);
+    public function setName($name): self;
 
     /**
      * Get regular expression match used for matching route (if defined).
      *
      * @return string
      */
-    public function getMatch();
+    public function getMatch(): string;
 
     /**
      * Add regular expression match for the entire route.
@@ -63,6 +64,6 @@ interface ILoadableRoute extends IRoute
      * @param string $regex
      * @return static
      */
-    public function setMatch($regex);
+    public function setMatch($regex): self;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IRoute.php b/src/Pecee/SimpleRouter/Route/IRoute.php
index e77946e..f5916b4 100644
--- a/src/Pecee/SimpleRouter/Route/IRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IRoute.php
@@ -13,7 +13,7 @@ interface IRoute
      * @param Request $request
      * @return bool
      */
-    public function matchRoute($route, Request $request);
+    public function matchRoute($route, Request $request): bool;
 
     /**
      * Called when route is matched.
@@ -23,7 +23,7 @@ interface IRoute
      * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
      * @return string
      */
-    public function renderRoute(Request $request);
+    public function renderRoute(Request $request): ?string;
 
     /**
      * Returns callback name/identifier for the current route based on the callback.
@@ -32,50 +32,50 @@ interface IRoute
      *
      * @return string
      */
-    public function getIdentifier();
+    public function getIdentifier(): string;
 
     /**
      * Set allowed request methods
      *
      * @param array $methods
-     * @return static $this
+     * @return static
      */
-    public function setRequestMethods(array $methods);
+    public function setRequestMethods(array $methods): self;
 
     /**
      * Get allowed request methods
      *
      * @return array
      */
-    public function getRequestMethods();
+    public function getRequestMethods(): array;
 
     /**
      * @return IRoute|null
      */
-    public function getParent();
+    public function getParent(): ?IRoute;
 
     /**
      * Get the group for the route.
      *
      * @return IGroupRoute|null
      */
-    public function getGroup();
+    public function getGroup(): ?IGroupRoute;
 
     /**
      * Set group
      *
      * @param IGroupRoute $group
-     * @return static $this
+     * @return static
      */
-    public function setGroup(IGroupRoute $group);
+    public function setGroup(IGroupRoute $group): self;
 
     /**
      * Set parent route
      *
      * @param IRoute $parent
-     * @return static $this
+     * @return static
      */
-    public function setParent(IRoute $parent);
+    public function setParent(IRoute $parent): self;
 
     /**
      * Set callback
@@ -83,33 +83,44 @@ interface IRoute
      * @param string $callback
      * @return static
      */
-    public function setCallback($callback);
+    public function setCallback($callback): self;
 
     /**
-     * @return string
+     * @return string|callable
      */
     public function getCallback();
 
-    public function getMethod();
+    /**
+     * Return active method
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string;
+
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod($method): self;
 
     public function getClass();
 
-    public function setMethod($method);
-
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
     public function setNamespace($namespace);
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getNamespace();
+    public function getNamespace(): ?string;
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
     public function setDefaultNamespace($namespace);
 
@@ -120,7 +131,7 @@ interface IRoute
      *
      * @return array
      */
-    public function getWhere();
+    public function getWhere(): array;
 
     /**
      * Set parameter names.
@@ -135,7 +146,7 @@ interface IRoute
      *
      * @return array
      */
-    public function getParameters();
+    public function getParameters(): array;
 
     /**
      * Get parameters
@@ -159,14 +170,14 @@ interface IRoute
      *
      * @return array
      */
-    public function toArray();
+    public function toArray(): array;
 
     /**
      * Get middlewares array
      *
      * @return array
      */
-    public function getMiddlewares();
+    public function getMiddlewares(): array;
 
     /**
      * Set middleware class-name
@@ -174,14 +185,14 @@ interface IRoute
      * @param string $middleware
      * @return static
      */
-    public function addMiddleware($middleware);
+    public function addMiddleware($middleware): self;
 
     /**
      * Set middlewares array
      *
      * @param array $middlewares
-     * @return $this
+     * @return static
      */
-    public function setMiddlewares(array $middlewares);
+    public function setMiddlewares(array $middlewares): self;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index 1bbd126..24eead4 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -26,11 +26,11 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param Request $request
      * @throws HttpException
      */
-    public function loadMiddleware(Request $request)
+    public function loadMiddleware(Request $request) : void
     {
         foreach ($this->getMiddlewares() as $middleware) {
 
-            if (is_object($middleware) === false) {
+            if (\is_object($middleware) === false) {
                 $middleware = $this->loadClass($middleware);
             }
 
@@ -42,7 +42,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         }
     }
 
-    public function matchRegex(Request $request, $url)
+    public function matchRegex(Request $request, $url) : ?bool
     {
         /* Match on custom defined regular expression */
 
@@ -59,7 +59,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $url
      * @return static
      */
-    public function setUrl($url)
+    public function setUrl($url) : self
     {
         $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
@@ -75,7 +75,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return $this;
     }
 
-    public function getUrl()
+    public function getUrl() : string
     {
         return $this->url;
     }
@@ -89,13 +89,13 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null) : string
     {
         $url = $this->getUrl();
 
         $group = $this->getGroup();
 
-        if ($group !== null && count($group->getDomains()) !== 0) {
+        if ($group !== null && \count($group->getDomains()) !== 0) {
             $url = '//' . $group->getDomains()[0] . $url;
         }
 
@@ -114,7 +114,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
         foreach (array_keys($params) as $param) {
 
-            if ($parameters === '' || (is_array($parameters) === true && count($parameters) === 0)) {
+            if ($parameters === '' || (\is_array($parameters) === true && \count($parameters) === 0)) {
                 $value = '';
             } else {
                 $p = (array)$parameters;
@@ -144,7 +144,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getName()
+    public function getName() : string
     {
         return $this->name;
     }
@@ -155,9 +155,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name)
+    public function hasName($name) : bool
     {
-        return (strtolower($this->name) === strtolower($name));
+        return strtolower($this->name) === strtolower($name);
     }
 
     /**
@@ -166,7 +166,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $regex
      * @return static
      */
-    public function setMatch($regex)
+    public function setMatch($regex) : ILoadableRoute
     {
         $this->regex = $regex;
 
@@ -178,7 +178,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getMatch()
+    public function getMatch() : string
     {
         return $this->regex;
     }
@@ -191,7 +191,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string|array $name
      * @return static
      */
-    public function name($name)
+    public function name($name) : ILoadableRoute
     {
         return $this->setName($name);
     }
@@ -200,9 +200,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * Sets the router name, which makes it easier to obtain the url or router at a later point.
      *
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setName($name)
+    public function setName($name) : ILoadableRoute
     {
         $this->name = $name;
 
@@ -216,7 +216,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, $merge = false): IRoute
     {
         if (isset($values['as']) === true) {
 
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 8ebd681..1cb70bc 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -8,15 +8,15 @@ use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 abstract class Route implements IRoute
 {
-    const PARAMETERS_REGEX_FORMAT = '%s([\w]+)(\%s?)%s';
-    const PARAMETERS_DEFAULT_REGEX = '[\w]+';
+    protected const PARAMETERS_REGEX_FORMAT = '%s([\w]+)(\%s?)%s';
+    protected const PARAMETERS_DEFAULT_REGEX = '[\w]+';
 
-    const REQUEST_TYPE_GET = 'get';
-    const REQUEST_TYPE_POST = 'post';
-    const REQUEST_TYPE_PUT = 'put';
-    const REQUEST_TYPE_PATCH = 'patch';
-    const REQUEST_TYPE_OPTIONS = 'options';
-    const REQUEST_TYPE_DELETE = 'delete';
+    public const REQUEST_TYPE_GET = 'get';
+    public const REQUEST_TYPE_POST = 'post';
+    public const REQUEST_TYPE_PUT = 'put';
+    public const REQUEST_TYPE_PATCH = 'patch';
+    public const REQUEST_TYPE_OPTIONS = 'options';
+    public const REQUEST_TYPE_DELETE = 'delete';
 
     public static $requestTypes = [
         self::REQUEST_TYPE_GET,
@@ -75,10 +75,10 @@ abstract class Route implements IRoute
      * Render route
      *
      * @param Request $request
-     * @return string|mixed
+     * @return string|null
      * @throws NotFoundHttpException
      */
-    public function renderRoute(Request $request)
+    public function renderRoute(Request $request): ?string
     {
         $callback = $this->getCallback();
 
@@ -97,9 +97,9 @@ abstract class Route implements IRoute
         }
 
         /* Render callback function */
-        if (is_callable($callback) === true) {
+        if (\is_callable($callback) === true) {
             /* When the callback is a function */
-            return call_user_func_array($callback, $parameters);
+            return \call_user_func_array($callback, $parameters);
         }
 
         /* When the callback is a class + method */
@@ -116,7 +116,7 @@ abstract class Route implements IRoute
             throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
         }
 
-        return call_user_func_array([$class, $method], $parameters);
+        return \call_user_func_array([$class, $method], $parameters);
     }
 
     protected function parseParameters($route, $url, $parameterRegex = null)
@@ -138,7 +138,7 @@ abstract class Route implements IRoute
 
                 $regex = '';
 
-                if ($key < count($parameters[1])) {
+                if ($key < \count($parameters[1])) {
 
                     $name = $parameters[1][$key];
 
@@ -151,7 +151,7 @@ abstract class Route implements IRoute
                         if ($parameterRegex !== null) {
                             $regex = $parameterRegex;
                         } else {
-                            $regex = ($this->defaultParameterRegex === null) ? static::PARAMETERS_DEFAULT_REGEX : $this->defaultParameterRegex;
+                            $regex = $this->defaultParameterRegex ?? static::PARAMETERS_DEFAULT_REGEX;
                         }
                     }
 
@@ -189,9 +189,9 @@ abstract class Route implements IRoute
      *
      * @return string
      */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
-        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             return $this->callback;
         }
 
@@ -202,9 +202,9 @@ abstract class Route implements IRoute
      * Set allowed request methods
      *
      * @param array $methods
-     * @return static $this
+     * @return static
      */
-    public function setRequestMethods(array $methods)
+    public function setRequestMethods(array $methods): IRoute
     {
         $this->requestMethods = $methods;
 
@@ -216,7 +216,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getRequestMethods()
+    public function getRequestMethods(): array
     {
         return $this->requestMethods;
     }
@@ -224,7 +224,7 @@ abstract class Route implements IRoute
     /**
      * @return IRoute|null
      */
-    public function getParent()
+    public function getParent(): ?IRoute
     {
         return $this->parent;
     }
@@ -234,7 +234,7 @@ abstract class Route implements IRoute
      *
      * @return IGroupRoute|null
      */
-    public function getGroup()
+    public function getGroup(): ?IGroupRoute
     {
         return $this->group;
     }
@@ -243,9 +243,9 @@ abstract class Route implements IRoute
      * Set group
      *
      * @param IGroupRoute $group
-     * @return static $this
+     * @return static
      */
-    public function setGroup(IGroupRoute $group)
+    public function setGroup(IGroupRoute $group): IRoute
     {
         $this->group = $group;
 
@@ -259,9 +259,9 @@ abstract class Route implements IRoute
      * Set parent route
      *
      * @param IRoute $parent
-     * @return static $this
+     * @return static
      */
-    public function setParent(IRoute $parent)
+    public function setParent(IRoute $parent): IRoute
     {
         $this->parent = $parent;
 
@@ -274,7 +274,7 @@ abstract class Route implements IRoute
      * @param string $callback
      * @return static
      */
-    public function setCallback($callback)
+    public function setCallback($callback): IRoute
     {
         $this->callback = $callback;
 
@@ -282,16 +282,16 @@ abstract class Route implements IRoute
     }
 
     /**
-     * @return string
+     * @return string|callable
      */
     public function getCallback()
     {
         return $this->callback;
     }
 
-    public function getMethod()
+    public function getMethod(): ?string
     {
-        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             $tmp = explode('@', $this->callback);
 
             return $tmp[1];
@@ -302,7 +302,7 @@ abstract class Route implements IRoute
 
     public function getClass()
     {
-        if (is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             $tmp = explode('@', $this->callback);
 
             return $tmp[0];
@@ -311,7 +311,7 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function setMethod($method)
+    public function setMethod($method): IRoute
     {
         $this->callback = sprintf('%s@%s', $this->getClass(), $method);
 
@@ -353,11 +353,11 @@ abstract class Route implements IRoute
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getNamespace()
+    public function getNamespace(): ?string
     {
-        return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
+        return $this->namespace ?? $this->defaultNamespace;
     }
 
     /**
@@ -365,7 +365,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -373,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;
         }
 
@@ -434,7 +434,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getWhere()
+    public function getWhere(): array
     {
         return $this->where;
     }
@@ -470,12 +470,12 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getParameters()
+    public function getParameters(): array
     {
         /* 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;
         }
 
@@ -494,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;
         }
 
@@ -523,7 +523,7 @@ abstract class Route implements IRoute
      * @param IMiddleware|string $middleware
      * @return static
      */
-    public function addMiddleware($middleware)
+    public function addMiddleware($middleware): IRoute
     {
         $this->middlewares[] = $middleware;
 
@@ -534,9 +534,9 @@ abstract class Route implements IRoute
      * Set middlewares array
      *
      * @param array $middlewares
-     * @return $this
+     * @return static
      */
-    public function setMiddlewares(array $middlewares)
+    public function setMiddlewares(array $middlewares): IRoute
     {
         $this->middlewares = $middlewares;
 
@@ -546,7 +546,7 @@ abstract class Route implements IRoute
     /**
      * @return array
      */
-    public function getMiddlewares()
+    public function getMiddlewares(): array
     {
         return $this->middlewares;
     }
@@ -570,7 +570,7 @@ abstract class Route implements IRoute
      *
      * @return string
      */
-    public function getDefaultParameterRegex()
+    public function getDefaultParameterRegex(): string
     {
         return $this->defaultParameterRegex;
     }
diff --git a/src/Pecee/SimpleRouter/Route/RouteController.php b/src/Pecee/SimpleRouter/Route/RouteController.php
index 25cfe4f..898df28 100644
--- a/src/Pecee/SimpleRouter/Route/RouteController.php
+++ b/src/Pecee/SimpleRouter/Route/RouteController.php
@@ -24,7 +24,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name)
+    public function hasName($name): bool
     {
         if ($this->name === null) {
             return false;
@@ -35,7 +35,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
             $method = substr($name, strrpos($name, '.') + 1);
             $newName = substr($name, 0, strrpos($name, '.'));
 
-            if (in_array($method, $this->names, false) === true && strtolower($this->name) === strtolower($newName)) {
+            if (\in_array($method, $this->names, true) === true && strtolower($this->name) === strtolower($newName)) {
                 return true;
             }
         }
@@ -49,7 +49,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         if (strpos($name, '.') !== false) {
             $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
@@ -67,7 +67,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
             foreach (static::$requestTypes as $requestType) {
 
                 if (stripos($method, $requestType) === 0) {
-                    $method = (string)substr($method, strlen($requestType));
+                    $method = (string)substr($method, \strlen($requestType));
                     break;
                 }
             }
@@ -77,7 +77,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
 
         $group = $this->getGroup();
 
-        if ($group !== null && count($group->getDomains()) !== 0) {
+        if ($group !== null && \count($group->getDomains()) !== 0) {
             $url .= '//' . $group->getDomains()[0];
         }
 
@@ -86,9 +86,9 @@ class RouteController extends LoadableRoute implements IControllerRoute
         return '/' . trim($url, '/') . '/';
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
             return false;
         }
 
@@ -102,12 +102,12 @@ 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);
 
-            $this->parameters = array_slice($path, 1);
+            $this->parameters = \array_slice($path, 1);
 
             // Set callback
             $this->setCallback($this->controller . '@' . $this->method);
@@ -123,7 +123,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      *
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
@@ -134,7 +134,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller)
+    public function setController($controller): IControllerRoute
     {
         $this->controller = $controller;
 
@@ -144,9 +144,9 @@ class RouteController extends LoadableRoute implements IControllerRoute
     /**
      * Return active method
      *
-     * @return string
+     * @return string|null
      */
-    public function getMethod()
+    public function getMethod(): ?string
     {
         return $this->method;
     }
@@ -157,7 +157,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $method
      * @return static
      */
-    public function setMethod($method)
+    public function setMethod($method): IRoute
     {
         $this->method = $method;
 
@@ -171,7 +171,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];
diff --git a/src/Pecee/SimpleRouter/Route/RouteGroup.php b/src/Pecee/SimpleRouter/Route/RouteGroup.php
index 4e3bde1..e2506d7 100644
--- a/src/Pecee/SimpleRouter/Route/RouteGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RouteGroup.php
@@ -18,9 +18,9 @@ class RouteGroup extends Route implements IGroupRoute
      * @param Request $request
      * @return bool
      */
-    public function matchDomain(Request $request)
+    public function matchDomain(Request $request): bool
     {
-        if ($this->domains === null || count($this->domains) === 0) {
+        if ($this->domains === null || \count($this->domains) === 0) {
             return true;
         }
 
@@ -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;
 
@@ -46,9 +46,9 @@ class RouteGroup extends Route implements IGroupRoute
      * @param Request $request
      * @return bool
      */
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
             return false;
         }
 
@@ -64,9 +64,9 @@ class RouteGroup extends Route implements IGroupRoute
      * Add exception handler
      *
      * @param IExceptionHandler|string $handler
-     * @return static $this
+     * @return static
      */
-    public function addExceptionHandler($handler)
+    public function addExceptionHandler($handler): IGroupRoute
     {
         $this->exceptionHandlers[] = $handler;
 
@@ -77,9 +77,9 @@ class RouteGroup extends Route implements IGroupRoute
      * Set exception-handlers for group
      *
      * @param array $handlers
-     * @return static $this
+     * @return static
      */
-    public function setExceptionHandlers(array $handlers)
+    public function setExceptionHandlers(array $handlers): IGroupRoute
     {
         $this->exceptionHandlers = $handlers;
 
@@ -91,7 +91,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getExceptionHandlers()
+    public function getExceptionHandlers(): array
     {
         return $this->exceptionHandlers;
     }
@@ -101,7 +101,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getDomains()
+    public function getDomains(): array
     {
         return $this->domains;
     }
@@ -110,9 +110,9 @@ class RouteGroup extends Route implements IGroupRoute
      * Set allowed domains for group.
      *
      * @param array $domains
-     * @return $this
+     * @return static
      */
-    public function setDomains(array $domains)
+    public function setDomains(array $domains): IGroupRoute
     {
         $this->domains = $domains;
 
@@ -123,7 +123,7 @@ class RouteGroup extends Route implements IGroupRoute
      * @param string $prefix
      * @return static
      */
-    public function setPrefix($prefix)
+    public function setPrefix($prefix): IGroupRoute
     {
         $this->prefix = '/' . trim($prefix, '/');
 
@@ -133,9 +133,9 @@ class RouteGroup extends Route implements IGroupRoute
     /**
      * Set prefix that child-routes will inherit.
      *
-     * @return string
+     * @return string|null
      */
-    public function getPrefix()
+    public function getPrefix(): ?string
     {
         return $this->prefix;
     }
@@ -147,7 +147,7 @@ class RouteGroup extends Route implements IGroupRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, $merge = false): IRoute
     {
 
         if (isset($values['prefix']) === true) {
@@ -183,7 +183,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -195,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;
         }
 
diff --git a/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php b/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
index 51b71e0..9656554 100644
--- a/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
@@ -15,12 +15,12 @@ class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
      * @param Request $request
      * @return bool
      */
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        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);
diff --git a/src/Pecee/SimpleRouter/Route/RouteResource.php b/src/Pecee/SimpleRouter/Route/RouteResource.php
index 108e51a..7d454b4 100644
--- a/src/Pecee/SimpleRouter/Route/RouteResource.php
+++ b/src/Pecee/SimpleRouter/Route/RouteResource.php
@@ -42,7 +42,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name)
+    public function hasName($name): bool
     {
         if ($this->name === null) {
             return false;
@@ -60,7 +60,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return (strtolower($this->name) === strtolower($name));
     }
 
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         $url = array_search($name, $this->names, false);
         if ($url !== false) {
@@ -77,9 +77,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return true;
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
             return false;
         }
 
@@ -114,7 +114,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         }
 
         // Update
-        if ($id !== null && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false) === true) {
+        if ($id !== null && \in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], true) === true) {
             return $this->call($this->methodNames['update']);
         }
 
@@ -145,7 +145,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     /**
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
@@ -154,14 +154,14 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller)
+    public function setController($controller): IControllerRoute
     {
         $this->controller = $controller;
 
         return $this;
     }
 
-    public function setName($name)
+    public function setName($name): ILoadableRoute
     {
         $this->name = $name;
 
@@ -194,9 +194,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     /**
      * Get method names
      *
-     * @return array $this
+     * @return array
      */
-    public function getMethodNames()
+    public function getMethodNames(): array
     {
         return $this->methodNames;
     }
@@ -208,7 +208,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];
diff --git a/src/Pecee/SimpleRouter/Route/RouteUrl.php b/src/Pecee/SimpleRouter/Route/RouteUrl.php
index 19eb137..cdfcb60 100644
--- a/src/Pecee/SimpleRouter/Route/RouteUrl.php
+++ b/src/Pecee/SimpleRouter/Route/RouteUrl.php
@@ -12,9 +12,9 @@ class RouteUrl extends LoadableRoute
         $this->setCallback($callback);
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        if($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
             return false;
         }
 
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index a34e350..c4d8f22 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -78,7 +78,7 @@ class Router
     /**
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public function reset()
+    public function reset() : void
     {
         $this->processingRoute = false;
         $this->request = new Request();
@@ -94,7 +94,7 @@ class Router
      * @param IRoute $route
      * @return IRoute
      */
-    public function addRoute(IRoute $route)
+    public function addRoute(IRoute $route) : IRoute
     {
         /*
          * If a route is currently being processed, that means that the route being added are rendered from the parent
@@ -115,13 +115,13 @@ class Router
      * @param IRoute $route
      * @throws NotFoundHttpException
      */
-    protected function renderAndProcess(IRoute $route) {
+    protected function renderAndProcess(IRoute $route) : void {
 
         $this->processingRoute = true;
         $route->renderRoute($this->request);
         $this->processingRoute = false;
 
-        if (count($this->routeStack) !== 0) {
+        if (\count($this->routeStack) !== 0) {
 
             /* Pop and grab the routes added when executing group callback earlier */
             $stack = $this->routeStack;
@@ -139,7 +139,7 @@ class Router
      * @param IGroupRoute|null $group
      * @throws NotFoundHttpException
      */
-    protected function processRoutes(array $routes, IGroupRoute $group = null)
+    protected function processRoutes(array $routes, IGroupRoute $group = null) : void
     {
         // Loop through each route-request
         $exceptionHandlers = [];
@@ -149,7 +149,7 @@ class Router
             return;
         }
 
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();
+        $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
 
         /* @var $route IRoute */
         foreach ($routes as $route) {
@@ -165,7 +165,7 @@ class Router
                 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();
                     }
@@ -199,7 +199,7 @@ class Router
      * @throws NotFoundHttpException
      * @return void
      */
-    public function loadRoutes()
+    public function loadRoutes() : void
     {
         /* Initialize boot-managers */
         /* @var $manager IRouterBootManager */
@@ -215,11 +215,11 @@ class Router
      * Routes the request
      *
      * @param bool $rewrite
-     * @return string|mixed
+     * @return string|null
      * @throws HttpException
      * @throws \Exception
      */
-    public function routeRequest($rewrite = false)
+    public function routeRequest($rewrite = false) : ?string
     {
         $routeNotAllowed = false;
 
@@ -237,7 +237,7 @@ class Router
                 $this->request->setHasRewrite(false);
             }
 
-            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUrl()->getPath();
+            $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
 
             /* @var $route ILoadableRoute */
             foreach ($this->processedRoutes as $key => $route) {
@@ -246,7 +246,7 @@ class Router
                 if ($route->matchRoute($url, $this->request) === true) {
 
                     /* Check if request method matches */
-                    if (count($route->getRequestMethods()) !== 0 && in_array($this->request->getMethod(), $route->getRequestMethods(), false) === false) {
+                    if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
                         $routeNotAllowed = true;
                         continue;
                     }
@@ -262,7 +262,7 @@ class Router
                     /* Render route */
                     $routeNotAllowed = false;
 
-                    $this->request->setLoadedRoute($route);
+                    $this->request->addLoadedRoute($route);
 
                     $output = $route->renderRoute($this->request);
 
@@ -287,7 +287,7 @@ class Router
             $this->handleException(new HttpException($message, 403));
         }
 
-        if ($this->request->getLoadedRoute() === null) {
+        if (\count($this->request->getLoadedRoutes()) === 0) {
 
             $rewriteUrl = $this->request->getRewriteUrl();
 
@@ -303,7 +303,7 @@ class Router
         return null;
     }
 
-    protected function hasRewrite($url)
+    protected function hasRewrite($url) : bool
     {
 
         /* If the request has changed */
@@ -332,14 +332,14 @@ class Router
      * @param \Exception $e
      * @throws HttpException
      * @throws \Exception
-     * @return string
+     * @return string|null
      */
-    protected function handleException(\Exception $e)
+    protected function handleException(\Exception $e) : ?string
     {
         /* @var $handler IExceptionHandler */
         foreach ($this->exceptionHandlers as $key => $handler) {
 
-            if (is_object($handler) === false) {
+            if (\is_object($handler) === false) {
                 $handler = new $handler();
             }
 
@@ -366,9 +366,9 @@ class Router
         throw $e;
     }
 
-    public function arrayToParams(array $getParams = [], $includeEmpty = true)
+    public function arrayToParams(array $getParams = [], $includeEmpty = true) : string
     {
-        if (count($getParams) !== 0) {
+        if (\count($getParams) !== 0) {
 
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
@@ -388,13 +388,13 @@ class Router
      * @param string $name
      * @return ILoadableRoute|null
      */
-    public function findRoute($name)
+    public function findRoute($name) : ?ILoadableRoute
     {
         /* @var $route ILoadableRoute */
         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)) {
+            if ($route->hasName($name) === true) {
                 return $route;
             }
 
@@ -404,8 +404,8 @@ class Router
             }
 
             /* Using @ is most definitely a controller@method or alias@method */
-            if (is_string($name) === true && strpos($name, '@') !== false) {
-                list($controller, $method) = array_map('strtolower', explode('@', $name));
+            if (\is_string($name) === true && strpos($name, '@') !== false) {
+                [$controller, $method] = array_map('strtolower', explode('@', $name));
 
                 if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
                     return $route;
@@ -413,7 +413,7 @@ class Router
             }
 
             /* Check if callback matches (if it's not a function) */
-            if (is_string($name) === true && is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && is_callable($route->getCallback()) === false) {
+            if (\is_string($name) === true && \is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && \is_callable($route->getCallback()) === false) {
 
                 /* Check if the entire callback is matching */
                 if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
@@ -448,9 +448,9 @@ class Router
      * @throws InvalidArgumentException
      * @return string
      */
-    public function getUrl($name = null, $parameters = null, $getParams = null)
+    public function getUrl($name = null, $parameters = null, $getParams = null) : string
     {
-        if ($getParams !== null && is_array($getParams) === false) {
+        if ($getParams !== null && \is_array($getParams) === false) {
             throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
         }
 
@@ -485,8 +485,8 @@ class Router
         }
 
         /* Using @ is most definitely a controller@method or alias@method */
-        if (is_string($name) === true && strpos($name, '@') !== false) {
-            list($controller, $method) = explode('@', $name);
+        if (\is_string($name) === true && strpos($name, '@') !== false) {
+            [$controller, $method] = explode('@', $name);
 
             /* Loop through all the routes to see if we can find a match */
 
@@ -516,7 +516,7 @@ class Router
      * Get bootmanagers
      * @return array
      */
-    public function getBootManagers()
+    public function getBootManagers() : array
     {
         return $this->bootManagers;
     }
@@ -525,7 +525,7 @@ class Router
      * Set bootmanagers
      * @param array $bootManagers
      */
-    public function setBootManagers(array $bootManagers)
+    public function setBootManagers(array $bootManagers) : void
     {
         $this->bootManagers = $bootManagers;
     }
@@ -534,7 +534,7 @@ class Router
      * Add bootmanager
      * @param IRouterBootManager $bootManager
      */
-    public function addBootManager(IRouterBootManager $bootManager)
+    public function addBootManager(IRouterBootManager $bootManager) : void
     {
         $this->bootManagers[] = $bootManager;
     }
@@ -544,7 +544,7 @@ class Router
      *
      * @return array
      */
-    public function getProcessedRoutes()
+    public function getProcessedRoutes() : array
     {
         return $this->processedRoutes;
     }
@@ -552,7 +552,7 @@ class Router
     /**
      * @return array
      */
-    public function getRoutes()
+    public function getRoutes() : array
     {
         return $this->routes;
     }
@@ -561,9 +561,9 @@ class Router
      * Set routes
      *
      * @param array $routes
-     * @return static $this
+     * @return static
      */
-    public function setRoutes(array $routes)
+    public function setRoutes(array $routes) : self
     {
         $this->routes = $routes;
 
@@ -575,7 +575,7 @@ class Router
      *
      * @return Request
      */
-    public function getRequest()
+    public function getRequest() : Request
     {
         return $this->request;
     }
@@ -584,7 +584,7 @@ class Router
      * Get csrf verifier class
      * @return BaseCsrfVerifier
      */
-    public function getCsrfVerifier()
+    public function getCsrfVerifier() : BaseCsrfVerifier
     {
         return $this->csrfVerifier;
     }
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 81b6014..8f64e70 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -13,12 +13,15 @@ namespace Pecee\SimpleRouter;
 use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Route\IGroupRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
-use Pecee\SimpleRouter\Route\RoutePartialGroup;
 use Pecee\SimpleRouter\Route\RouteController;
 use Pecee\SimpleRouter\Route\RouteGroup;
+use Pecee\SimpleRouter\Route\RoutePartialGroup;
 use Pecee\SimpleRouter\Route\RouteResource;
 use Pecee\SimpleRouter\Route\RouteUrl;
 
@@ -26,7 +29,7 @@ class SimpleRouter
 {
     /**
      * Default namespace added to all routes
-     * @var string
+     * @var string|null
      */
     protected static $defaultNamespace;
 
@@ -47,17 +50,36 @@ class SimpleRouter
      * @throws HttpException
      * @throws \Exception
      */
-    public static function start()
+    public static function start(): void
     {
         echo static::router()->routeRequest();
     }
 
+    /**
+     * Get debug info array
+     *
+     * @return array
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
+    public static function debugInfo(): array
+    {
+        return [
+            'url'           => static::request()->getUrl(),
+            'method'        => static::request()->getMethod(),
+            'host'          => static::request()->getHost(),
+            'loaded_routes' => static::request()->getLoadedRoutes(),
+            'all_routes'    => static::router()->getRoutes(),
+            'boot_managers' => static::router()->getBootManagers(),
+            'csrf_verifier' => static::router()->getCsrfVerifier(),
+        ];
+    }
+
     /**
      * Set default namespace which will be prepended to all routes.
      *
      * @param string $defaultNamespace
      */
-    public static function setDefaultNamespace($defaultNamespace)
+    public static function setDefaultNamespace(string $defaultNamespace): void
     {
         static::$defaultNamespace = $defaultNamespace;
     }
@@ -68,7 +90,7 @@ class SimpleRouter
      * @param BaseCsrfVerifier $baseCsrfVerifier
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
     {
         static::router()->setCsrfVerifier($baseCsrfVerifier);
     }
@@ -80,7 +102,7 @@ class SimpleRouter
      * @param IRouterBootManager $bootManager
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function addBootManager(IRouterBootManager $bootManager)
+    public static function addBootManager(IRouterBootManager $bootManager): void
     {
         static::router()->addBootManager($bootManager);
     }
@@ -95,7 +117,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function get($url, $callback, array $settings = null)
+    public static function get(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get'], $url, $callback, $settings);
     }
@@ -109,7 +131,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function post($url, $callback, array $settings = null)
+    public static function post(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['post'], $url, $callback, $settings);
     }
@@ -123,7 +145,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function put($url, $callback, array $settings = null)
+    public static function put(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['put'], $url, $callback, $settings);
     }
@@ -137,7 +159,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function patch($url, $callback, array $settings = null)
+    public static function patch(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['patch'], $url, $callback, $settings);
     }
@@ -151,7 +173,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function options($url, $callback, array $settings = null)
+    public static function options(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['options'], $url, $callback, $settings);
     }
@@ -165,7 +187,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function delete($url, $callback, array $settings = null)
+    public static function delete(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['delete'], $url, $callback, $settings);
     }
@@ -179,9 +201,9 @@ class SimpleRouter
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws InvalidArgumentException
      */
-    public static function group(array $settings = [], \Closure $callback)
+    public static function group(array $settings = [], \Closure $callback): IGroupRoute
     {
-        if (is_callable($callback) === false) {
+        if (\is_callable($callback) === false) {
             throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
@@ -205,9 +227,9 @@ class SimpleRouter
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws InvalidArgumentException
      */
-    public static function partialGroup($url, \Closure $callback, array $settings = [])
+    public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
     {
-        if (is_callable($callback) === false) {
+        if (\is_callable($callback) === false) {
             throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
@@ -232,7 +254,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function basic($url, $callback, array $settings = null)
+    public static function basic(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get', 'post'], $url, $callback, $settings);
     }
@@ -248,7 +270,7 @@ class SimpleRouter
      * @return RouteUrl
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function form($url, $callback, array $settings = null)
+    public static function form(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get', 'post'], $url, $callback, $settings);
     }
@@ -263,7 +285,7 @@ class SimpleRouter
      * @return RouteUrl|IRoute
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function match(array $requestMethods, $url, $callback, array $settings = null)
+    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
     {
         $route = new RouteUrl($url, $callback);
         $route->setRequestMethods($requestMethods);
@@ -287,7 +309,7 @@ class SimpleRouter
      * @return RouteUrl|IRoute
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function all($url, $callback, array $settings = null)
+    public static function all(string $url, $callback, array $settings = null)
     {
         $route = new RouteUrl($url, $callback);
         $route = static::addDefaultNamespace($route);
@@ -310,7 +332,7 @@ class SimpleRouter
      * @return RouteController|IRoute
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function controller($url, $controller, array $settings = null)
+    public static function controller(string $url, $controller, array $settings = null)
     {
         $route = new RouteController($url, $controller);
         $route = static::addDefaultNamespace($route);
@@ -333,7 +355,7 @@ class SimpleRouter
      * @return RouteResource|IRoute
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function resource($url, $controller, array $settings = null)
+    public static function resource(string $url, $controller, array $settings = null)
     {
         $route = new RouteResource($url, $controller);
         $route = static::addDefaultNamespace($route);
@@ -354,7 +376,7 @@ class SimpleRouter
      * @return CallbackExceptionHandler $callbackHandler
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function error(\Closure $callback)
+    public static function error(\Closure $callback): CallbackExceptionHandler
     {
         $routes = static::router()->getRoutes();
 
@@ -389,7 +411,7 @@ class SimpleRouter
      * @return string
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function getUrl($name = null, $parameters = null, $getParams = null)
+    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): string
     {
         return static::router()->getUrl($name, $parameters, $getParams);
     }
@@ -400,7 +422,7 @@ class SimpleRouter
      * @return \Pecee\Http\Request
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function request()
+    public static function request(): Request
     {
         return static::router()->getRequest();
     }
@@ -411,7 +433,7 @@ class SimpleRouter
      * @return Response
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function response()
+    public static function response(): Response
     {
         if (static::$response === null) {
             static::$response = new Response(static::request());
@@ -426,7 +448,7 @@ class SimpleRouter
      * @return Router
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function router()
+    public static function router(): Router
     {
         if (static::$router === null) {
             static::$router = new Router();
@@ -441,14 +463,14 @@ class SimpleRouter
      * @param IRoute $route
      * @return IRoute
      */
-    public static function addDefaultNamespace(IRoute $route)
+    public static function addDefaultNamespace(IRoute $route): IRoute
     {
         if (static::$defaultNamespace !== null) {
 
             $callback = $route->getCallback();
 
             /* Only add default namespace on relative callbacks */
-            if ($callback === null || (is_string($callback) === true && $callback[0] !== '\\')) {
+            if ($callback === null || (\is_string($callback) === true && $callback[0] !== '\\')) {
 
                 $namespace = static::$defaultNamespace;
 
@@ -468,9 +490,9 @@ class SimpleRouter
 
     /**
      * Get default namespace
-     * @return string
+     * @return string|null
      */
-    public static function getDefaultNamespace()
+    public static function getDefaultNamespace(): ?string
     {
         return static::$defaultNamespace;
     }
diff --git a/test/Dummy/ResourceController.php b/test/Dummy/ResourceController.php
deleted file mode 100644
index 8536563..0000000
--- a/test/Dummy/ResourceController.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-class ResourceController implements \Pecee\Controllers\IResourceController
-{
-
-    public function index()
-    {
-        echo 'index';
-    }
-
-    public function show($id)
-    {
-        echo 'show ' . $id;
-    }
-
-    public function store()
-    {
-        echo 'store';
-    }
-
-    public function create()
-    {
-        echo 'create';
-    }
-
-    public function edit($id)
-    {
-        echo 'edit ' . $id;
-    }
-
-    public function update($id)
-    {
-        echo 'update ' . $id;
-    }
-
-    public function destroy($id)
-    {
-        echo 'destroy ' . $id;
-    }
-}
\ No newline at end of file
diff --git a/test/Dummy/DummyController.php b/tests/Pecee/SimpleRouter/Dummy/DummyController.php
similarity index 100%
rename from test/Dummy/DummyController.php
rename to tests/Pecee/SimpleRouter/Dummy/DummyController.php
diff --git a/test/Dummy/DummyMiddleware.php b/tests/Pecee/SimpleRouter/Dummy/DummyMiddleware.php
similarity index 61%
rename from test/Dummy/DummyMiddleware.php
rename to tests/Pecee/SimpleRouter/Dummy/DummyMiddleware.php
index 2b5bd32..20f6fb8 100644
--- a/test/Dummy/DummyMiddleware.php
+++ b/tests/Pecee/SimpleRouter/Dummy/DummyMiddleware.php
@@ -1,11 +1,11 @@
 <?php
-require_once 'Exceptions/MiddlewareLoadedException.php';
+require_once 'Exception/MiddlewareLoadedException.php';
 
 use Pecee\Http\Request;
 
 class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
 {
-	public function handle(Request $request)
+	public function handle(Request $request) : void
 	{
 		throw new MiddlewareLoadedException('Middleware loaded!');
 	}
diff --git a/test/Dummy/Exceptions/ExceptionHandlerException.php b/tests/Pecee/SimpleRouter/Dummy/Exception/ExceptionHandlerException.php
similarity index 98%
rename from test/Dummy/Exceptions/ExceptionHandlerException.php
rename to tests/Pecee/SimpleRouter/Dummy/Exception/ExceptionHandlerException.php
index 066241f..619e17f 100644
--- a/test/Dummy/Exceptions/ExceptionHandlerException.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Exception/ExceptionHandlerException.php
@@ -1,4 +1,5 @@
 <?php
+
 class ExceptionHandlerException extends \Exception
 {
 }
\ No newline at end of file
diff --git a/test/Dummy/Exceptions/MiddlewareLoadedException.php b/tests/Pecee/SimpleRouter/Dummy/Exception/MiddlewareLoadedException.php
similarity index 100%
rename from test/Dummy/Exceptions/MiddlewareLoadedException.php
rename to tests/Pecee/SimpleRouter/Dummy/Exception/MiddlewareLoadedException.php
diff --git a/test/Dummy/Exceptions/ResponseException.php b/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php
similarity index 100%
rename from test/Dummy/Exceptions/ResponseException.php
rename to tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php
diff --git a/test/Dummy/Handler/ExceptionHandler.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
similarity index 89%
rename from test/Dummy/Handler/ExceptionHandler.php
rename to tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
index 7cb7e64..2db833f 100644
--- a/test/Dummy/Handler/ExceptionHandler.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
@@ -2,7 +2,7 @@
 
 class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)  : void
 	{
 	    echo $error->getMessage();
 	}
diff --git a/test/Dummy/Handler/ExceptionHandlerFirst.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
similarity index 87%
rename from test/Dummy/Handler/ExceptionHandlerFirst.php
rename to tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
index 8a5f807..561ebde 100644
--- a/test/Dummy/Handler/ExceptionHandlerFirst.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
@@ -2,13 +2,12 @@
 
 class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
 	    global $stack;
 	    $stack[] = static::class;
 
 		$request->setUrl('/');
-		return $request;
 	}
 
 }
\ No newline at end of file
diff --git a/test/Dummy/Handler/ExceptionHandlerSecond.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
similarity index 86%
rename from test/Dummy/Handler/ExceptionHandlerSecond.php
rename to tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
index d629a03..2360047 100644
--- a/test/Dummy/Handler/ExceptionHandlerSecond.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
@@ -2,13 +2,12 @@
 
 class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
         global $stack;
         $stack[] = static::class;
 
         $request->setUrl('/');
-        return $request;
 	}
 
 }
\ No newline at end of file
diff --git a/test/Dummy/Handler/ExceptionHandlerThird.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
similarity index 92%
rename from test/Dummy/Handler/ExceptionHandlerThird.php
rename to tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
index 15923ec..d295157 100644
--- a/test/Dummy/Handler/ExceptionHandlerThird.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
@@ -2,7 +2,7 @@
 
 class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
         global $stack;
         $stack[] = static::class;
diff --git a/test/Dummy/Middlewares/RewriteMiddleware.php b/tests/Pecee/SimpleRouter/Dummy/Middleware/RewriteMiddleware.php
similarity index 79%
rename from test/Dummy/Middlewares/RewriteMiddleware.php
rename to tests/Pecee/SimpleRouter/Dummy/Middleware/RewriteMiddleware.php
index 7bd1fef..f107bbd 100644
--- a/test/Dummy/Middlewares/RewriteMiddleware.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Middleware/RewriteMiddleware.php
@@ -5,7 +5,7 @@ use Pecee\Http\Request;
 
 class RewriteMiddleware implements IMiddleware {
 
-    public function handle(Request $request) {
+    public function handle(Request $request)  : void {
 
         $request->setRewriteCallback(function() {
             return 'ok';
diff --git a/tests/Pecee/SimpleRouter/Dummy/ResourceController.php b/tests/Pecee/SimpleRouter/Dummy/ResourceController.php
new file mode 100644
index 0000000..0a70e6f
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/Dummy/ResourceController.php
@@ -0,0 +1,46 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index() : ?string
+    {
+        echo 'index';
+        return null;
+    }
+
+    public function show($id) : ?string
+    {
+        echo 'show ' . $id;
+        return null;
+    }
+
+    public function store() : ?string
+    {
+        echo 'store';
+        return null;
+    }
+
+    public function create() : ?string
+    {
+        echo 'create';
+        return null;
+    }
+
+    public function edit($id) : ?string
+    {
+        echo 'edit ' . $id;
+        return null;
+    }
+
+    public function update($id) : ?string
+    {
+        echo 'update ' . $id;
+        return null;
+    }
+
+    public function destroy($id) : ?string
+    {
+        echo 'destroy ' . $id;
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/test/GroupTest.php b/tests/Pecee/SimpleRouter/GroupTest.php
similarity index 94%
rename from test/GroupTest.php
rename to tests/Pecee/SimpleRouter/GroupTest.php
index 29f89e0..c059253 100644
--- a/test/GroupTest.php
+++ b/tests/Pecee/SimpleRouter/GroupTest.php
@@ -2,9 +2,8 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Helpers/TestRouter.php';
 
-class GroupTest extends PHPUnit_Framework_TestCase
+class GroupTest extends \PHPUnit\Framework\TestCase
 {
     protected $result;
 
@@ -37,6 +36,7 @@ class GroupTest extends PHPUnit_Framework_TestCase
 
         TestRouter::debug('/api/v1/test', 'get');
 
+        $this->assertTrue(true);
     }
 
     public function testMultipleRoutes()
@@ -61,6 +61,8 @@ class GroupTest extends PHPUnit_Framework_TestCase
         });
 
         TestRouter::debug('/my/match', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testUrls()
diff --git a/test/MiddlewareTest.php b/tests/Pecee/SimpleRouter/MiddlewareTest.php
similarity index 83%
rename from test/MiddlewareTest.php
rename to tests/Pecee/SimpleRouter/MiddlewareTest.php
index d3c4dba..0183c59 100644
--- a/test/MiddlewareTest.php
+++ b/tests/Pecee/SimpleRouter/MiddlewareTest.php
@@ -3,13 +3,12 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-require_once 'Helpers/TestRouter.php';
 
-class MiddlewareTest extends PHPUnit_Framework_TestCase
+class MiddlewareTest extends \PHPUnit\Framework\TestCase
 {
     public function testMiddlewareFound()
     {
-        $this->setExpectedException(MiddlewareLoadedException::class);
+        $this->expectException(MiddlewareLoadedException::class);
 
         TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
             TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
@@ -29,6 +28,8 @@ class MiddlewareTest extends PHPUnit_Framework_TestCase
         TestRouter::get('/my/test/url', 'DummyController@method1');
 
         TestRouter::debug('/my/test/url', 'get');
+
+        $this->assertTrue(true);
     }
 
 }
\ No newline at end of file
diff --git a/test/RouterCallbackExceptionHandlerTest.php b/tests/Pecee/SimpleRouter/RouterCallbackExceptionHandlerTest.php
similarity index 69%
rename from test/RouterCallbackExceptionHandlerTest.php
rename to tests/Pecee/SimpleRouter/RouterCallbackExceptionHandlerTest.php
index de21d2a..bf6514f 100644
--- a/test/RouterCallbackExceptionHandlerTest.php
+++ b/tests/Pecee/SimpleRouter/RouterCallbackExceptionHandlerTest.php
@@ -2,15 +2,14 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
 
-class RouterCallbackExceptionHandlerTest extends PHPUnit_Framework_TestCase
+class RouterCallbackExceptionHandlerTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testCallbackExceptionHandler()
     {
-        $this->setExpectedException(ExceptionHandlerException::class);
+        $this->expectException(ExceptionHandlerException::class);
 
         // Match normal route on alias
         TestRouter::get('/my-new-url', 'DummyController@method2');
@@ -22,6 +21,8 @@ class RouterCallbackExceptionHandlerTest extends PHPUnit_Framework_TestCase
 
         TestRouter::debugNoReset('/404-url', 'get');
         TestRouter::router()->reset();
+
+        $this->assertTrue(true);
     }
 
 }
\ No newline at end of file
diff --git a/test/RouterControllerTest.php b/tests/Pecee/SimpleRouter/RouterControllerTest.php
similarity index 89%
rename from test/RouterControllerTest.php
rename to tests/Pecee/SimpleRouter/RouterControllerTest.php
index 3c39bc2..fff6566 100644
--- a/test/RouterControllerTest.php
+++ b/tests/Pecee/SimpleRouter/RouterControllerTest.php
@@ -1,9 +1,8 @@
 <?php
 
 require_once 'Dummy/DummyController.php';
-require_once 'Helpers/TestRouter.php';
 
-class RouterControllerTest extends PHPUnit_Framework_TestCase
+class RouterControllerTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testGet()
diff --git a/test/RouterPartialGroupTest.php b/tests/Pecee/SimpleRouter/RouterPartialGroupTest.php
similarity index 86%
rename from test/RouterPartialGroupTest.php
rename to tests/Pecee/SimpleRouter/RouterPartialGroupTest.php
index 9c805e5..21c9fe2 100644
--- a/test/RouterPartialGroupTest.php
+++ b/tests/Pecee/SimpleRouter/RouterPartialGroupTest.php
@@ -3,9 +3,8 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-require_once 'Helpers/TestRouter.php';
 
-class RouterPartialGroupTest extends PHPUnit_Framework_TestCase
+class RouterPartialGroupTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testParameters()
diff --git a/test/RouterResourceTest.php b/tests/Pecee/SimpleRouter/RouterResourceTest.php
similarity index 94%
rename from test/RouterResourceTest.php
rename to tests/Pecee/SimpleRouter/RouterResourceTest.php
index 976f071..0b6f5fb 100644
--- a/test/RouterResourceTest.php
+++ b/tests/Pecee/SimpleRouter/RouterResourceTest.php
@@ -1,9 +1,8 @@
 <?php
 
 require_once 'Dummy/ResourceController.php';
-require_once 'Helpers/TestRouter.php';
 
-class RouterResourceTest extends PHPUnit_Framework_TestCase
+class RouterResourceTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testResourceStore()
diff --git a/test/RouterRewriteTest.php b/tests/Pecee/SimpleRouter/RouterRewriteTest.php
similarity index 93%
rename from test/RouterRewriteTest.php
rename to tests/Pecee/SimpleRouter/RouterRewriteTest.php
index 0bb462d..c0692c1 100644
--- a/test/RouterRewriteTest.php
+++ b/tests/Pecee/SimpleRouter/RouterRewriteTest.php
@@ -1,13 +1,12 @@
 <?php
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ResponseException.php';
+require_once 'Dummy/Exception/ResponseException.php';
 require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
 require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
 require_once 'Dummy/Handler/ExceptionHandlerThird.php';
-require_once 'Helpers/TestRouter.php';
-require_once 'Dummy/Middlewares/RewriteMiddleware.php';
+require_once 'Dummy/Middleware/RewriteMiddleware.php';
 
-class RouteRewriteTest extends PHPUnit_Framework_TestCase
+class RouteRewriteTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -61,7 +60,7 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
 
     public function testRewriteExceptionMessage()
     {
-        $this->setExpectedException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
+        $this->expectException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
 
         TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
 
diff --git a/test/RouterRouteTest.php b/tests/Pecee/SimpleRouter/RouterRouteTest.php
similarity index 91%
rename from test/RouterRouteTest.php
rename to tests/Pecee/SimpleRouter/RouterRouteTest.php
index c503b28..63d69f9 100644
--- a/test/RouterRouteTest.php
+++ b/tests/Pecee/SimpleRouter/RouterRouteTest.php
@@ -2,10 +2,9 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
 
-class RouterRouteTest extends PHPUnit_Framework_TestCase
+class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
     protected $result = false;
 
@@ -27,7 +26,7 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
 
     public function testNotFound()
     {
-        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        $this->expectException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
         TestRouter::get('/non-existing-path', 'DummyController@method1');
         TestRouter::debug('/test-param1-param2', 'post');
     }
@@ -36,24 +35,32 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
     {
         TestRouter::get('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testPost()
     {
         TestRouter::post('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'post');
+
+        $this->assertTrue(true);
     }
 
     public function testPut()
     {
         TestRouter::put('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'put');
+
+        $this->assertTrue(true);
     }
 
     public function testDelete()
     {
         TestRouter::delete('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'delete');
+
+        $this->assertTrue(true);
     }
 
     public function testMethodNotAllowed()
@@ -123,6 +130,8 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
     {
         TestRouter::get('/my/{path}', 'DummyController@method1')->where(['path' => '[a-zA-Z\-]+']);
         TestRouter::debug('/my/custom-path', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testParameterDefaultValue() {
diff --git a/test/RouterUrlTest.php b/tests/Pecee/SimpleRouter/RouterUrlTest.php
similarity index 98%
rename from test/RouterUrlTest.php
rename to tests/Pecee/SimpleRouter/RouterUrlTest.php
index f7d986d..5c6d0e7 100644
--- a/test/RouterUrlTest.php
+++ b/tests/Pecee/SimpleRouter/RouterUrlTest.php
@@ -3,9 +3,8 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-require_once 'Helpers/TestRouter.php';
 
-class RouterUrlTest extends PHPUnit_Framework_TestCase
+class RouterUrlTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testIssue253()
diff --git a/test/Helpers/TestRouter.php b/tests/TestRouter.php
similarity index 100%
rename from test/Helpers/TestRouter.php
rename to tests/TestRouter.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..22f8cd2
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,4 @@
+<?php
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+require_once 'TestRouter.php';
\ No newline at end of file

From 085f98cf08f5fa30e2a6277f8b155369db2c9158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Mon, 26 Mar 2018 23:43:27 +0200
Subject: [PATCH 02/25] Development

- Better php7 support.
- Added easier way to debug router.
- Improvements and bugfixes.
- Updated documentation.
---
 README.md                                     | 401 +++++++++++++++++-
 .../Exceptions/InvalidArgumentException.php   |   4 +-
 src/Pecee/Http/Input/IInputItem.php           |   6 +-
 src/Pecee/Http/Input/InputFile.php            |  14 +-
 src/Pecee/Http/Input/InputHandler.php         |  26 +-
 src/Pecee/Http/Input/InputItem.php            |  12 +-
 .../Exceptions/TokenMismatchException.php     |   1 +
 src/Pecee/Http/Request.php                    |  47 +-
 src/Pecee/Http/Response.php                   |  18 +-
 .../Http/Security/CookieTokenProvider.php     |  12 +-
 .../Security/Exceptions/SecurityException.php |   4 +-
 src/Pecee/Http/Security/ITokenProvider.php    |   4 +-
 src/Pecee/Http/Url.php                        |  39 +-
 .../SimpleRouter/Exceptions/HttpException.php |   1 +
 .../Exceptions/NotFoundHttpException.php      |   1 +
 .../SimpleRouter/Route/IControllerRoute.php   |   2 +-
 src/Pecee/SimpleRouter/Route/IGroupRoute.php  |   6 +-
 .../SimpleRouter/Route/ILoadableRoute.php     |  27 +-
 src/Pecee/SimpleRouter/Route/IRoute.php       |  33 +-
 .../SimpleRouter/Route/LoadableRoute.php      |  32 +-
 src/Pecee/SimpleRouter/Route/Route.php        |  47 +-
 .../SimpleRouter/Route/RouteController.php    |   8 +-
 src/Pecee/SimpleRouter/Route/RouteGroup.php   |   2 +-
 .../SimpleRouter/Route/RouteResource.php      |   8 +-
 src/Pecee/SimpleRouter/Router.php             | 247 ++++++++---
 src/Pecee/SimpleRouter/SimpleRouter.php       |  54 ++-
 tests/Pecee/SimpleRouter/RouterUrlTest.php    |  15 +-
 tests/debug.php                               |   9 +
 28 files changed, 847 insertions(+), 233 deletions(-)
 create mode 100644 tests/debug.php

diff --git a/README.md b/README.md
index 5a333b6..18b4e2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # 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.
+
+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 expand-ability in mind.
 
 **Please note that this documentation is currently work-in-progress. Feel free to contribute.**
 
@@ -11,7 +12,6 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 	- [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)
@@ -20,6 +20,14 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 		- [Setting up IIS](#setting-up-iis)
 		- [Configuration](#configuration)
 		- [Helper functions](#helper-functions)
+- [Help and support](#help-and-support)
+    - [How to debug](#how-to-debug)
+        - [Creating unit-tests](#creating-unit-tests) 
+        - [Debug information](#debug-information)
+        - [Benchmark and log-info](#benchmark-and-log-info)
+    - [Reporting a new issue](#reporting-a-new-issue)
+        - [Procedure for reporting a new issue](#procedure-for-reporting-a-new-issue)
+        - [Issue template](#issue-template)
 - [Routes](#routes)
 	- [Basic routing](#basic-routing)
 		- [Available methods](#available-methods)
@@ -118,18 +126,14 @@ You can find the demo-project here: [https://github.com/skipperbent/simple-route
 
 ### 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.
+If the library is missing a feature that you need in your project or if you have feedback, we'd love to hear from you. 
+Feel free to leave us feedback by [creating a new issue](https://github.com/skipperbent/simple-php-router/issues/new).
 
-###### Issues guidelines
+**Experiencing an issue?**
 
-- 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.
+Please refer to our [Help and support](#help-and-support) section in the documentation before reporting a new issue.
 
-- 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
+##### Contribution development guidelines
 
 - Please try to follow the PSR-2 codestyle guidelines.
 
@@ -206,7 +210,7 @@ Below is an example of an working `web.config` file used by simple-php-router.
 
 Simply create a new `web.config` file in your projects `public` directory and paste the contents below in your newly created file. This will redirect all requests to your `index.php` file (see Configuration section below). If the `web.config` file already exists, add the `<rewrite>` section inside the `<system.webServer>` branch.
 
-```
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <system.webServer>
@@ -378,6 +382,379 @@ function csrf_token()
 
 ---
 
+# Help and support
+
+This section will go into details on how to debug the router and answer some of the commonly asked questions- and issues.
+
+## How to debug
+
+This section will show you how to write unit-tests for the router, view useful debugging information and answer some of the frequently asked questions. 
+
+It will also covers how to report any issue you might encounter. 
+
+### Creating unit-tests
+
+The easiest and fastest way to debug any issues with the router, is to create a unit-test that represents the issue you are experiencing.
+
+Unit-tests use a special `TestRouter` class, which simulates a request-method and requested url of a browser.
+
+The `TestRouter` class can return the output directly or render a route silently.
+
+```php
+public function testUnicodeCharacters()
+{
+    // Add route containing two optional paramters with special spanish characters like "í".
+    TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+    
+    // Start the routing and simulate the url "/cursos/listado/especialidad/cirugía local".
+    TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'GET');
+    
+    // Verify that the url for the loaded route matches the expected route.
+    $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+    
+    // Start the routing and simulate the url "/test/Dermatología" using "GET" as request-method.
+    TestRouter::debugNoReset('/test/Dermatología', 'GET');
+
+    // Another route containing one parameter with special spanish characters like "í".
+    TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
+
+    // Get all parameters parsed by the loaded route.
+    $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
+
+    // Check that the parameter named "param" matches the exspected value.
+    $this->assertEquals('Dermatología', $parameters['param']);
+
+    // Add route testing danish special characters like "ø".
+    TestRouter::get('/category/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+    
+    // Start the routing and simulate the url "/kategory/økse" using "GET" as request-method.
+    TestRouter::debugNoReset('/category/økse', 'GET');
+    
+    // Validate that the URL of the loaded-route matches the expected url.
+    $this->assertEquals('/category/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+    // Reset the router, so other tests wont inherit settings or the routes we've added.
+    TestRouter::router()->reset();
+}
+```
+
+#### Using the TestRouter helper
+
+Depending on your test, you can use the methods below when rendering routes in your unit-tests.
+
+
+| Method        | Description  |
+| ------------- |-------------|
+| ```TestRouter::debug($url, $method)``` | Will render the route without returning anything. Exceptions will be thrown and the router will be reset automatically. |
+| ```TestRouter::debugOutput($url, $method)``` | Will render the route and return any value that the route might output. Manual reset required by calling `TestRouter::router()->reset()`. |
+| ```TestRouter::debugNoReset($url, $method);```  | Will render the route without resetting the router. Useful if you need to get loaded route, parameters etc. from the router. Manual reset required by calling `TestRouter::router()->reset()`. |
+
+### Debug information
+
+The library can output debug-information, which contains information like loaded routes, the parsed request-url etc. It also contains info which are important when reporting a new issue like PHP-version, library version, server-variables, router debug log etc.
+
+You can activate the debug-information by calling the alternative start-method. 
+
+The example below will start the routing an return array with debugging-information
+
+**Example:**
+
+```php
+$debugInfo = SimpleRouter::startDebug();
+echo sprintf('<pre>%s</pre>', var_export($debugInfo));
+exit;
+```
+
+**The example above will provide you with an output containing:**
+
+| Key               | Description  |
+| -------------     |------------- |
+| `url`             | The parsed request-uri. This url should match the url in the browser.|
+| `method`          | The browsers request method (example: `GET`, `POST`, `PUT`, `PATCH`, `DELETE` etc).|
+| `host`            | The website host (example: `domain.com`).|
+| `loaded_routes`   | List of all the routes that matched the `url` and that has been rendered/loaded. |
+| `all_routes`      | All available routes |
+| `boot_managers`   | All available BootManagers |
+| `csrf_verifier`   | CsrfVerifier class |
+| `log`             | List of debug messages/log from the router. |
+| `router_output`   | The rendered callback output from the router. |
+| `library_version` | The version of simple-php-router you are using. |
+| `php_version`     | The version of PHP you are using. |
+| `server_params`   | List of all `$_SERVER` variables/headers. | 
+
+#### Benchmark and logging
+
+You can activate benchmark debugging/logging by calling `setDebugEnabled` method on the `Router` instance.
+
+You have to enable debugging BEFORE starting the routing.
+
+**Example:**
+
+```php
+SimpleRouter::router()->setDebugEnabled(true);
+SimpleRouter::start();
+```
+
+When the routing is complete, you can get the debug-log by calling the `getDebugLog()` on the `Router` instance. This will return an `array` of log-messages each containing execution time, trace info and debug-message.
+
+**Example:**
+
+```php
+$messages = SimpleRouter::router()->getDebugLog();
+```
+
+## Reporting a new issue
+
+**Before reporting your issue, make sure that the issue you are experiencing aren't already answered in the [Common errors](#common-errors) section or by searching the [closed issues](https://github.com/skipperbent/simple-php-router/issues?q=is%3Aissue+is%3Aclosed) page on GitHub.**
+
+To avoid confusion and to help you resolve your issue as quickly as possible, you should provide a detailed explanation of the problem you are experiencing.
+
+### Procedure for reporting a new issue
+
+1. Go to [this page](https://github.com/skipperbent/simple-php-router/issues/new) to create a new issue.
+2. Add a title that describes your problems in as few words as possible.
+3. Copy and paste the template below in the description of your issue and replace each step with your own information. If the step is not relevant for your issue you can delete it.
+
+### Issue template
+
+Copy and paste the template below into the description of your new issue and replace it with your own information.
+
+You can check the [Debug information](#debug-information) section to see how to generate the debug-info.
+
+<pre>
+### Description
+
+The library fails to render the route `/user/æsel` which contains one parameter using a custom regular expression for matching special foreign characters. Routes without special characters like `/user/tom` renders correctly.
+
+### Steps to reproduce the error
+
+1. Add the following route:
+
+```php
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+```
+
+2. Navigate to `/user/æsel` in browser.
+
+3. `NotFoundHttpException` is thrown by library.
+
+### Route and/or callback for failing route
+
+*Route:*
+
+```php
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+```
+
+*Callback:*
+
+```php
+public function show($username) {
+    return sprintf('Username is: %s', $username);
+}
+```
+
+### Debug info
+
+```php
+array (
+  'url' => 
+  Pecee\Http\Url::__set_state(array(
+     'originalUrl' => NULL,
+     'data' => 
+    array (
+      'scheme' => NULL,
+      'host' => NULL,
+      'port' => NULL,
+      'user' => NULL,
+      'pass' => NULL,
+      'path' => NULL,
+      'query' => NULL,
+      'fragment' => NULL,
+    ),
+  )),
+  'method' => '',
+  'host' => NULL,
+  'loaded_routes' => 
+  array (
+  ),
+  'all_routes' => 
+  array (
+    0 => 
+    Pecee\SimpleRouter\Route\RouteUrl::__set_state(array(
+       'url' => '/user/{name}/',
+       'name' => NULL,
+       'regex' => NULL,
+       'filterEmptyParams' => true,
+       'defaultParameterRegex' => NULL,
+       'paramModifiers' => '{}',
+       'paramOptionalSymbol' => '?',
+       'urlRegex' => '/^%s\\/?$/u',
+       'group' => NULL,
+       'parent' => NULL,
+       'callback' => 'UserController@show',
+       'defaultNamespace' => NULL,
+       'namespace' => NULL,
+       'requestMethods' => 
+      array (
+        0 => 'get',
+      ),
+       'where' => 
+      array (
+        'name' => '[\\w]+',
+      ),
+       'parameters' => 
+      array (
+        'name' => NULL,
+      ),
+       'originalParameters' => 
+      array (
+      ),
+       'middlewares' => 
+      array (
+      ),
+    )),
+  ),
+  'boot_managers' => 
+  array (
+  ),
+  'csrf_verifier' => NULL,
+  'log' => 
+  array (
+    0 => 
+    array (
+      'message' => 'Started routing request (rewrite: no)',
+      'time' => '0.0000069141',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    1 => 
+    array (
+      'message' => 'Loading routes',
+      'time' => '0.0036418438',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 273,
+        'function' => 'loadRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    2 => 
+    array (
+      'message' => 'Processing routes',
+      'time' => '0.0069010258',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 251,
+        'function' => 'processRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    3 => 
+    array (
+      'message' => 'Processing route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
+      'time' => '0.0099139214',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 251,
+        'function' => 'processRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    4 => 
+    array (
+      'message' => 'Finished loading routes',
+      'time' => '0.0130679607',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 273,
+        'function' => 'loadRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    5 => 
+    array (
+      'message' => 'Matching route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
+      'time' => '0.0160858631',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    6 => 
+    array (
+      'message' => 'Route not found: "/"',
+      'time' => '0.0193598270',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    7 => 
+    array (
+      'message' => 'Starting exception handling for "Pecee\\SimpleRouter\\Exceptions\\NotFoundHttpException"',
+      'time' => '0.0229449272',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 345,
+        'function' => 'handleException',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    8 => 
+    array (
+      'message' => 'Finished exception handling - exception not handled, throwing',
+      'time' => '0.0258929729',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 345,
+        'function' => 'handleException',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+  ),
+  'router_output' => NULL,
+  'library_version' => false,
+  'php_version' => '7.2.0',
+  'server_params' => 
+  array (),
+)
+```
+
+</pre>
+
+Remember that a more detailed issue- description and debug-info might suck to write, but it will help others understand- and resolve your issue without asking for the information.
+
+**Note:** 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. Providing the necessary steps to reproduce the error within your description, adding useful debugging info etc. will help others quickly resolve the issue you are reporting.
+
+---
+
 # Routes
 
 Remember the ```routes.php``` file you required in your ```index.php```? This file be where you place all your custom rules for routing.
diff --git a/src/Pecee/Exceptions/InvalidArgumentException.php b/src/Pecee/Exceptions/InvalidArgumentException.php
index 1edcca6..95f070a 100644
--- a/src/Pecee/Exceptions/InvalidArgumentException.php
+++ b/src/Pecee/Exceptions/InvalidArgumentException.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\Exceptions;
 
-class InvalidArgumentException extends \InvalidArgumentException {
+class InvalidArgumentException extends \InvalidArgumentException
+{
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Input/IInputItem.php b/src/Pecee/Http/Input/IInputItem.php
index 1913001..ae32b50 100644
--- a/src/Pecee/Http/Input/IInputItem.php
+++ b/src/Pecee/Http/Input/IInputItem.php
@@ -7,15 +7,15 @@ interface IInputItem
 
     public function getIndex(): string;
 
-    public function setIndex($index): self;
+    public function setIndex(string $index): self;
 
     public function getName(): string;
 
-    public function setName($name): self;
+    public function setName(string $name): self;
 
     public function getValue(): string;
 
-    public function setValue($value): self;
+    public function setValue(string $value): self;
 
     public function __toString();
 
diff --git a/src/Pecee/Http/Input/InputFile.php b/src/Pecee/Http/Input/InputFile.php
index 1710efa..1af9a28 100644
--- a/src/Pecee/Http/Input/InputFile.php
+++ b/src/Pecee/Http/Input/InputFile.php
@@ -14,7 +14,7 @@ class InputFile implements IInputItem
     public $errors;
     public $tmpName;
 
-    public function __construct($index)
+    public function __construct(string $index)
     {
         $this->index = $index;
 
@@ -48,7 +48,7 @@ class InputFile implements IInputItem
         ];
 
         return (new static($values['index']))
-            ->setSize($values['size'])
+            ->setSize((int)$values['size'])
             ->setError($values['error'])
             ->setType($values['type'])
             ->setTmpName($values['tmp_name'])
@@ -69,7 +69,7 @@ class InputFile implements IInputItem
      * @param string $index
      * @return static
      */
-    public function setIndex($index): IInputItem
+    public function setIndex(string $index): IInputItem
     {
         $this->index = $index;
 
@@ -89,7 +89,7 @@ class InputFile implements IInputItem
      * @param int $size
      * @return static
      */
-    public function setSize($size): IInputItem
+    public function setSize(int $size): IInputItem
     {
         $this->size = $size;
 
@@ -118,7 +118,7 @@ class InputFile implements IInputItem
      * @param string $type
      * @return static
      */
-    public function setType($type): IInputItem
+    public function setType(string $type): IInputItem
     {
         $this->type = $type;
 
@@ -152,7 +152,7 @@ class InputFile implements IInputItem
      * @param string $name
      * @return static
      */
-    public function setName($name): IInputItem
+    public function setName(string $name): IInputItem
     {
         $this->name = $name;
 
@@ -270,7 +270,7 @@ class InputFile implements IInputItem
      * @param string $value
      * @return static
      */
-    public function setValue($value): IInputItem
+    public function setValue(string $value): IInputItem
     {
         $this->filename = $value;
 
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 416a8e3..6fee12a 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -42,7 +42,7 @@ class InputHandler
      * Parse input values
      *
      */
-    public function parseInputs() : void
+    public function parseInputs(): void
     {
         /* Parse get requests */
         if (\count($_GET) !== 0) {
@@ -69,7 +69,7 @@ class InputHandler
     /**
      * @return array
      */
-    public function parseFiles() : array
+    public function parseFiles(): array
     {
         $list = [];
 
@@ -80,7 +80,7 @@ class InputHandler
                 $values['index'] = $key;
                 try {
                     $list[$key] = InputFile::createFromArray($values + $value);
-                } catch(InvalidArgumentException $e ){
+                } catch (InvalidArgumentException $e) {
 
                 }
                 continue;
@@ -101,7 +101,7 @@ class InputHandler
         return $list;
     }
 
-    protected function rearrangeFiles(array $values, &$index, $original) : array
+    protected function rearrangeFiles(array $values, &$index, $original): array
     {
 
         $originalIndex = $index[0];
@@ -132,7 +132,7 @@ class InputHandler
                     $output[$key] = $file;
                     continue;
 
-                } catch(InvalidArgumentException $e) {
+                } catch (InvalidArgumentException $e) {
 
                 }
             }
@@ -152,7 +152,7 @@ class InputHandler
         return $output;
     }
 
-    protected function handleGetPost(array $array) : array
+    protected function handleGetPost(array $array): array
     {
         $list = [];
 
@@ -179,7 +179,7 @@ class InputHandler
      * @param string|null $defaultValue
      * @return InputItem|string
      */
-    public function findPost($index, $defaultValue = null)
+    public function findPost(string $index, ?string $defaultValue = null)
     {
         return $this->post[$index] ?? $defaultValue;
     }
@@ -191,7 +191,7 @@ class InputHandler
      * @param string|null $defaultValue
      * @return InputFile|string
      */
-    public function findFile($index, $defaultValue = null)
+    public function findFile(string $index, ?string $defaultValue = null)
     {
         return $this->file[$index] ?? $defaultValue;
     }
@@ -203,7 +203,7 @@ class InputHandler
      * @param string|null $defaultValue
      * @return InputItem|string
      */
-    public function findGet($index, $defaultValue = null)
+    public function findGet(string $index, ?string $defaultValue = null)
     {
         return $this->get[$index] ?? $defaultValue;
     }
@@ -216,7 +216,7 @@ class InputHandler
      * @param array|string|null $methods
      * @return IInputItem|string
      */
-    public function getObject($index, $defaultValue = null, $methods = null)
+    public function getObject(string $index, ?string $defaultValue = null, $methods = null)
     {
         if ($methods !== null && \is_string($methods) === true) {
             $methods = [$methods];
@@ -247,7 +247,7 @@ class InputHandler
      * @param array|string|null $methods
      * @return InputItem|string
      */
-    public function get($index, $defaultValue = null, $methods = null)
+    public function get(string $index, ?string $defaultValue = null, $methods = null)
     {
         $input = $this->getObject($index, $defaultValue, $methods);
 
@@ -264,7 +264,7 @@ class InputHandler
      * @param string $index
      * @return bool
      */
-    public function exists($index) : bool
+    public function exists(string $index): bool
     {
         return ($this->getObject($index) !== null);
     }
@@ -274,7 +274,7 @@ class InputHandler
      * @param array|null $filter Only take items in filter
      * @return array
      */
-    public function all(array $filter = null) : array
+    public function all(array $filter = null): array
     {
         $output = $_GET + $_POST;
 
diff --git a/src/Pecee/Http/Input/InputItem.php b/src/Pecee/Http/Input/InputItem.php
index de00aa7..c3f8129 100644
--- a/src/Pecee/Http/Input/InputItem.php
+++ b/src/Pecee/Http/Input/InputItem.php
@@ -8,7 +8,7 @@ class InputItem implements IInputItem
     public $name;
     public $value;
 
-    public function __construct($index, $value = null)
+    public function __construct(string $index, ?string $value = null)
     {
         $this->index = $index;
         $this->value = $value;
@@ -25,7 +25,7 @@ class InputItem implements IInputItem
         return $this->index;
     }
 
-    public function setIndex($index): IInputItem
+    public function setIndex(string $index): IInputItem
     {
         $this->index = $index;
 
@@ -43,9 +43,9 @@ class InputItem implements IInputItem
     /**
      * Set input name
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setName($name): IInputItem
+    public function setName(string $name): IInputItem
     {
         $this->name = $name;
 
@@ -63,9 +63,9 @@ class InputItem implements IInputItem
     /**
      * Set input value
      * @param string $value
-     * @return static $this
+     * @return static
      */
-    public function setValue($value): IInputItem
+    public function setValue(string $value): IInputItem
     {
         $this->value = $value;
 
diff --git a/src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php b/src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php
index 8f21c9e..7e07c7a 100644
--- a/src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php
+++ b/src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Middleware\Exceptions;
 
 class TokenMismatchException extends \Exception
diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 696e5fa..6ae3a38 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -10,7 +10,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 class Request
 {
     private $data = [];
-    protected $headers;
+    protected $headers = [];
     protected $host;
     protected $url;
     protected $method;
@@ -35,7 +35,11 @@ class Request
      */
     public function __construct()
     {
-        $this->parseHeaders();
+        foreach ($_SERVER as $key => $value) {
+            $this->headers[strtolower($key)] = $value;
+            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
+        }
+
         $this->setHost($this->getHeader('http-host'));
 
         // Check if special IIS header exist, otherwise use default.
@@ -45,17 +49,6 @@ class Request
         $this->method = strtolower($this->inputHandler->get('_method', $this->getHeader('request-method')));
     }
 
-    protected function parseHeaders(): void
-    {
-        $this->headers = [];
-
-        foreach ($_SERVER as $key => $value) {
-            $this->headers[strtolower($key)] = $value;
-            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
-        }
-
-    }
-
     public function isSecure(): bool
     {
         return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
@@ -221,9 +214,9 @@ class Request
     }
 
     /**
-     * @param string $host
+     * @param string|null $host
      */
-    public function setHost($host): void
+    public function setHost(?string $host): void
     {
         $this->host = $host;
     }
@@ -231,7 +224,7 @@ class Request
     /**
      * @param string $method
      */
-    public function setMethod($method): void
+    public function setMethod(string $method): void
     {
         $this->method = $method;
     }
@@ -341,26 +334,32 @@ class Request
         return $this;
     }
 
+    /**
+     * Returns true if the request contains a rewrite
+     *
+     * @return bool
+     */
     public function hasRewrite(): bool
     {
         return $this->hasRewrite;
     }
 
-    public function setHasRewrite($value): self
+    /**
+     * Defines if the current request contains a rewrite.
+     *
+     * @param bool $boolean
+     * @return Request
+     */
+    public function setHasRewrite(bool $boolean): self
     {
-        $this->hasRewrite = $value;
+        $this->hasRewrite = $boolean;
 
         return $this;
     }
 
-    public function isRewrite($url): bool
-    {
-        return ($this->rewriteUrl === $url);
-    }
-
     public function __isset($name)
     {
-        return array_key_exists($name, $this->data);
+        return array_key_exists($name, $this->data) === true;
     }
 
     public function __set($name, $value = null)
diff --git a/src/Pecee/Http/Response.php b/src/Pecee/Http/Response.php
index 9920132..2e199f5 100644
--- a/src/Pecee/Http/Response.php
+++ b/src/Pecee/Http/Response.php
@@ -19,7 +19,7 @@ class Response
      * @param int $code
      * @return static
      */
-    public function httpCode($code): self
+    public function httpCode(int $code): self
     {
         http_response_code($code);
 
@@ -32,7 +32,7 @@ class Response
      * @param string $url
      * @param int $httpCode
      */
-    public function redirect($url, $httpCode = null): void
+    public function redirect(string $url, ?int $httpCode = null): void
     {
         if ($httpCode !== null) {
             $this->httpCode($httpCode);
@@ -52,7 +52,7 @@ class Response
      * @param string $name
      * @return static
      */
-    public function auth($name = ''): self
+    public function auth(string $name = ''): self
     {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
@@ -62,19 +62,19 @@ class Response
         return $this;
     }
 
-    public function cache($eTag, $lastModified = 2592000): self
+    public function cache(string $eTag, int $lastModifiedTime = 2592000): self
     {
 
         $this->headers([
             'Cache-Control: public',
-            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT',
-            'Etag: ' . $eTag,
+            sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $lastModifiedTime)),
+            sprintf('Etag: %s', $eTag),
         ]);
 
         $httpModified = $this->request->getHeader('http-if-modified-since');
         $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
 
-        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModifiedTime)) {
 
             $this->header('HTTP/1.1 304 Not Modified');
             exit(0);
@@ -90,7 +90,7 @@ class Response
      * @param int $dept JSON debt.
      * @throws InvalidArgumentException
      */
-    public function json($value, $options = null, $dept = 512): void
+    public function json($value, ?int $options = null, int $dept = 512): void
     {
         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.');
@@ -106,7 +106,7 @@ class Response
      * @param string $value
      * @return static
      */
-    public function header($value): self
+    public function header(string $value): self
     {
         header($value);
 
diff --git a/src/Pecee/Http/Security/CookieTokenProvider.php b/src/Pecee/Http/Security/CookieTokenProvider.php
index a44f639..bbe5ccb 100644
--- a/src/Pecee/Http/Security/CookieTokenProvider.php
+++ b/src/Pecee/Http/Security/CookieTokenProvider.php
@@ -45,9 +45,9 @@ class CookieTokenProvider implements ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token): bool
+    public function validate(string $token): bool
     {
-        if ($token !== null && $this->getToken() !== null) {
+        if ($this->getToken() !== null) {
             return hash_equals($token, $this->getToken());
         }
 
@@ -60,7 +60,7 @@ class CookieTokenProvider implements ITokenProvider
      *
      * @param string $token
      */
-    public function setToken($token): void
+    public function setToken(string $token): void
     {
         $this->token = $token;
         setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
@@ -71,7 +71,7 @@ class CookieTokenProvider implements ITokenProvider
      * @param string|null $defaultValue
      * @return string|null
      */
-    public function getToken($defaultValue = null): ?string
+    public function getToken(?string $defaultValue = null): ?string
     {
         $this->token = ($this->hasToken() === true) ? $_COOKIE[static::CSRF_KEY] : null;
 
@@ -108,9 +108,9 @@ class CookieTokenProvider implements ITokenProvider
 
     /**
      * Set cookie timeout in minutes
-     * @param $minutes
+     * @param int $minutes
      */
-    public function setCookieTimeoutMinutes($minutes): void
+    public function setCookieTimeoutMinutes(int $minutes): void
     {
         $this->cookieTimeoutMinutes = $minutes;
     }
diff --git a/src/Pecee/Http/Security/Exceptions/SecurityException.php b/src/Pecee/Http/Security/Exceptions/SecurityException.php
index 6b63bfb..b7d2dc2 100644
--- a/src/Pecee/Http/Security/Exceptions/SecurityException.php
+++ b/src/Pecee/Http/Security/Exceptions/SecurityException.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\Http\Security\Exceptions;
 
-class SecurityException extends \Exception {
+class SecurityException extends \Exception
+{
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Security/ITokenProvider.php b/src/Pecee/Http/Security/ITokenProvider.php
index 7b6307f..4b25b61 100644
--- a/src/Pecee/Http/Security/ITokenProvider.php
+++ b/src/Pecee/Http/Security/ITokenProvider.php
@@ -16,7 +16,7 @@ interface ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token): bool;
+    public function validate(string $token): bool;
 
     /**
      * Get token token
@@ -24,6 +24,6 @@ interface ITokenProvider
      * @param string|null $defaultValue
      * @return string|null
      */
-    public function getToken($defaultValue = null);
+    public function getToken(?string $defaultValue = null): ?string;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index e863a76..440e1b4 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -23,15 +23,16 @@ class Url
      * @param string $url
      * @throws MalformedUrlException
      */
-    public function __construct($url)
+    public function __construct(?string $url)
     {
         $this->originalUrl = $url;
-        $this->data = $this->parseUrl($url) + $this->data;
+        if ($url !== null) {
+            $this->data = $this->parseUrl($url) + $this->data;
 
-        if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
-            $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+            if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
+                $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+            }
         }
-
     }
 
     /**
@@ -103,7 +104,7 @@ class Url
      */
     public function getPath(): ?string
     {
-        return $this->data['path'];
+        return $this->data['path'] ?? '/';
     }
 
     /**
@@ -139,7 +140,7 @@ class Url
      * @throws MalformedUrlException
      * @return array
      */
-    public function parseUrl($url, $component = -1): array
+    public function parseUrl(string $url, int $component = -1): array
     {
         $encodedUrl = preg_replace_callback(
             '/[^:\/@?&=#]+/u',
@@ -158,9 +159,29 @@ class Url
         return array_map('urldecode', $parts);
     }
 
-    public function contains($value): bool
+    /**
+     * Get position of value.
+     * Returns -1 on failure.
+     *
+     * @param string $value
+     * @return int
+     */
+    public function indexOf(string $value): int
     {
-        return (stripos($this->getOriginalUrl(), $value) === false);
+        $index = stripos($this->getOriginalUrl(), $value);
+
+        return ($index === false) ? -1 : $index;
+    }
+
+    /**
+     * Check if url contains value.
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function contains(string $value): bool
+    {
+        return (stripos($this->getOriginalUrl(), $value) !== false);
     }
 
     /**
diff --git a/src/Pecee/SimpleRouter/Exceptions/HttpException.php b/src/Pecee/SimpleRouter/Exceptions/HttpException.php
index e3ded14..e03c4a7 100644
--- a/src/Pecee/SimpleRouter/Exceptions/HttpException.php
+++ b/src/Pecee/SimpleRouter/Exceptions/HttpException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Exceptions;
 
 class HttpException extends \Exception
diff --git a/src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php b/src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php
index 6e2aaad..e95078c 100644
--- a/src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php
+++ b/src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Exceptions;
 
 class NotFoundHttpException extends HttpException
diff --git a/src/Pecee/SimpleRouter/Route/IControllerRoute.php b/src/Pecee/SimpleRouter/Route/IControllerRoute.php
index 6f102db..f5c879b 100644
--- a/src/Pecee/SimpleRouter/Route/IControllerRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IControllerRoute.php
@@ -17,6 +17,6 @@ interface IControllerRoute extends IRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller): self;
+    public function setController(string $controller): self;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IGroupRoute.php b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
index 7a60142..1a5eb41 100644
--- a/src/Pecee/SimpleRouter/Route/IGroupRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
@@ -19,15 +19,15 @@ interface IGroupRoute extends IRoute
      * Add exception handler
      *
      * @param IExceptionHandler|string $handler
-     * @return static $this;
+     * @return static
      */
-    public function addExceptionHandler($handler);
+    public function addExceptionHandler($handler): self;
 
     /**
      * Set exception-handlers for group
      *
      * @param array $handlers
-     * @return static $this
+     * @return static
      */
     public function setExceptionHandlers(array $handlers);
 
diff --git a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
index c1a3472..49028fc 100644
--- a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
@@ -3,6 +3,7 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
 
 interface ILoadableRoute extends IRoute
 {
@@ -18,22 +19,32 @@ interface ILoadableRoute extends IRoute
     public function findUrl($method = null, $parameters = null, $name = null): string;
 
     /**
-     * Loads and renders middlewares-classes
+     * Loads and renders middleware-classes
      *
      * @param Request $request
+     * @param Router $router
      */
-    public function loadMiddleware(Request $request);
+    public function loadMiddleware(Request $request, Router $router): void;
 
-    public function getUrl();
+    /**
+     * Get url
+     * @return string
+     */
+    public function getUrl(): string;
 
-    public function setUrl($url);
+    /**
+     * Set url
+     * @param string $url
+     * @return static
+     */
+    public function setUrl(string $url): self;
 
     /**
      * Returns the provided name for the router.
      *
      * @return string|null
      */
-    public function getName(): string;
+    public function getName(): ?string;
 
     /**
      * Check if route has given name.
@@ -41,7 +52,7 @@ interface ILoadableRoute extends IRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name): bool;
+    public function hasName(string $name): bool;
 
     /**
      * Sets the router name, which makes it easier to obtain the url or router at a later point.
@@ -49,14 +60,14 @@ interface ILoadableRoute extends IRoute
      * @param string $name
      * @return static
      */
-    public function setName($name): self;
+    public function setName(string $name): self;
 
     /**
      * Get regular expression match used for matching route (if defined).
      *
      * @return string
      */
-    public function getMatch(): string;
+    public function getMatch(): ?string;
 
     /**
      * Add regular expression match for the entire route.
diff --git a/src/Pecee/SimpleRouter/Route/IRoute.php b/src/Pecee/SimpleRouter/Route/IRoute.php
index f5916b4..4654e1f 100644
--- a/src/Pecee/SimpleRouter/Route/IRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IRoute.php
@@ -3,6 +3,7 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
 
 interface IRoute
 {
@@ -20,10 +21,11 @@ interface IRoute
      * Returns class to be rendered.
      *
      * @param Request $request
+     * @param Router $router
      * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
      * @return string
      */
-    public function renderRoute(Request $request): ?string;
+    public function renderRoute(Request $request, Router $router): ?string;
 
     /**
      * Returns callback name/identifier for the current route based on the callback.
@@ -103,15 +105,20 @@ interface IRoute
      * @param string $method
      * @return static
      */
-    public function setMethod($method): self;
+    public function setMethod(string $method): self;
 
-    public function getClass();
+    /**
+     * Get class
+     *
+     * @return string|null
+     */
+    public function getClass(): ?string;
 
     /**
      * @param string $namespace
      * @return static
      */
-    public function setNamespace($namespace);
+    public function setNamespace(string $namespace): self;
 
     /**
      * @return string|null
@@ -122,9 +129,13 @@ interface IRoute
      * @param string $namespace
      * @return static
      */
-    public function setDefaultNamespace($namespace);
+    public function setDefaultNamespace($namespace): IRoute;
 
-    public function getDefaultNamespace();
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public function getDefaultNamespace(): ?string;
 
     /**
      * Get parameter names.
@@ -139,7 +150,7 @@ interface IRoute
      * @param array $options
      * @return static
      */
-    public function setWhere(array $options);
+    public function setWhere(array $options): self;
 
     /**
      * Get parameters
@@ -152,18 +163,18 @@ interface IRoute
      * Get parameters
      *
      * @param array $parameters
-     * @return static $this
+     * @return static
      */
-    public function setParameters(array $parameters);
+    public function setParameters(array $parameters): self;
 
     /**
      * Merge with information from another route.
      *
      * @param array $settings
      * @param bool $merge
-     * @return static $this
+     * @return static
      */
-    public function setSettings(array $settings, $merge = false);
+    public function setSettings(array $settings, bool $merge = false): self;
 
     /**
      * Export route settings to array so they can be merged with another route.
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index 24eead4..48d02c6 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -5,6 +5,7 @@ namespace Pecee\SimpleRouter\Route;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Router;
 
 abstract class LoadableRoute extends Route implements ILoadableRoute
 {
@@ -24,10 +25,13 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * Loads and renders middlewares-classes
      *
      * @param Request $request
+     * @param Router $router
      * @throws HttpException
      */
-    public function loadMiddleware(Request $request) : void
+    public function loadMiddleware(Request $request, Router $router): void
     {
+        $router->debug('Loading middlewares');
+
         foreach ($this->getMiddlewares() as $middleware) {
 
             if (\is_object($middleware) === false) {
@@ -38,11 +42,15 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                 throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
             }
 
+            $router->debug('Loading middleware "%s"', \get_class($middleware));
             $middleware->handle($request);
+            $router->debug('Finished loading middleware');
         }
+
+        $router->debug('Finished loading middlewares');
     }
 
-    public function matchRegex(Request $request, $url) : ?bool
+    public function matchRegex(Request $request, $url): ?bool
     {
         /* Match on custom defined regular expression */
 
@@ -59,7 +67,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $url
      * @return static
      */
-    public function setUrl($url) : self
+    public function setUrl(string $url): ILoadableRoute
     {
         $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
@@ -75,7 +83,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return $this;
     }
 
-    public function getUrl() : string
+    public function getUrl(): string
     {
         return $this->url;
     }
@@ -89,7 +97,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null) : string
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         $url = $this->getUrl();
 
@@ -144,7 +152,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getName() : string
+    public function getName(): string
     {
         return $this->name;
     }
@@ -155,7 +163,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name) : bool
+    public function hasName(string $name): bool
     {
         return strtolower($this->name) === strtolower($name);
     }
@@ -166,7 +174,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $regex
      * @return static
      */
-    public function setMatch($regex) : ILoadableRoute
+    public function setMatch($regex): ILoadableRoute
     {
         $this->regex = $regex;
 
@@ -178,7 +186,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getMatch() : string
+    public function getMatch(): string
     {
         return $this->regex;
     }
@@ -191,7 +199,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string|array $name
      * @return static
      */
-    public function name($name) : ILoadableRoute
+    public function name($name): ILoadableRoute
     {
         return $this->setName($name);
     }
@@ -202,7 +210,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $name
      * @return static
      */
-    public function setName($name) : ILoadableRoute
+    public function setName(string $name): ILoadableRoute
     {
         $this->name = $name;
 
@@ -216,7 +224,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false): IRoute
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
         if (isset($values['as']) === true) {
 
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 1cb70bc..12d6aff 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -5,6 +5,7 @@ namespace Pecee\SimpleRouter\Route;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Router;
 
 abstract class Route implements IRoute
 {
@@ -59,10 +60,10 @@ abstract class Route implements IRoute
     /**
      * Load class by name
      * @param string $name
-     * @return mixed
+     * @return object
      * @throws NotFoundHttpException
      */
-    protected function loadClass($name)
+    protected function loadClass($name): object
     {
         if (class_exists($name) === false) {
             throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
@@ -75,21 +76,25 @@ abstract class Route implements IRoute
      * Render route
      *
      * @param Request $request
+     * @param Router $router
      * @return string|null
      * @throws NotFoundHttpException
      */
-    public function renderRoute(Request $request): ?string
+    public function renderRoute(Request $request, Router $router): ?string
     {
+        $router->debug('Starting rendering route');
+
         $callback = $this->getCallback();
 
         if ($callback === null) {
             return null;
         }
 
+        $router->debug('Parsing parameters');
         $parameters = $this->getParameters();
+        $router->debug('Finished parsing parameters');
 
         /* Filter parameters with null-value */
-
         if ($this->filterEmptyParams === true) {
             $parameters = array_filter($parameters, function ($var) {
                 return ($var !== null);
@@ -98,7 +103,10 @@ abstract class Route implements IRoute
 
         /* Render callback function */
         if (\is_callable($callback) === true) {
+            $router->debug('Executing callback');
+
             /* When the callback is a function */
+
             return \call_user_func_array($callback, $parameters);
         }
 
@@ -109,6 +117,7 @@ abstract class Route implements IRoute
 
         $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
 
+        $router->debug('Loading class %s', $className);
         $class = $this->loadClass($className);
         $method = $controller[1];
 
@@ -116,6 +125,8 @@ abstract class Route implements IRoute
             throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
         }
 
+        $router->debug('Executing callback');
+
         return \call_user_func_array([$class, $method], $parameters);
     }
 
@@ -300,7 +311,7 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function getClass()
+    public function getClass(): ?string
     {
         if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             $tmp = explode('@', $this->callback);
@@ -311,14 +322,14 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function setMethod($method): IRoute
+    public function setMethod(string $method): IRoute
     {
         $this->callback = sprintf('%s@%s', $this->getClass(), $method);
 
         return $this;
     }
 
-    public function setClass($class)
+    public function setClass(string $class): IRoute
     {
         $this->callback = sprintf('%s@%s', $class, $this->getMethod());
 
@@ -327,9 +338,9 @@ abstract class Route implements IRoute
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
-    public function setNamespace($namespace)
+    public function setNamespace(string $namespace): IRoute
     {
         $this->namespace = $namespace;
 
@@ -338,16 +349,16 @@ abstract class Route implements IRoute
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
-    public function setDefaultNamespace($namespace)
+    public function setDefaultNamespace($namespace): IRoute
     {
         $this->defaultNamespace = $namespace;
 
         return $this;
     }
 
-    public function getDefaultNamespace()
+    public function getDefaultNamespace(): ?string
     {
         return $this->defaultNamespace;
     }
@@ -397,9 +408,9 @@ abstract class Route implements IRoute
      *
      * @param array $values
      * @param bool $merge
-     * @return static $this
+     * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
         if ($this->namespace === null && isset($values['namespace']) === true) {
             $this->setNamespace($values['namespace']);
@@ -445,7 +456,7 @@ abstract class Route implements IRoute
      * @param array $options
      * @return static
      */
-    public function setWhere(array $options)
+    public function setWhere(array $options): IRoute
     {
         $this->where = $options;
 
@@ -486,9 +497,9 @@ abstract class Route implements IRoute
      * Get parameters
      *
      * @param array $parameters
-     * @return static $this
+     * @return static
      */
-    public function setParameters(array $parameters)
+    public function setParameters(array $parameters): IRoute
     {
         /*
          * If this is the first time setting parameters we store them so we
@@ -556,7 +567,7 @@ abstract class Route implements IRoute
      * This is used when no custom parameter regex is found.
      *
      * @param string $regex
-     * @return static $this
+     * @return static
      */
     public function setDefaultParameterRegex($regex)
     {
diff --git a/src/Pecee/SimpleRouter/Route/RouteController.php b/src/Pecee/SimpleRouter/Route/RouteController.php
index 898df28..b15a402 100644
--- a/src/Pecee/SimpleRouter/Route/RouteController.php
+++ b/src/Pecee/SimpleRouter/Route/RouteController.php
@@ -24,7 +24,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name): bool
+    public function hasName(string $name): bool
     {
         if ($this->name === null) {
             return false;
@@ -134,7 +134,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller): IControllerRoute
+    public function setController(string $controller): IControllerRoute
     {
         $this->controller = $controller;
 
@@ -157,7 +157,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $method
      * @return static
      */
-    public function setMethod($method): IRoute
+    public function setMethod(string $method): IRoute
     {
         $this->method = $method;
 
@@ -171,7 +171,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false): IRoute
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];
diff --git a/src/Pecee/SimpleRouter/Route/RouteGroup.php b/src/Pecee/SimpleRouter/Route/RouteGroup.php
index e2506d7..8c88e6b 100644
--- a/src/Pecee/SimpleRouter/Route/RouteGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RouteGroup.php
@@ -147,7 +147,7 @@ class RouteGroup extends Route implements IGroupRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false): IRoute
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
 
         if (isset($values['prefix']) === true) {
diff --git a/src/Pecee/SimpleRouter/Route/RouteResource.php b/src/Pecee/SimpleRouter/Route/RouteResource.php
index 7d454b4..13fe2e7 100644
--- a/src/Pecee/SimpleRouter/Route/RouteResource.php
+++ b/src/Pecee/SimpleRouter/Route/RouteResource.php
@@ -42,7 +42,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name): bool
+    public function hasName(string $name): bool
     {
         if ($this->name === null) {
             return false;
@@ -154,14 +154,14 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller): IControllerRoute
+    public function setController(string $controller): IControllerRoute
     {
         $this->controller = $controller;
 
         return $this;
     }
 
-    public function setName($name): ILoadableRoute
+    public function setName(string $name): ILoadableRoute
     {
         $this->name = $name;
 
@@ -208,7 +208,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false): IRoute
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index c4d8f22..4a96f7a 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -66,6 +66,32 @@ class Router
      */
     protected $exceptionHandlers;
 
+    /**
+     * List of loaded exception that has been loaded.
+     * Used to ensure that exception-handlers aren't loaded twice when rewriting route.
+     *
+     * @var array
+     */
+    protected $loadedExceptionHandlers;
+
+    /**
+     * Enable or disabled debugging
+     * @var bool
+     */
+    protected $debugEnabled = false;
+
+    /**
+     * The start time used when debugging is enabled
+     * @var float
+     */
+    protected $debugStartTime;
+
+    /**
+     * List containing all debug messages
+     * @var array
+     */
+    protected $debugList = [];
+
     /**
      * Router constructor.
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
@@ -78,7 +104,7 @@ class Router
     /**
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public function reset() : void
+    public function reset(): void
     {
         $this->processingRoute = false;
         $this->request = new Request();
@@ -87,6 +113,7 @@ class Router
         $this->routeStack = [];
         $this->processedRoutes = [];
         $this->exceptionHandlers = [];
+        $this->loadedExceptionHandlers = [];
     }
 
     /**
@@ -94,7 +121,7 @@ class Router
      * @param IRoute $route
      * @return IRoute
      */
-    public function addRoute(IRoute $route) : IRoute
+    public function addRoute(IRoute $route): IRoute
     {
         /*
          * If a route is currently being processed, that means that the route being added are rendered from the parent
@@ -102,10 +129,12 @@ class Router
          */
         if ($this->processingRoute === true) {
             $this->routeStack[] = $route;
+
             return $route;
         }
 
         $this->routes[] = $route;
+
         return $route;
     }
 
@@ -115,10 +144,11 @@ class Router
      * @param IRoute $route
      * @throws NotFoundHttpException
      */
-    protected function renderAndProcess(IRoute $route) : void {
+    protected function renderAndProcess(IRoute $route): void
+    {
 
         $this->processingRoute = true;
-        $route->renderRoute($this->request);
+        $route->renderRoute($this->request, $this);
         $this->processingRoute = false;
 
         if (\count($this->routeStack) !== 0) {
@@ -139,13 +169,17 @@ class Router
      * @param IGroupRoute|null $group
      * @throws NotFoundHttpException
      */
-    protected function processRoutes(array $routes, IGroupRoute $group = null) : void
+    protected function processRoutes(array $routes, ?IGroupRoute $group = null): void
     {
+        $this->debug('Processing routes');
+
         // Loop through each route-request
         $exceptionHandlers = [];
 
         // Stop processing routes if no valid route is found.
-        if($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+        if ($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+            $this->debug('Halted route-processing as no valid route was found');
+
             return;
         }
 
@@ -154,6 +188,8 @@ class Router
         /* @var $route IRoute */
         foreach ($routes as $route) {
 
+            $this->debug('Processing route "%s"', \get_class($route));
+
             if ($group !== null) {
                 /* Add the parent group */
                 $route->setGroup($group);
@@ -199,16 +235,22 @@ class Router
      * @throws NotFoundHttpException
      * @return void
      */
-    public function loadRoutes() : void
+    public function loadRoutes(): void
     {
+        $this->debug('Loading routes');
+
         /* Initialize boot-managers */
         /* @var $manager IRouterBootManager */
         foreach ($this->bootManagers as $manager) {
+            $this->debug('Rendering bootmanager %s', \get_class($manager));
             $manager->boot($this->request);
+            $this->debug('Finished rendering bootmanager');
         }
 
         /* Loop through each route-request */
         $this->processRoutes($this->routes);
+
+        $this->debug('Finished loading routes');
     }
 
     /**
@@ -219,9 +261,11 @@ class Router
      * @throws HttpException
      * @throws \Exception
      */
-    public function routeRequest($rewrite = false) : ?string
+    public function routeRequest(bool $rewrite = false): ?string
     {
-        $routeNotAllowed = false;
+        $this->debug('Started routing request (rewrite: %s)', $rewrite === true ? 'yes' : 'no');
+
+        $methodNotAllowed = false;
 
         try {
 
@@ -233,8 +277,6 @@ class Router
                     /* Verify csrf token for request */
                     $this->csrfVerifier->handle($this->request);
                 }
-            } else {
-                $this->request->setHasRewrite(false);
             }
 
             $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
@@ -242,38 +284,39 @@ class Router
             /* @var $route ILoadableRoute */
             foreach ($this->processedRoutes as $key => $route) {
 
+                $this->debug('Matching route "%s"', \get_class($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(), true) === false) {
-                        $routeNotAllowed = true;
+                        $this->debug('Method "%s" not allowed', $this->request->getMethod());
+                        $methodNotAllowed = true;
                         continue;
                     }
 
-                    $route->loadMiddleware($this->request);
+                    $route->loadMiddleware($this->request, $this);
 
-                    if ($this->hasRewrite($url) === true) {
-                        unset($this->processedRoutes[$key]);
-
-                        return $this->routeRequest(true);
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
                     }
 
                     /* Render route */
-                    $routeNotAllowed = false;
+                    $methodNotAllowed = false;
 
                     $this->request->addLoadedRoute($route);
 
-                    $output = $route->renderRoute($this->request);
+                    $output = $route->renderRoute($this->request, $this);
 
                     if ($output !== null) {
                         return $output;
                     }
 
-                    if ($this->hasRewrite($url) === true) {
-                        unset($this->processedRoutes[$key]);
-
-                        return $this->routeRequest(true);
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
                     }
                 }
             }
@@ -282,7 +325,7 @@ class Router
             $this->handleException($e);
         }
 
-        if ($routeNotAllowed === true) {
+        if ($methodNotAllowed === true) {
             $message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod());
             $this->handleException(new HttpException($message, 403));
         }
@@ -297,35 +340,45 @@ class Router
                 $message = sprintf('Route not found: "%s"', $this->request->getUrl()->getPath());
             }
 
-            $this->handleException(new NotFoundHttpException($message, 404));
+            $this->debug($message);
+
+            return $this->handleException(new NotFoundHttpException($message, 404));
         }
 
         return null;
     }
 
-    protected function hasRewrite($url) : bool
+    /**
+     * Handle route-rewrite
+     *
+     * @param string $key
+     * @param string $url
+     * @return string|null
+     * @throws HttpException
+     * @throws \Exception
+     */
+    protected function handleRouteRewrite($key, string $url): ?string
     {
-
         /* 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;
-            }
+        if ($this->request->hasRewrite() === false) {
+            return null;
         }
 
-        return false;
+        $route = $this->request->getRewriteRoute();
+
+        if ($route !== null) {
+            /* Add rewrite route */
+            $this->processedRoutes[] = $route;
+        }
+
+        if ($this->request->getRewriteUrl() !== $url) {
+            unset($this->processedRoutes[$key]);
+            $this->request->setHasRewrite(false);
+
+            return $this->routeRequest(true);
+        }
+
+        return null;
     }
 
     /**
@@ -334,8 +387,10 @@ class Router
      * @throws \Exception
      * @return string|null
      */
-    protected function handleException(\Exception $e) : ?string
+    protected function handleException(\Exception $e): ?string
     {
+        $this->debug('Starting exception handling for "%s"', \get_class($e));
+
         /* @var $handler IExceptionHandler */
         foreach ($this->exceptionHandlers as $key => $handler) {
 
@@ -343,17 +398,22 @@ class Router
                 $handler = new $handler();
             }
 
+            $this->debug('Processing exception-handler "%s"', \get_class($handler));
+
             if (($handler instanceof IExceptionHandler) === false) {
                 throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
             }
 
             try {
 
+                $this->debug('Start rendering exception handler');
                 $handler->handleError($this->request, $e);
+                $this->debug('Finished rendering exception-handler');
 
-                if ($this->request->hasRewrite() === true) {
-                    unset($this->exceptionHandlers[$key]);
-                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
+                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasRewrite() === true) {
+                    $this->loadedExceptionHandlers[$key] = $handler;
+
+                    $this->debug('Exception handler contains rewrite, reloading routes');
 
                     return $this->routeRequest(true);
                 }
@@ -361,12 +421,15 @@ class Router
             } catch (\Exception $e) {
 
             }
+
+            $this->debug('Finished processing');
         }
 
+        $this->debug('Finished exception handling - exception not handled, throwing');
         throw $e;
     }
 
-    public function arrayToParams(array $getParams = [], $includeEmpty = true) : string
+    public function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
     {
         if (\count($getParams) !== 0) {
 
@@ -388,18 +451,25 @@ class Router
      * @param string $name
      * @return ILoadableRoute|null
      */
-    public function findRoute($name) : ?ILoadableRoute
+    public function findRoute(string $name): ?ILoadableRoute
     {
+
+        $this->debug('Finding route by name "%s"', $name);
+
         /* @var $route ILoadableRoute */
         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) === true) {
+                $this->debug('Found route "%s" by name "%s"', $route->getUrl(), $name);
+
                 return $route;
             }
 
             /* Direct match to controller */
             if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($name)) {
+                $this->debug('Found route "%s" by controller "%s"', $route->getUrl(), $name);
+
                 return $route;
             }
 
@@ -408,6 +478,8 @@ class Router
                 [$controller, $method] = array_map('strtolower', explode('@', $name));
 
                 if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
+                    $this->debug('Found route "%s" by controller "%s" and method "%s"', $route->getUrl(), $controller, $method);
+
                     return $route;
                 }
             }
@@ -417,16 +489,22 @@ class Router
 
                 /* Check if the entire callback is matching */
                 if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
+                    $this->debug('Found route "%s" by callback "%s"', $route->getUrl(), $name);
+
                     return $route;
                 }
 
                 /* Check if the class part of the callback matches (class@method) */
                 if (strtolower($name) === strtolower($route->getClass())) {
+                    $this->debug('Found route "%s" by class "%s"', $route->getUrl(), $name);
+
                     return $route;
                 }
             }
         }
 
+        $this->debug('Route not found');
+
         return null;
     }
 
@@ -448,8 +526,10 @@ class Router
      * @throws InvalidArgumentException
      * @return string
      */
-    public function getUrl($name = null, $parameters = null, $getParams = null) : string
+    public function getUrl(?string $name = null, $parameters = null, $getParams = null): string
     {
+        $this->debug('Finding url', \func_get_args());
+
         if ($getParams !== null && \is_array($getParams) === false) {
             throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
         }
@@ -513,28 +593,28 @@ class Router
     }
 
     /**
-     * Get bootmanagers
+     * Get BootManagers
      * @return array
      */
-    public function getBootManagers() : array
+    public function getBootManagers(): array
     {
         return $this->bootManagers;
     }
 
     /**
-     * Set bootmanagers
+     * Set BootManagers
      * @param array $bootManagers
      */
-    public function setBootManagers(array $bootManagers) : void
+    public function setBootManagers(array $bootManagers): void
     {
         $this->bootManagers = $bootManagers;
     }
 
     /**
-     * Add bootmanager
+     * Add BootManager
      * @param IRouterBootManager $bootManager
      */
-    public function addBootManager(IRouterBootManager $bootManager) : void
+    public function addBootManager(IRouterBootManager $bootManager): void
     {
         $this->bootManagers[] = $bootManager;
     }
@@ -544,7 +624,7 @@ class Router
      *
      * @return array
      */
-    public function getProcessedRoutes() : array
+    public function getProcessedRoutes(): array
     {
         return $this->processedRoutes;
     }
@@ -552,7 +632,7 @@ class Router
     /**
      * @return array
      */
-    public function getRoutes() : array
+    public function getRoutes(): array
     {
         return $this->routes;
     }
@@ -563,7 +643,7 @@ class Router
      * @param array $routes
      * @return static
      */
-    public function setRoutes(array $routes) : self
+    public function setRoutes(array $routes): self
     {
         $this->routes = $routes;
 
@@ -575,7 +655,7 @@ class Router
      *
      * @return Request
      */
-    public function getRequest() : Request
+    public function getRequest(): Request
     {
         return $this->request;
     }
@@ -584,7 +664,7 @@ class Router
      * Get csrf verifier class
      * @return BaseCsrfVerifier
      */
-    public function getCsrfVerifier() : BaseCsrfVerifier
+    public function getCsrfVerifier(): ?BaseCsrfVerifier
     {
         return $this->csrfVerifier;
     }
@@ -602,4 +682,47 @@ class Router
         return $this;
     }
 
+    /**
+     * Add new debug message
+     * @param string $message
+     * @param array $args
+     */
+    public function debug(string $message, ...$args): void
+    {
+        if ($this->debugEnabled === false) {
+            return;
+        }
+
+        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+        $this->debugList[] = [
+            'message' => vsprintf($message, $args),
+            'time'    => number_format(microtime(true) - $this->debugStartTime, 10),
+            'trace'   => end($trace),
+        ];
+    }
+
+    /**
+     * Enable or disables debugging
+     *
+     * @param bool $boolean
+     */
+    public function setDebugEnabled(bool $boolean): void
+    {
+        if ($boolean === true) {
+            $this->debugStartTime = microtime(true);
+        }
+
+        $this->debugEnabled = $boolean;
+    }
+
+    /**
+     * Get the list containing all debug messages.
+     *
+     * @return array
+     */
+    public function getDebugLog(): array
+    {
+        return $this->debugList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 8f64e70..ea0410f 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -46,6 +46,8 @@ class SimpleRouter
     protected static $router;
 
     /**
+     * Start routing
+     *
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws HttpException
      * @throws \Exception
@@ -56,21 +58,55 @@ class SimpleRouter
     }
 
     /**
-     * Get debug info array
+     * Start the routing an return array with debugging-information
      *
      * @return array
      * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function debugInfo(): array
+    public static function startDebug(): array
     {
+        $routerOutput = null;
+
+        try {
+            ob_start();
+            static::router()->setDebugEnabled(true);
+            static::start();
+            $routerOutput = ob_get_contents();
+            ob_end_clean();
+        } catch (\Exception $e) {
+
+        }
+
+        // Try to parse library version
+        $composerFile = \dirname(__DIR__, 3) . '/composer.lock';
+        $version = false;
+
+        if (is_file($composerFile) === true) {
+            $composerInfo = json_decode(file_get_contents($composerFile), true);
+
+            if (isset($composerInfo['packages']) === true && \is_array($composerInfo['packages']) === true) {
+                foreach ($composerInfo['packages'] as $package) {
+                    if (isset($package['name']) === true && strtolower($package['name']) === 'pecee/simple-router') {
+                        $version = $package['version'];
+                        break;
+                    }
+                }
+            }
+        }
+
         return [
-            'url'           => static::request()->getUrl(),
-            'method'        => static::request()->getMethod(),
-            'host'          => static::request()->getHost(),
-            'loaded_routes' => static::request()->getLoadedRoutes(),
-            'all_routes'    => static::router()->getRoutes(),
-            'boot_managers' => static::router()->getBootManagers(),
-            'csrf_verifier' => static::router()->getCsrfVerifier(),
+            'url'             => static::request()->getUrl(),
+            'method'          => static::request()->getMethod(),
+            'host'            => static::request()->getHost(),
+            'loaded_routes'   => static::request()->getLoadedRoutes(),
+            'all_routes'      => static::router()->getRoutes(),
+            'boot_managers'   => static::router()->getBootManagers(),
+            'csrf_verifier'   => static::router()->getCsrfVerifier(),
+            'log'             => static::router()->getDebugLog(),
+            'router_output'   => $routerOutput,
+            'library_version' => $version,
+            'php_version'     => PHP_VERSION,
+            'server_params'   => static::request()->getHeaders(),
         ];
     }
 
diff --git a/tests/Pecee/SimpleRouter/RouterUrlTest.php b/tests/Pecee/SimpleRouter/RouterUrlTest.php
index 5c6d0e7..78f9e1a 100644
--- a/tests/Pecee/SimpleRouter/RouterUrlTest.php
+++ b/tests/Pecee/SimpleRouter/RouterUrlTest.php
@@ -31,21 +31,22 @@ class RouterUrlTest extends \PHPUnit\Framework\TestCase
     {
         // Test spanish characters
         TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
         TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
+
         $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
+        TestRouter::debugNoReset('/test/Dermatología');
+        $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
+
+        $this->assertEquals('Dermatología', $parameters['param']);
+
         // Test danish characters
         TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
         TestRouter::debugNoReset('/kategori/økse', 'get');
+
         $this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
-        TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
-        TestRouter::debugNoReset('/test/Dermatología');
-
-        $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
-
-        $this->assertEquals('Dermatología', $parameters['param']);
-
         TestRouter::router()->reset();
     }
 
diff --git a/tests/debug.php b/tests/debug.php
new file mode 100644
index 0000000..a582af8
--- /dev/null
+++ b/tests/debug.php
@@ -0,0 +1,9 @@
+<?php
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+use \Pecee\SimpleRouter\SimpleRouter;
+
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+$debugInfo = SimpleRouter::startDebug();
+echo sprintf('<pre>%s</pre>', var_export($debugInfo, true));
+exit;
\ No newline at end of file

From ef4582dbe028fd2a3a37186bcea672b168d1c6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Tue, 27 Mar 2018 01:11:44 +0200
Subject: [PATCH 03/25] Fixed wrong return-type in loadClass.

---
 src/Pecee/SimpleRouter/Route/Route.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 12d6aff..2f349c3 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -60,10 +60,10 @@ abstract class Route implements IRoute
     /**
      * Load class by name
      * @param string $name
-     * @return object
+     * @return mixed
      * @throws NotFoundHttpException
      */
-    protected function loadClass($name): object
+    protected function loadClass($name)
     {
         if (class_exists($name) === false) {
             throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);

From aa56d45f9c5f409c23c0792af4eda8d5173eb865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 10:13:23 +0200
Subject: [PATCH 04/25] Updated documentation

---
 README.md | 778 +++++++++++++++++++++++++++---------------------------
 1 file changed, 392 insertions(+), 386 deletions(-)

diff --git a/README.md b/README.md
index 18b4e2a..8034920 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,7 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 		- [Setting up IIS](#setting-up-iis)
 		- [Configuration](#configuration)
 		- [Helper functions](#helper-functions)
-- [Help and support](#help-and-support)
-    - [How to debug](#how-to-debug)
-        - [Creating unit-tests](#creating-unit-tests) 
-        - [Debug information](#debug-information)
-        - [Benchmark and log-info](#benchmark-and-log-info)
-    - [Reporting a new issue](#reporting-a-new-issue)
-        - [Procedure for reporting a new issue](#procedure-for-reporting-a-new-issue)
-        - [Issue template](#issue-template)
+		
 - [Routes](#routes)
 	- [Basic routing](#basic-routing)
 		- [Available methods](#available-methods)
@@ -58,6 +51,7 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 
 - [Middlewares](#middlewares)
 	- [Example](#example)
+	
 - [ExceptionHandlers](#exceptionhandlers)
     - [Handling 404, 403 and other errors](#handling-404-403-and-other-errors)
 	- [Using custom exception handlers](#using-custom-exception-handlers)
@@ -85,6 +79,16 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 	- [Parameters](#parameters)
 	- [Extending](#extending)
 
+- [Help and support](#help-and-support)
+    - [Common issues and fixes](#common-issues-and-fixes)
+    - [Debugging](#debugging)
+        - [Creating unit-tests](#creating-unit-tests) 
+        - [Debug information](#debug-information)
+        - [Benchmark and log-info](#benchmark-and-log-info)
+    - [Reporting a new issue](#reporting-a-new-issue)
+        - [Procedure for reporting a new issue](#procedure-for-reporting-a-new-issue)
+        - [Issue template](#issue-template)
+
 - [Credits](#credits)
 	- [Sites](#sites)
 	- [License](#license)
@@ -382,379 +386,6 @@ function csrf_token()
 
 ---
 
-# Help and support
-
-This section will go into details on how to debug the router and answer some of the commonly asked questions- and issues.
-
-## How to debug
-
-This section will show you how to write unit-tests for the router, view useful debugging information and answer some of the frequently asked questions. 
-
-It will also covers how to report any issue you might encounter. 
-
-### Creating unit-tests
-
-The easiest and fastest way to debug any issues with the router, is to create a unit-test that represents the issue you are experiencing.
-
-Unit-tests use a special `TestRouter` class, which simulates a request-method and requested url of a browser.
-
-The `TestRouter` class can return the output directly or render a route silently.
-
-```php
-public function testUnicodeCharacters()
-{
-    // Add route containing two optional paramters with special spanish characters like "í".
-    TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
-    
-    // Start the routing and simulate the url "/cursos/listado/especialidad/cirugía local".
-    TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'GET');
-    
-    // Verify that the url for the loaded route matches the expected route.
-    $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
-    
-    // Start the routing and simulate the url "/test/Dermatología" using "GET" as request-method.
-    TestRouter::debugNoReset('/test/Dermatología', 'GET');
-
-    // Another route containing one parameter with special spanish characters like "í".
-    TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
-
-    // Get all parameters parsed by the loaded route.
-    $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
-
-    // Check that the parameter named "param" matches the exspected value.
-    $this->assertEquals('Dermatología', $parameters['param']);
-
-    // Add route testing danish special characters like "ø".
-    TestRouter::get('/category/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
-    
-    // Start the routing and simulate the url "/kategory/økse" using "GET" as request-method.
-    TestRouter::debugNoReset('/category/økse', 'GET');
-    
-    // Validate that the URL of the loaded-route matches the expected url.
-    $this->assertEquals('/category/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
-
-    // Reset the router, so other tests wont inherit settings or the routes we've added.
-    TestRouter::router()->reset();
-}
-```
-
-#### Using the TestRouter helper
-
-Depending on your test, you can use the methods below when rendering routes in your unit-tests.
-
-
-| Method        | Description  |
-| ------------- |-------------|
-| ```TestRouter::debug($url, $method)``` | Will render the route without returning anything. Exceptions will be thrown and the router will be reset automatically. |
-| ```TestRouter::debugOutput($url, $method)``` | Will render the route and return any value that the route might output. Manual reset required by calling `TestRouter::router()->reset()`. |
-| ```TestRouter::debugNoReset($url, $method);```  | Will render the route without resetting the router. Useful if you need to get loaded route, parameters etc. from the router. Manual reset required by calling `TestRouter::router()->reset()`. |
-
-### Debug information
-
-The library can output debug-information, which contains information like loaded routes, the parsed request-url etc. It also contains info which are important when reporting a new issue like PHP-version, library version, server-variables, router debug log etc.
-
-You can activate the debug-information by calling the alternative start-method. 
-
-The example below will start the routing an return array with debugging-information
-
-**Example:**
-
-```php
-$debugInfo = SimpleRouter::startDebug();
-echo sprintf('<pre>%s</pre>', var_export($debugInfo));
-exit;
-```
-
-**The example above will provide you with an output containing:**
-
-| Key               | Description  |
-| -------------     |------------- |
-| `url`             | The parsed request-uri. This url should match the url in the browser.|
-| `method`          | The browsers request method (example: `GET`, `POST`, `PUT`, `PATCH`, `DELETE` etc).|
-| `host`            | The website host (example: `domain.com`).|
-| `loaded_routes`   | List of all the routes that matched the `url` and that has been rendered/loaded. |
-| `all_routes`      | All available routes |
-| `boot_managers`   | All available BootManagers |
-| `csrf_verifier`   | CsrfVerifier class |
-| `log`             | List of debug messages/log from the router. |
-| `router_output`   | The rendered callback output from the router. |
-| `library_version` | The version of simple-php-router you are using. |
-| `php_version`     | The version of PHP you are using. |
-| `server_params`   | List of all `$_SERVER` variables/headers. | 
-
-#### Benchmark and logging
-
-You can activate benchmark debugging/logging by calling `setDebugEnabled` method on the `Router` instance.
-
-You have to enable debugging BEFORE starting the routing.
-
-**Example:**
-
-```php
-SimpleRouter::router()->setDebugEnabled(true);
-SimpleRouter::start();
-```
-
-When the routing is complete, you can get the debug-log by calling the `getDebugLog()` on the `Router` instance. This will return an `array` of log-messages each containing execution time, trace info and debug-message.
-
-**Example:**
-
-```php
-$messages = SimpleRouter::router()->getDebugLog();
-```
-
-## Reporting a new issue
-
-**Before reporting your issue, make sure that the issue you are experiencing aren't already answered in the [Common errors](#common-errors) section or by searching the [closed issues](https://github.com/skipperbent/simple-php-router/issues?q=is%3Aissue+is%3Aclosed) page on GitHub.**
-
-To avoid confusion and to help you resolve your issue as quickly as possible, you should provide a detailed explanation of the problem you are experiencing.
-
-### Procedure for reporting a new issue
-
-1. Go to [this page](https://github.com/skipperbent/simple-php-router/issues/new) to create a new issue.
-2. Add a title that describes your problems in as few words as possible.
-3. Copy and paste the template below in the description of your issue and replace each step with your own information. If the step is not relevant for your issue you can delete it.
-
-### Issue template
-
-Copy and paste the template below into the description of your new issue and replace it with your own information.
-
-You can check the [Debug information](#debug-information) section to see how to generate the debug-info.
-
-<pre>
-### Description
-
-The library fails to render the route `/user/æsel` which contains one parameter using a custom regular expression for matching special foreign characters. Routes without special characters like `/user/tom` renders correctly.
-
-### Steps to reproduce the error
-
-1. Add the following route:
-
-```php
-SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
-```
-
-2. Navigate to `/user/æsel` in browser.
-
-3. `NotFoundHttpException` is thrown by library.
-
-### Route and/or callback for failing route
-
-*Route:*
-
-```php
-SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
-```
-
-*Callback:*
-
-```php
-public function show($username) {
-    return sprintf('Username is: %s', $username);
-}
-```
-
-### Debug info
-
-```php
-array (
-  'url' => 
-  Pecee\Http\Url::__set_state(array(
-     'originalUrl' => NULL,
-     'data' => 
-    array (
-      'scheme' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'user' => NULL,
-      'pass' => NULL,
-      'path' => NULL,
-      'query' => NULL,
-      'fragment' => NULL,
-    ),
-  )),
-  'method' => '',
-  'host' => NULL,
-  'loaded_routes' => 
-  array (
-  ),
-  'all_routes' => 
-  array (
-    0 => 
-    Pecee\SimpleRouter\Route\RouteUrl::__set_state(array(
-       'url' => '/user/{name}/',
-       'name' => NULL,
-       'regex' => NULL,
-       'filterEmptyParams' => true,
-       'defaultParameterRegex' => NULL,
-       'paramModifiers' => '{}',
-       'paramOptionalSymbol' => '?',
-       'urlRegex' => '/^%s\\/?$/u',
-       'group' => NULL,
-       'parent' => NULL,
-       'callback' => 'UserController@show',
-       'defaultNamespace' => NULL,
-       'namespace' => NULL,
-       'requestMethods' => 
-      array (
-        0 => 'get',
-      ),
-       'where' => 
-      array (
-        'name' => '[\\w]+',
-      ),
-       'parameters' => 
-      array (
-        'name' => NULL,
-      ),
-       'originalParameters' => 
-      array (
-      ),
-       'middlewares' => 
-      array (
-      ),
-    )),
-  ),
-  'boot_managers' => 
-  array (
-  ),
-  'csrf_verifier' => NULL,
-  'log' => 
-  array (
-    0 => 
-    array (
-      'message' => 'Started routing request (rewrite: no)',
-      'time' => '0.0000069141',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    1 => 
-    array (
-      'message' => 'Loading routes',
-      'time' => '0.0036418438',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 273,
-        'function' => 'loadRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    2 => 
-    array (
-      'message' => 'Processing routes',
-      'time' => '0.0069010258',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 251,
-        'function' => 'processRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    3 => 
-    array (
-      'message' => 'Processing route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
-      'time' => '0.0099139214',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 251,
-        'function' => 'processRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    4 => 
-    array (
-      'message' => 'Finished loading routes',
-      'time' => '0.0130679607',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 273,
-        'function' => 'loadRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    5 => 
-    array (
-      'message' => 'Matching route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
-      'time' => '0.0160858631',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    6 => 
-    array (
-      'message' => 'Route not found: "/"',
-      'time' => '0.0193598270',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    7 => 
-    array (
-      'message' => 'Starting exception handling for "Pecee\\SimpleRouter\\Exceptions\\NotFoundHttpException"',
-      'time' => '0.0229449272',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 345,
-        'function' => 'handleException',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    8 => 
-    array (
-      'message' => 'Finished exception handling - exception not handled, throwing',
-      'time' => '0.0258929729',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 345,
-        'function' => 'handleException',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-  ),
-  'router_output' => NULL,
-  'library_version' => false,
-  'php_version' => '7.2.0',
-  'server_params' => 
-  array (),
-)
-```
-
-</pre>
-
-Remember that a more detailed issue- description and debug-info might suck to write, but it will help others understand- and resolve your issue without asking for the information.
-
-**Note:** 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. Providing the necessary steps to reproduce the error within your description, adding useful debugging info etc. will help others quickly resolve the issue you are reporting.
-
----
-
 # Routes
 
 Remember the ```routes.php``` file you required in your ```index.php```? This file be where you place all your custom rules for routing.
@@ -1226,7 +857,6 @@ class CustomMiddleware implements Middleware {
         // If authentication failed, redirect request to user-login page.
         if($request->user === null) {
             $request->setRewriteUrl(url('user.login'));
-            return $request;
         }
 
     }
@@ -1276,7 +906,7 @@ class CustomExceptionHandler implements IExceptionHandler
 
 		/* You can use the exception handler to format errors depending on the request and type. */
 
-		if (stripos($request->getUrl()->getPath(), '/api') !== false) {
+		if ($request->getUrl()->contains('/api')) {
 
 			response()->json([
 				'error' => $error->getMessage(),
@@ -1289,10 +919,9 @@ class CustomExceptionHandler implements IExceptionHandler
 		if($error instanceof NotFoundHttpException) {
 
 			// Render custom 404-page
-
 			$request->setRewriteCallback('Demo\Controllers\PageController@notFound');
-			return $request;
-
+			return;
+			
 		}
 
 		throw $error;
@@ -1641,6 +1270,383 @@ class Router extends SimpleRouter {
 
 ---
 
+# Help and support
+
+This section will go into details on how to debug the router and answer some of the commonly asked questions- and issues.
+
+## Common issues and fixes
+
+This section will go over common issues and how to resolve them.
+
+## Debugging
+
+This section will show you how to write unit-tests for the router, view useful debugging information and answer some of the frequently asked questions. 
+
+It will also covers how to report any issue you might encounter. 
+
+### Creating unit-tests
+
+The easiest and fastest way to debug any issues with the router, is to create a unit-test that represents the issue you are experiencing.
+
+Unit-tests use a special `TestRouter` class, which simulates a request-method and requested url of a browser.
+
+The `TestRouter` class can return the output directly or render a route silently.
+
+```php
+public function testUnicodeCharacters()
+{
+    // Add route containing two optional paramters with special spanish characters like "í".
+    TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+    
+    // Start the routing and simulate the url "/cursos/listado/especialidad/cirugía local".
+    TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'GET');
+    
+    // Verify that the url for the loaded route matches the expected route.
+    $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+    
+    // Start the routing and simulate the url "/test/Dermatología" using "GET" as request-method.
+    TestRouter::debugNoReset('/test/Dermatología', 'GET');
+
+    // Another route containing one parameter with special spanish characters like "í".
+    TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
+
+    // Get all parameters parsed by the loaded route.
+    $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
+
+    // Check that the parameter named "param" matches the exspected value.
+    $this->assertEquals('Dermatología', $parameters['param']);
+
+    // Add route testing danish special characters like "ø".
+    TestRouter::get('/category/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+    
+    // Start the routing and simulate the url "/kategory/økse" using "GET" as request-method.
+    TestRouter::debugNoReset('/category/økse', 'GET');
+    
+    // Validate that the URL of the loaded-route matches the expected url.
+    $this->assertEquals('/category/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+    // Reset the router, so other tests wont inherit settings or the routes we've added.
+    TestRouter::router()->reset();
+}
+```
+
+#### Using the TestRouter helper
+
+Depending on your test, you can use the methods below when rendering routes in your unit-tests.
+
+
+| Method        | Description  |
+| ------------- |-------------|
+| ```TestRouter::debug($url, $method)``` | Will render the route without returning anything. Exceptions will be thrown and the router will be reset automatically. |
+| ```TestRouter::debugOutput($url, $method)``` | Will render the route and return any value that the route might output. Manual reset required by calling `TestRouter::router()->reset()`. |
+| ```TestRouter::debugNoReset($url, $method);```  | Will render the route without resetting the router. Useful if you need to get loaded route, parameters etc. from the router. Manual reset required by calling `TestRouter::router()->reset()`. |
+
+### Debug information
+
+The library can output debug-information, which contains information like loaded routes, the parsed request-url etc. It also contains info which are important when reporting a new issue like PHP-version, library version, server-variables, router debug log etc.
+
+You can activate the debug-information by calling the alternative start-method. 
+
+The example below will start the routing an return array with debugging-information
+
+**Example:**
+
+```php
+$debugInfo = SimpleRouter::startDebug();
+echo sprintf('<pre>%s</pre>', var_export($debugInfo));
+exit;
+```
+
+**The example above will provide you with an output containing:**
+
+| Key               | Description  |
+| -------------     |------------- |
+| `url`             | The parsed request-uri. This url should match the url in the browser.|
+| `method`          | The browsers request method (example: `GET`, `POST`, `PUT`, `PATCH`, `DELETE` etc).|
+| `host`            | The website host (example: `domain.com`).|
+| `loaded_routes`   | List of all the routes that matched the `url` and that has been rendered/loaded. |
+| `all_routes`      | All available routes |
+| `boot_managers`   | All available BootManagers |
+| `csrf_verifier`   | CsrfVerifier class |
+| `log`             | List of debug messages/log from the router. |
+| `router_output`   | The rendered callback output from the router. |
+| `library_version` | The version of simple-php-router you are using. |
+| `php_version`     | The version of PHP you are using. |
+| `server_params`   | List of all `$_SERVER` variables/headers. | 
+
+#### Benchmark and logging
+
+You can activate benchmark debugging/logging by calling `setDebugEnabled` method on the `Router` instance.
+
+You have to enable debugging BEFORE starting the routing.
+
+**Example:**
+
+```php
+SimpleRouter::router()->setDebugEnabled(true);
+SimpleRouter::start();
+```
+
+When the routing is complete, you can get the debug-log by calling the `getDebugLog()` on the `Router` instance. This will return an `array` of log-messages each containing execution time, trace info and debug-message.
+
+**Example:**
+
+```php
+$messages = SimpleRouter::router()->getDebugLog();
+```
+
+## Reporting a new issue
+
+**Before reporting your issue, make sure that the issue you are experiencing aren't already answered in the [Common errors](#common-errors) section or by searching the [closed issues](https://github.com/skipperbent/simple-php-router/issues?q=is%3Aissue+is%3Aclosed) page on GitHub.**
+
+To avoid confusion and to help you resolve your issue as quickly as possible, you should provide a detailed explanation of the problem you are experiencing.
+
+### Procedure for reporting a new issue
+
+1. Go to [this page](https://github.com/skipperbent/simple-php-router/issues/new) to create a new issue.
+2. Add a title that describes your problems in as few words as possible.
+3. Copy and paste the template below in the description of your issue and replace each step with your own information. If the step is not relevant for your issue you can delete it.
+
+### Issue template
+
+Copy and paste the template below into the description of your new issue and replace it with your own information.
+
+You can check the [Debug information](#debug-information) section to see how to generate the debug-info.
+
+<pre>
+### Description
+
+The library fails to render the route `/user/æsel` which contains one parameter using a custom regular expression for matching special foreign characters. Routes without special characters like `/user/tom` renders correctly.
+
+### Steps to reproduce the error
+
+1. Add the following route:
+
+```php
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+```
+
+2. Navigate to `/user/æsel` in browser.
+
+3. `NotFoundHttpException` is thrown by library.
+
+### Route and/or callback for failing route
+
+*Route:*
+
+```php
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+```
+
+*Callback:*
+
+```php
+public function show($username) {
+    return sprintf('Username is: %s', $username);
+}
+```
+
+### Debug info
+
+```php
+array (
+  'url' => 
+  Pecee\Http\Url::__set_state(array(
+     'originalUrl' => NULL,
+     'data' => 
+    array (
+      'scheme' => NULL,
+      'host' => NULL,
+      'port' => NULL,
+      'user' => NULL,
+      'pass' => NULL,
+      'path' => NULL,
+      'query' => NULL,
+      'fragment' => NULL,
+    ),
+  )),
+  'method' => '',
+  'host' => NULL,
+  'loaded_routes' => 
+  array (
+  ),
+  'all_routes' => 
+  array (
+    0 => 
+    Pecee\SimpleRouter\Route\RouteUrl::__set_state(array(
+       'url' => '/user/{name}/',
+       'name' => NULL,
+       'regex' => NULL,
+       'filterEmptyParams' => true,
+       'defaultParameterRegex' => NULL,
+       'paramModifiers' => '{}',
+       'paramOptionalSymbol' => '?',
+       'urlRegex' => '/^%s\\/?$/u',
+       'group' => NULL,
+       'parent' => NULL,
+       'callback' => 'UserController@show',
+       'defaultNamespace' => NULL,
+       'namespace' => NULL,
+       'requestMethods' => 
+      array (
+        0 => 'get',
+      ),
+       'where' => 
+      array (
+        'name' => '[\\w]+',
+      ),
+       'parameters' => 
+      array (
+        'name' => NULL,
+      ),
+       'originalParameters' => 
+      array (
+      ),
+       'middlewares' => 
+      array (
+      ),
+    )),
+  ),
+  'boot_managers' => 
+  array (
+  ),
+  'csrf_verifier' => NULL,
+  'log' => 
+  array (
+    0 => 
+    array (
+      'message' => 'Started routing request (rewrite: no)',
+      'time' => '0.0000069141',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    1 => 
+    array (
+      'message' => 'Loading routes',
+      'time' => '0.0036418438',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 273,
+        'function' => 'loadRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    2 => 
+    array (
+      'message' => 'Processing routes',
+      'time' => '0.0069010258',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 251,
+        'function' => 'processRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    3 => 
+    array (
+      'message' => 'Processing route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
+      'time' => '0.0099139214',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 251,
+        'function' => 'processRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    4 => 
+    array (
+      'message' => 'Finished loading routes',
+      'time' => '0.0130679607',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 273,
+        'function' => 'loadRoutes',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    5 => 
+    array (
+      'message' => 'Matching route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
+      'time' => '0.0160858631',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    6 => 
+    array (
+      'message' => 'Route not found: "/"',
+      'time' => '0.0193598270',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
+        'line' => 57,
+        'function' => 'routeRequest',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    7 => 
+    array (
+      'message' => 'Starting exception handling for "Pecee\\SimpleRouter\\Exceptions\\NotFoundHttpException"',
+      'time' => '0.0229449272',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 345,
+        'function' => 'handleException',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+    8 => 
+    array (
+      'message' => 'Finished exception handling - exception not handled, throwing',
+      'time' => '0.0258929729',
+      'trace' => 
+      array (
+        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
+        'line' => 345,
+        'function' => 'handleException',
+        'class' => 'Pecee\\SimpleRouter\\Router',
+        'type' => '->',
+      ),
+    ),
+  ),
+  'router_output' => NULL,
+  'library_version' => false,
+  'php_version' => '7.2.0',
+  'server_params' => 
+  array (),
+)
+```
+
+</pre>
+
+Remember that a more detailed issue- description and debug-info might suck to write, but it will help others understand- and resolve your issue without asking for the information.
+
+**Note:** 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. Providing the necessary steps to reproduce the error within your description, adding useful debugging info etc. will help others quickly resolve the issue you are reporting.
+
+---
+
 # Credits
 
 ## Sites

From a9c03f927120ffa302fed6591ac6d077ec1cb675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 18:17:42 +0200
Subject: [PATCH 05/25] Development - Updated `helpers.php` and helpers example
 in documentation. - MalformedUrlException is now handled properly by Router
 to avoid phpStorm syntax highlights in routes. - Added `getUrlCopy` to
 `Request` class, used to clone the current route (to keep domain etc.) -
 `setUrl` in `Request` are now strict and requires `Url` object and no longer
 accepts strings. - Renamed `hasRewrite` property to `hasPendingRewrite` in
 `Request` class. - Renamed `hasRewrite` and `setHasRewrite` methods to
 `hasPendingRewrite` and `setHasPendingRewrite` in `Request` class. - Added
 better usage of `Url` class. When calling `url` you can now use the methods
 on the `Url` class to filter params, get relative/absolute url etc. See
 documentation for more info. - Renamed `get` method to `getValue` in
 `InputHandler` class. - Renamed `getObject` to `get` and removed
 `$defaultValue` argument in `InputHandler` class. - Optimized `InputHandler`
 class. - Fixed issue with `$token` not being proper string in
 `BaseCsrfVerifier` when token is not found. - Added php.ini configuration
 settings to `setcookie` in `CookieTokenProvider` for improved security. -
 Added `$router` parameter to `boot` method in `IRouterBootManager` which
 allows for further manipulation of the router within the bootmanager. -
 Renamed `$processingRoute` property to `$isProcessingRoute` in `Router`
 class. - Fixed `reset` method not resetting CSRF-verifier in `Router` class.
 - Moved `arrayToParams` helper-method from `Router` to `Url` class. - Began
 to add Event-functionality to router. - Added `addEventHandler` method to
 `SimpleRouter` class. - Moved
 `Pecee\SimpleRouter\Handler\CallbackExceptionHandler` to
 `Pecee\SimpleRouter\Handlers\CallbackExceptionHandler`. - Moved
 `Pecee\SimpleRouter\Handler\IExceptionHandler` to
 `Pecee\SimpleRouter\Handlers\IExceptionHandler`. - Added Events section to
 documentation. - Added more information on url-handling in documentation. -
 Optimisations.

---
 README.md                                     | 521 ++++++++++--------
 helpers.php                                   |  33 +-
 src/Pecee/Http/Input/InputHandler.php         |  41 +-
 .../Http/Middleware/BaseCsrfVerifier.php      |  13 +-
 src/Pecee/Http/Request.php                    |  83 ++-
 .../Http/Security/CookieTokenProvider.php     |   2 +-
 src/Pecee/Http/Url.php                        | 362 ++++++++++--
 .../SimpleRouter/Event/EventArgument.php      |  83 +++
 .../SimpleRouter/Event/IEventArgument.php     |  46 ++
 .../Handlers/CallbackExceptionHandler.php     |   4 +-
 .../Handlers/DebugEventHandler.php            |  62 +++
 .../SimpleRouter/Handlers/EventHandler.php    | 178 ++++++
 .../SimpleRouter/Handlers/IEventHandler.php   |  26 +
 .../Handlers/IExceptionHandler.php            |   2 +-
 src/Pecee/SimpleRouter/IRouterBootManager.php |   3 +-
 src/Pecee/SimpleRouter/Route/IGroupRoute.php  |   2 +-
 .../SimpleRouter/Route/ILoadableRoute.php     |   4 +-
 .../SimpleRouter/Route/LoadableRoute.php      |   2 +-
 src/Pecee/SimpleRouter/Route/Route.php        |   2 +-
 .../SimpleRouter/Route/RouteController.php    |   2 +-
 src/Pecee/SimpleRouter/Route/RouteGroup.php   |   2 +-
 .../SimpleRouter/Route/RoutePartialGroup.php  |   9 +-
 .../SimpleRouter/Route/RouteResource.php      |   8 +-
 src/Pecee/SimpleRouter/Router.php             | 243 +++++---
 src/Pecee/SimpleRouter/SimpleRouter.php       |  80 +--
 .../Dummy/Handler/ExceptionHandler.php        |   2 +-
 .../Dummy/Handler/ExceptionHandlerFirst.php   |   4 +-
 .../Dummy/Handler/ExceptionHandlerSecond.php  |   4 +-
 .../Dummy/Handler/ExceptionHandlerThird.php   |   2 +-
 .../Dummy/Managers/TestBootManager.php        |  32 ++
 .../Dummy/Security/SilentTokenProvider.php    |  41 ++
 tests/Pecee/SimpleRouter/EventHandlerTest.php |  75 +++
 tests/Pecee/SimpleRouter/InputHandlerTest.php |  30 +
 tests/Pecee/SimpleRouter/RouterRouteTest.php  |   8 +-
 tests/TestRouter.php                          |   6 +-
 35 files changed, 1528 insertions(+), 489 deletions(-)
 create mode 100644 src/Pecee/SimpleRouter/Event/EventArgument.php
 create mode 100644 src/Pecee/SimpleRouter/Event/IEventArgument.php
 rename src/Pecee/{ => SimpleRouter}/Handlers/CallbackExceptionHandler.php (90%)
 create mode 100644 src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
 create mode 100644 src/Pecee/SimpleRouter/Handlers/EventHandler.php
 create mode 100644 src/Pecee/SimpleRouter/Handlers/IEventHandler.php
 rename src/Pecee/{ => SimpleRouter}/Handlers/IExceptionHandler.php (84%)
 create mode 100644 tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php
 create mode 100644 tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php
 create mode 100644 tests/Pecee/SimpleRouter/EventHandlerTest.php
 create mode 100644 tests/Pecee/SimpleRouter/InputHandlerTest.php

diff --git a/README.md b/README.md
index 8034920..a592726 100644
--- a/README.md
+++ b/README.md
@@ -57,12 +57,14 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 	- [Using custom exception handlers](#using-custom-exception-handlers)
 
 - [Urls](#urls)
+    - [Get the current url](#get-the-current-url)
  	- [Get by name (single route)](#get-by-name-single-route)
  	- [Get by name (controller route)](#get-by-name-controller-route)
  	- [Get by class](#get-by-class)
- 	- [Get by custom names for methods on a controller/resource route](#using-custom-names-for-methods-on-a-controllerresource-route)
+ 	- [Using custom names for methods on a controller/resource route](#using-custom-names-for-methods-on-a-controllerresource-route)
  	- [Getting REST/resource controller urls](#getting-restresource-controller-urls)
- 	- [Get the current url](#get-the-current-url)
+ 	- [Manipulating url](#manipulating-url)
+ 	- [Useful url tricks](#useful-url-tricks)
 
 - [Input & parameters](#input--parameters)
     - [Using the Input class to manage parameters](#using-the-input-class-to-manage-parameters)
@@ -70,6 +72,11 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 	    - [Get parameter object](#get-parameter-object)
 	    - [Managing files](#managing-files)
 	    - [Get all parameters](#get-all-parameters)
+	    
+- [Events](#events)
+    - [Available events](#available-events)
+    - [Registering new event](#registering-new-event)
+    - [Custom EventHandlers](#custom-eventhandlers)
 
 - [Advanced](#advanced)
 	- [Url rewriting](#url-rewriting)
@@ -298,7 +305,12 @@ We recommend that you add these helper functions to your project. These will all
 To implement the functions below, simply copy the code to a new file and require the file before initializing the router or copy the `helpers.php` we've included in this library.
 
 ```php
+<?php
+
 use Pecee\SimpleRouter\SimpleRouter as Router;
+use \Pecee\Http\Url;
+use \Pecee\Http\Response;
+use \Pecee\Http\Request;
 
 /**
  * Get url for a route by using either name/alias, class or method name.
@@ -315,29 +327,26 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
  * @param string|null $name
  * @param string|array|null $parameters
  * @param array|null $getParams
- * @return string
+ * @return \Pecee\Http\Url
  * @throws \InvalidArgumentException
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function url($name = null, $parameters = null, $getParams = null)
+function url(?string $name = null, $parameters = null, ?array $getParams = null): Url
 {
     return Router::getUrl($name, $parameters, $getParams);
 }
 
 /**
  * @return \Pecee\Http\Response
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function response()
+function response(): Response
 {
     return Router::response();
 }
 
 /**
  * @return \Pecee\Http\Request
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function request()
+function request(): Request
 {
     return Router::request();
 }
@@ -347,19 +356,27 @@ function request()
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\InputHandler|string
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
  */
 function input($index = null, $defaultValue = null, $methods = null)
 {
     if ($index !== null) {
-        return request()->getInputHandler()->get($index, $defaultValue, $methods);
+
+        if ($defaultValue !== null) {
+            return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
+        }
+
+        return request()->getInputHandler()->get($index, $methods);
     }
 
     return request()->getInputHandler();
 }
 
-function redirect($url, $code = null)
+/**
+ * @param string $url
+ * @param int|null $code
+ */
+function redirect(string $url, ?int $code = null): void
 {
     if ($code !== null) {
         response()->httpCode($code);
@@ -371,9 +388,8 @@ function redirect($url, $code = null)
 /**
  * Get current csrf-token
  * @return string|null
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function csrf_token()
+function csrf_token(): ?string
 {
     $baseVerifier = Router::router()->getCsrfVerifier();
     if ($baseVerifier !== null) {
@@ -805,7 +821,7 @@ class SessionTokenProvider implements ITokenProvider
     /**
      * Refresh existing token
      */
-    public function refresh()
+    public function refresh(): void
     {
         // Implement your own functionality here...
     }
@@ -816,7 +832,18 @@ class SessionTokenProvider implements ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token)
+    public function validate($token): bool
+    {
+        // Implement your own functionality here...
+    }
+    
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string 
     {
         // Implement your own functionality here...
     }
@@ -847,10 +874,11 @@ namespace Demo\Middlewares;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 
-class CustomMiddleware implements Middleware {
-
-    public function handle(Request $request) {
+class CustomMiddleware implements IMiddleware {
 
+    public function handle(Request $request): void 
+    {
+    
         // Authenticate user, will be available using request()->user
         $request->user = User::authenticate();
 
@@ -882,9 +910,11 @@ The code should be placed in the file that contains your routes.
 Router::get('/not-found', 'PageController@notFound');
 
 Router::error(function(Request $request, \Exception $exception) {
-    if($exception instanceof NotFoundHttpException && $exception->getCode() == 404) {
+
+    if($exception instanceof NotFoundHttpException && $exception->getCode() === 404) {
         response()->redirect('/not-found');
     }
+    
 });
 ```
 
@@ -895,13 +925,13 @@ This is a basic example of an ExceptionHandler implementation (please see "[Easi
 ```php
 namespace Demo\Handlers;
 
-use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 
 class CustomExceptionHandler implements IExceptionHandler
 {
-	public function handleError(Request $request, \Exception $error)
+	public function handleError(Request $request, \Exception $error): void
 	{
 
 		/* You can use the exception handler to format errors depending on the request and type. */
@@ -937,17 +967,33 @@ class CustomExceptionHandler implements IExceptionHandler
 
 By default all controller and resource routes will use a simplified version of their url as name.
 
+You easily use the `url()` shortcut helper function to retrieve urls for your routes or manipulate the current url.
+
+`url()` will return a `Url` object which will return a `string` when rendered, so it can be used safely in templates etc. but 
+contains all the useful helpers methods in the `Url` class like `contains`, `indexOf` etc. 
+Check the [Useful url tricks](#useful-url-tricks) below.
+
+### Get the current url
+
+It has never been easier to get and/or manipulate the current url.
+
+The example below shows you how to get the current url:
+
+```php
+# output: /current-url
+url();
+```
+
 ### Get by name (single route)
 
 ```php
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
 
+# output: /product-view/22/?category=shoes
 url('product', ['id' => 22], ['category' => 'shoes']);
-url('product', null, ['category' => 'shoes']);
 
-# output
-# /product-view/22/?category=shoes
-# /product-view/?category=shoes
+# output: /product-view/?category=shoes
+url('product', null, ['category' => 'shoes']);
 ```
 
 ### Get by name (controller route)
@@ -955,14 +1001,14 @@ url('product', null, ['category' => 'shoes']);
 ```php
 SimpleRouter::controller('/images', ImagesController::class, ['as' => 'picture']);
 
+# output: /images/view/?category=shows
 url('picture@getView', null, ['category' => 'shoes']);
-url('picture', 'getView', ['category' => 'shoes']);
-url('picture', 'view');
 
-# output
-# /images/view/?category=shows
-# /images/view/?category=shows
-# /images/view/
+# output: /images/view/?category=shows
+url('picture', 'getView', ['category' => 'shoes']);
+
+# output: /images/view/
+url('picture', 'view');
 ```
 
 ### Get by class
@@ -971,12 +1017,11 @@ url('picture', 'view');
 SimpleRouter::get('/product-view/{id}', 'ProductsController@show', ['as' => 'product']);
 SimpleRouter::controller('/images', 'ImagesController');
 
+# output: /product-view/22/?category=shoes
 url('ProductsController@show', ['id' => 22], ['category' => 'shoes']);
-url('ImagesController@getImage', null, ['id' => 22]);
 
-# output
-# /product-view/22/?category=shoes
-# /images/image/?id=22
+# output: /images/image/?id=22
+url('ImagesController@getImage', null, ['id' => 22]);
 ```
 
 ### Using custom names for methods on a controller/resource route
@@ -995,30 +1040,67 @@ url('gadgets.iphone');
 ```php
 SimpleRouter::resource('/phones', PhonesController::class);
 
+# output: /phones/
 url('phones');
+
+# output: /phones/
 url('phones.index');
+
+# output: /phones/create/
 url('phones.create');
+
+# output: /phones/edit/
 url('phones.edit');
-
-// etc..
-
-# output
-# /phones/
-# /phones/create/
-# /phones/edit/
 ```
 
-### Get the current url
+### Manipulating url
+
+You can easily manipulate the query-strings, by adding your get param arguments.
 
 ```php
-url();
-url(null, null, ['q' => 'cars']);
+# output: /current-url?q=cars
 
-# output
-# /CURRENT-URL/
-# /CURRENT-URL/?q=cars
+url(null, null, ['q' => 'cars']);
 ```
 
+You can remove a query-string parameter by setting the value to `null`. 
+
+The example below will remove any query-string parameter named `q` from the url but keep all others query-string parameters:
+
+```php
+$url = url()->removeParam('q');
+```
+
+For more information please check the [Useful url tricks](#useful-url-tricks) section of the documentation.
+
+### Useful url tricks
+
+Calling `url` will always return a `Url` object. Upon rendered it will return a `string` of the relative `url`, so it's safe to use in templates etc.
+
+However this allow us to use the useful methods on the `Url` object like `indexOf` and `contains` or retrieve specific parts of the url like the path, querystring parameters, host etc. You can also manipulate the url like removing- or adding parameters, changing host and more.
+
+In the example below, we check if the current url contains the `/api` part.
+
+```php
+if(url()->contains('/api')) {
+    
+    // ... do stuff
+    
+}
+```
+
+As mentioned earlier, you can also use the `Url` object to show specific parts of the url or control what part of the url you want.
+
+```php
+# Grab the query-string parameter id from the current-url.
+$id = url()->getParam('id');
+
+# Get the absolute url for the current url.
+$absoluteUrl = url()->getAbsoluteUrl();
+```
+
+For more available methods please check the `Pecee\Http\Url` class.
+
 # Input & parameters
 
 ## Using the Input class to manage parameters
@@ -1062,7 +1144,7 @@ $object = input()->getObject($index, $defaultValue = null, $methods = null);
  * $defaultValue is returned if the value is empty.
  */
 
-$id = input()->get($index, $defaultValue, $method);
+$id = input()->getValue($index, $defaultValue, $method);
 
 # -- shortcut to above --
 
@@ -1079,6 +1161,10 @@ $object = input($index, $defaultValue, 'file');
 $object = input()->findGet($index, $defaultValue);
 $object = input()->findPost($index, $defaultValue);
 $object = input()->findFile($index, $defaultValue);
+
+# -- get the full object --
+
+$object = input()->get($index, 'post', 'get');
 ```
 
 ### Managing files
@@ -1143,6 +1229,134 @@ $siteId = input('site_id', 2, ['post', 'get']);
 
 ---
 
+# Events
+
+This section will help you understand how to register your own callbacks to events in the router.
+It will also cover the basics of event-handlers; how to use the handlers provided with the router and how to create your own custom event-handlers.
+
+## Available events
+
+This section contains all available events that can be registered using the `EventHandler`.
+
+| Name                                      | Description               | 
+| -------------                             |-------------                      | 
+| `EventHandler::EVENT_ALL`                 | Fires when a event is triggered. |
+| `EventHandler::EVENT_INIT`                | Fires when router is initializing and before routes are loaded. |
+| `EventHandler::EVENT_LOAD`                | Fires when all routes has been loaded and rendered, just before the output is returned. |
+| `EventHandler::EVENT_REWRITE`             | Fires when a url-rewrite is and just before the routes are re-initialized. |
+| `EventHandler::EVENT_BOOT`                | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
+| `EventHandler::EVENT_RENDER_BOOTMANAGER`  | Fires before a boot-manager is rendered. |
+| `EventHandler::EVENT_LOAD_ROUTES`         | Fires when the router is about to load all routes. |
+| `EventHandler::EVENT_FIND_ROUTE`          | Fires whenever the `findRoute` method is called within the `Router`. This usually happens when the router tries to find routes that contains a certain url, usually after the `EventHandler::EVENT_GET_URL` event. |
+| `EventHandler::EVENT_GET_URL`             | Fires whenever the `Router::getUrl` method or `url`-helper function is called and the router tries to find the route. |
+| `EventHandler::EVENT_MATCH_ROUTE`         | Fires when a route is matched and valid (correct request-type etc). and before the route is rendered. |
+| `EventHandler::EVENT_RENDER_ROUTE`        | Fires before a route is rendered. |
+| `EventHandler::EVENT_LOAD_EXCEPTIONS`     | Fires when the router is loading exception-handlers. |
+| `EventHandler::EVENT_RENDER_EXCEPTION`    | Fires before the router is rendering a exception-handler. |
+| `EventHandler::EVENT_RENDER_MIDDLEWARE`   | Fires before a middleware is rendered. |
+| `EventHandler::EVENT_RENDER_CSRF`         | Fires before the CSRF-verifier is rendered. |
+
+## Registering new event
+
+To register a new event you need to create a new instance of the `EventHandler` object. On this object you can add as many callbacks as you like by calling the `registerEvent` method.
+
+When you've registered events, make sure to add it to the router by calling 
+`SimpleRouter::addEventHandler()`. We recommend that you add your event-handlers within your `routes.php`.
+
+**Example:**
+
+```php
+use Pecee\SimpleRouter\Handlers\EventHandler;
+use Pecee\SimpleRouter\Event\EventArgument;
+
+// --- your routes goes here ---
+
+$eventHandler = new EventHandler();
+$eventHandler->register(EventHandler::EVENT_RENDER_ROUTE, function(EventArgument $argument) {
+   
+   // Fires when route is rendered ...
+    
+});
+
+SimpleRouter::addEventHandler($eventHandler);
+
+```
+
+## Custom EventHandlers
+
+`EventHandler` is the class that manages events and must inherit from the `IEventHandler` interface. The handler knows how to handle events for the given handler-type. 
+
+Most of the time the basic `\Pecee\SimpleRouter\Handler\EventHandler` class will be more than enough for most people as you simply register an event which fires when triggered.
+
+Let's go over how to create your very own event-handler class.
+
+Below is a basic example of a custom event-handler called `DatabaseDebugHandler`. The idea of the sample below is to logs all events to the database when triggered. Hopefully it will be enough to give you an idea on how the event-handlers work.
+
+```php
+namespace Demo\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class DatabaseDebugHandler implements IEventHandler
+{
+
+    /**
+     * Debug callback
+     * @var \Closure
+     */
+    protected $callback;
+
+    public function __construct()
+    {
+        $this->callback = function (EventArgument $argument) {
+            // todo: store log in database
+        };
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array
+    {
+        return [
+            $name => [
+                $this->callback,
+            ],
+        ];
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array ...$eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, ...$eventArgs): void
+    {
+        $callback = $this->callback;
+        $callback(new EventArgument($router, $eventArgs));
+    }
+
+    /**
+     * Set debug callback
+     *
+     * @param \Closure $event
+     */
+    public function setCallback(\Closure $event): void
+    {
+        $this->callback = $event;
+    }
+
+}
+```
+
+---
+
 # Advanced
 
 ## Url rewriting
@@ -1173,10 +1387,19 @@ To interfere with the router, we create a class that implements the ```IRouterBo
 ```php
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\IRouterBootManager;
+use Pecee\SimpleRouter\Router;
 
-class CustomRouterRules implement IRouterBootManager {
+class CustomRouterRules implement IRouterBootManager 
+{
 
-    public function boot(Request $request) {
+    /**
+     * Called when router is booting and before the routes is loaded.
+     *
+     * @param \Pecee\SimpleRouter\Router $router
+     * @param \Pecee\Http\Request $request
+     */
+    public function boot(\Pecee\SimpleRouter\Router $router, \Pecee\Http\Request $request): void
+    {
 
         $rewriteRules = [
             '/my-cat-is-beatiful' => '/article/view/1',
@@ -1449,196 +1672,10 @@ public function show($username) {
 ### Debug info
 
 ```php
-array (
-  'url' => 
-  Pecee\Http\Url::__set_state(array(
-     'originalUrl' => NULL,
-     'data' => 
-    array (
-      'scheme' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'user' => NULL,
-      'pass' => NULL,
-      'path' => NULL,
-      'query' => NULL,
-      'fragment' => NULL,
-    ),
-  )),
-  'method' => '',
-  'host' => NULL,
-  'loaded_routes' => 
-  array (
-  ),
-  'all_routes' => 
-  array (
-    0 => 
-    Pecee\SimpleRouter\Route\RouteUrl::__set_state(array(
-       'url' => '/user/{name}/',
-       'name' => NULL,
-       'regex' => NULL,
-       'filterEmptyParams' => true,
-       'defaultParameterRegex' => NULL,
-       'paramModifiers' => '{}',
-       'paramOptionalSymbol' => '?',
-       'urlRegex' => '/^%s\\/?$/u',
-       'group' => NULL,
-       'parent' => NULL,
-       'callback' => 'UserController@show',
-       'defaultNamespace' => NULL,
-       'namespace' => NULL,
-       'requestMethods' => 
-      array (
-        0 => 'get',
-      ),
-       'where' => 
-      array (
-        'name' => '[\\w]+',
-      ),
-       'parameters' => 
-      array (
-        'name' => NULL,
-      ),
-       'originalParameters' => 
-      array (
-      ),
-       'middlewares' => 
-      array (
-      ),
-    )),
-  ),
-  'boot_managers' => 
-  array (
-  ),
-  'csrf_verifier' => NULL,
-  'log' => 
-  array (
-    0 => 
-    array (
-      'message' => 'Started routing request (rewrite: no)',
-      'time' => '0.0000069141',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    1 => 
-    array (
-      'message' => 'Loading routes',
-      'time' => '0.0036418438',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 273,
-        'function' => 'loadRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    2 => 
-    array (
-      'message' => 'Processing routes',
-      'time' => '0.0069010258',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 251,
-        'function' => 'processRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    3 => 
-    array (
-      'message' => 'Processing route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
-      'time' => '0.0099139214',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 251,
-        'function' => 'processRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    4 => 
-    array (
-      'message' => 'Finished loading routes',
-      'time' => '0.0130679607',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 273,
-        'function' => 'loadRoutes',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    5 => 
-    array (
-      'message' => 'Matching route "Pecee\\SimpleRouter\\Route\\RouteUrl"',
-      'time' => '0.0160858631',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    6 => 
-    array (
-      'message' => 'Route not found: "/"',
-      'time' => '0.0193598270',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\SimpleRouter.php',
-        'line' => 57,
-        'function' => 'routeRequest',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    7 => 
-    array (
-      'message' => 'Starting exception handling for "Pecee\\SimpleRouter\\Exceptions\\NotFoundHttpException"',
-      'time' => '0.0229449272',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 345,
-        'function' => 'handleException',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-    8 => 
-    array (
-      'message' => 'Finished exception handling - exception not handled, throwing',
-      'time' => '0.0258929729',
-      'trace' => 
-      array (
-        'file' => 'E:\\Workspace\\simple-php-router\\src\\Pecee\\SimpleRouter\\Router.php',
-        'line' => 345,
-        'function' => 'handleException',
-        'class' => 'Pecee\\SimpleRouter\\Router',
-        'type' => '->',
-      ),
-    ),
-  ),
-  'router_output' => NULL,
-  'library_version' => false,
-  'php_version' => '7.2.0',
-  'server_params' => 
-  array (),
-)
-```
 
+[PASTE YOUR DEBUG-INFO HERE]
+
+```
 </pre>
 
 Remember that a more detailed issue- description and debug-info might suck to write, but it will help others understand- and resolve your issue without asking for the information.
diff --git a/helpers.php b/helpers.php
index 2c4d86d..f7234a3 100644
--- a/helpers.php
+++ b/helpers.php
@@ -1,6 +1,9 @@
 <?php
 
 use Pecee\SimpleRouter\SimpleRouter as Router;
+use \Pecee\Http\Url;
+use \Pecee\Http\Response;
+use \Pecee\Http\Request;
 
 /**
  * Get url for a route by using either name/alias, class or method name.
@@ -17,29 +20,26 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
  * @param string|null $name
  * @param string|array|null $parameters
  * @param array|null $getParams
- * @return string
+ * @return \Pecee\Http\Url
  * @throws \InvalidArgumentException
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function url($name = null, $parameters = null, $getParams = null)
+function url(?string $name = null, $parameters = null, ?array $getParams = null): Url
 {
     return Router::getUrl($name, $parameters, $getParams);
 }
 
 /**
  * @return \Pecee\Http\Response
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function response()
+function response(): Response
 {
     return Router::response();
 }
 
 /**
  * @return \Pecee\Http\Request
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function request()
+function request(): Request
 {
     return Router::request();
 }
@@ -49,19 +49,27 @@ function request()
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\InputHandler|string
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
  */
 function input($index = null, $defaultValue = null, $methods = null)
 {
     if ($index !== null) {
-        return request()->getInputHandler()->get($index, $defaultValue, $methods);
+
+        if ($defaultValue !== null) {
+            return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
+        }
+
+        return request()->getInputHandler()->get($index, $methods);
     }
 
     return request()->getInputHandler();
 }
 
-function redirect($url, $code = null)
+/**
+ * @param string $url
+ * @param int|null $code
+ */
+function redirect(string $url, ?int $code = null): void
 {
     if ($code !== null) {
         response()->httpCode($code);
@@ -73,9 +81,8 @@ function redirect($url, $code = null)
 /**
  * Get current csrf-token
  * @return string|null
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
  */
-function csrf_token()
+function csrf_token(): ?string
 {
     $baseVerifier = Router::router()->getCsrfVerifier();
     if ($baseVerifier !== null) {
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 6fee12a..1f1d0e1 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -87,7 +87,6 @@ class InputHandler
             }
 
             $keys = [$key];
-
             $files = $this->rearrangeFiles($value['name'], $keys, $value);
 
             if (isset($list[$key]) === true) {
@@ -212,31 +211,26 @@ class InputHandler
      * Get input object
      *
      * @param string $index
-     * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return IInputItem|string
+     * @param array ...$methods
+     * @return IInputItem|null
      */
-    public function getObject(string $index, ?string $defaultValue = null, $methods = null)
+    public function get(string $index, ...$methods) : ?IInputItem
     {
-        if ($methods !== null && \is_string($methods) === true) {
-            $methods = [$methods];
-        }
-
         $element = null;
 
-        if ($methods === null || \in_array('get', $methods, true) === true) {
+        if (\count($methods) === 0 || \in_array('get', $methods, true) === true) {
             $element = $this->findGet($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && \in_array('post', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('post', $methods, true) === true)) {
             $element = $this->findPost($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && \in_array('file', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('file', $methods, true) === true)) {
             $element = $this->findFile($index);
         }
 
-        return $element ?? $defaultValue;
+        return $element;
     }
 
     /**
@@ -244,14 +238,14 @@ class InputHandler
      *
      * @param string $index
      * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return InputItem|string
+     * @param array ...$methods
+     * @return string
      */
-    public function get(string $index, ?string $defaultValue = null, $methods = null)
+    public function getValue(string $index, ?string $defaultValue = null, ...$methods) : ?string
     {
-        $input = $this->getObject($index, $defaultValue, $methods);
+        $input = $this->get($index, $methods);
 
-        if ($input instanceof InputItem) {
+        if ($input !== null) {
             return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
         }
 
@@ -262,11 +256,12 @@ class InputHandler
      * Check if a input-item exist
      *
      * @param string $index
+     * @param array ...$method
      * @return bool
      */
-    public function exists(string $index): bool
+    public function exists(string $index, ...$method): bool
     {
-        return ($this->getObject($index) !== null);
+        return $this->get($index, $method) !== null;
     }
 
     /**
@@ -276,12 +271,16 @@ class InputHandler
      */
     public function all(array $filter = null): array
     {
-        $output = $_GET + $_POST;
+        $output = $_GET;
 
         if ($this->request->getMethod() === 'post') {
 
+            // Append POST data
+            $output += $_POST;
+
             $contents = file_get_contents('php://input');
 
+            // Append any PHP-input json
             if (strpos(trim($contents), '{') === 0) {
                 $post = json_decode($contents, true);
                 if ($post !== false) {
diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
index 613058a..7116cd7 100644
--- a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
+++ b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
@@ -67,14 +67,13 @@ class BaseCsrfVerifier implements IMiddleware
 
         if ($this->skip($request) === false && \in_array($request->getMethod(), ['post', 'put', 'delete'], true) === true) {
 
-            $token = $request->getInputHandler()->get(static::POST_KEY, null, 'post');
+            $token = $request->getInputHandler()->getValue(
+                static::POST_KEY,
+                $request->getHeader(static::HEADER_KEY),
+                'post'
+            );
 
-            // If the token is not posted, check headers for valid x-csrf-token
-            if ($token === null) {
-                $token = $request->getHeader(static::HEADER_KEY);
-            }
-
-            if ($this->tokenProvider->validate($token) === false) {
+            if ($this->tokenProvider->validate((string)$token) === false) {
                 throw new TokenMismatchException('Invalid CSRF-token.');
             }
 
diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 6ae3a38..90397e6 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -2,6 +2,7 @@
 
 namespace Pecee\Http;
 
+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Input\InputHandler;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
@@ -9,19 +10,58 @@ use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
+    /**
+     * Additional data
+     *
+     * @var array
+     */
     private $data = [];
+
+    /**
+     * Server headers
+     * @var array
+     */
     protected $headers = [];
+
+    /**
+     * Request host
+     * @var string
+     */
     protected $host;
+
+    /**
+     * Current request url
+     * @var Url
+     */
     protected $url;
+
+    /**
+     * Request method
+     * @var string
+     */
     protected $method;
+
+    /**
+     * Input handler
+     * @var InputHandler
+     */
     protected $inputHandler;
 
-    protected $hasRewrite = false;
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;
 
     /**
      * @var ILoadableRoute|null
      */
     protected $rewriteRoute;
+
+    /**
+     * Rewrite url
+     * @var string|null
+     */
     protected $rewriteUrl;
 
     /**
@@ -31,7 +71,7 @@ class Request
 
     /**
      * Request constructor.
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws MalformedUrlException
      */
     public function __construct()
     {
@@ -43,10 +83,10 @@ class Request
         $this->setHost($this->getHeader('http-host'));
 
         // Check if special IIS header exist, otherwise use default.
-        $this->setUrl($this->getHeader('unencoded-url', $this->getHeader('request-uri')));
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
 
         $this->inputHandler = new InputHandler($this);
-        $this->method = strtolower($this->inputHandler->get('_method', $this->getHeader('request-method')));
+        $this->method = strtolower($this->inputHandler->getValue('_method', $this->getHeader('request-method')));
     }
 
     public function isSecure(): bool
@@ -62,6 +102,16 @@ class Request
         return $this->url;
     }
 
+    /**
+     * Copy url object
+     *
+     * @return Url
+     */
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }
+
     /**
      * @return string|null
      */
@@ -205,12 +255,15 @@ class Request
     }
 
     /**
-     * @param string|Url $url
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @param Url $url
      */
-    public function setUrl($url): void
+    public function setUrl(Url $url): void
     {
-        $this->url = ($url instanceof Url) ? $url : new Url($url);
+        $this->url = $url;
+
+        if ($this->url->getHost() === null) {
+            $this->url->setHost((string)$this->getHost());
+        }
     }
 
     /**
@@ -237,7 +290,7 @@ class Request
      */
     public function setRewriteRoute(ILoadableRoute $route): self
     {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;
         $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
 
         return $this;
@@ -271,7 +324,7 @@ class Request
      */
     public function setRewriteUrl(string $rewriteUrl): self
     {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;
         $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';
 
         return $this;
@@ -284,7 +337,7 @@ class Request
      */
     public function setRewriteCallback($callback): self
     {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;
 
         return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
     }
@@ -339,9 +392,9 @@ class Request
      *
      * @return bool
      */
-    public function hasRewrite(): bool
+    public function hasPendingRewrite(): bool
     {
-        return $this->hasRewrite;
+        return $this->hasPendingRewrite;
     }
 
     /**
@@ -350,9 +403,9 @@ class Request
      * @param bool $boolean
      * @return Request
      */
-    public function setHasRewrite(bool $boolean): self
+    public function setHasPendingRewrite(bool $boolean): self
     {
-        $this->hasRewrite = $boolean;
+        $this->hasPendingRewrite = $boolean;
 
         return $this;
     }
diff --git a/src/Pecee/Http/Security/CookieTokenProvider.php b/src/Pecee/Http/Security/CookieTokenProvider.php
index bbe5ccb..b871b35 100644
--- a/src/Pecee/Http/Security/CookieTokenProvider.php
+++ b/src/Pecee/Http/Security/CookieTokenProvider.php
@@ -63,7 +63,7 @@ class CookieTokenProvider implements ITokenProvider
     public function setToken(string $token): void
     {
         $this->token = $token;
-        setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
+        setcookie(static::CSRF_KEY, $token, (int)((time() + 60) * $this->cookieTimeoutMinutes), '/', ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
     }
 
     /**
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index 440e1b4..212ae6e 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -7,36 +7,52 @@ use Pecee\Http\Exceptions\MalformedUrlException;
 class Url
 {
     private $originalUrl;
-    private $data = [
-        'scheme'   => null,
-        'host'     => null,
-        'port'     => null,
-        'user'     => null,
-        'pass'     => null,
-        'path'     => null,
-        'query'    => null,
-        'fragment' => null,
-    ];
+
+    private $scheme;
+    private $host;
+    private $port;
+    private $username;
+    private $password;
+    private $path;
+    private $params;
+    private $fragment;
 
     /**
      * Url constructor.
+     *
      * @param string $url
      * @throws MalformedUrlException
      */
     public function __construct(?string $url)
     {
         $this->originalUrl = $url;
-        if ($url !== null) {
-            $this->data = $this->parseUrl($url) + $this->data;
 
-            if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
-                $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+        if ($url !== null && $url !== '/') {
+            $data = $this->parseUrl($url);
+
+            $this->scheme = $data['scheme'] ?? null;
+            $this->host = $data['host'] ?? null;
+            $this->port = $data['port'] ?? null;
+            $this->username = $data['user'] ?? null;
+            $this->password = $data['pass'] ?? null;
+
+            if (isset($data['path']) === true) {
+                $this->setPath($data['path']);
+            }
+
+            $this->fragment = $data['fragment'] ?? null;
+
+            if (isset($data['query']) === true) {
+                $params = [];
+                parse_str($data['query'], $params);
+                $this->setParams($params);
             }
         }
     }
 
     /**
      * Check if url is using a secure protocol like https
+     *
      * @return bool
      */
     public function isSecure(): bool
@@ -46,6 +62,7 @@ class Url
 
     /**
      * Checks if url is relative
+     *
      * @return bool
      */
     public function isRelative(): bool
@@ -55,38 +72,94 @@ class Url
 
     /**
      * Get url scheme
+     *
      * @return string|null
      */
     public function getScheme(): ?string
     {
-        return $this->data['scheme'];
+        return $this->scheme;
+    }
+
+    /**
+     * Set the scheme of the url
+     *
+     * @param string $scheme
+     * @return static
+     */
+    public function setScheme(string $scheme): self
+    {
+        $this->scheme = $scheme;
+
+        return $this;
     }
 
     /**
      * Get url host
+     *
      * @return string|null
      */
     public function getHost(): ?string
     {
-        return $this->data['host'];
+        return $this->host;
+    }
+
+    /**
+     * Set the host of the url
+     *
+     * @param string $host
+     * @return static
+     */
+    public function setHost(string $host): self
+    {
+        $this->host = $host;
+
+        return $this;
     }
 
     /**
      * Get url port
+     *
      * @return int|null
      */
     public function getPort(): ?int
     {
-        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
+        return ($this->port !== null) ? (int)$this->port : null;
+    }
+
+    /**
+     * Set the port of the url
+     *
+     * @param int $port
+     * @return static
+     */
+    public function setPort(int $port): self
+    {
+        $this->port = $port;
+
+        return $this;
     }
 
     /**
      * Parse username from url
+     *
      * @return string|null
      */
-    public function getUserName(): ?string
+    public function getUsername(): ?string
     {
-        return $this->data['user'];
+        return $this->username;
+    }
+
+    /**
+     * Set the username of the url
+     *
+     * @param string $username
+     * @return static
+     */
+    public function setUsername(string $username): self
+    {
+        $this->username = $username;
+
+        return $this;
     }
 
     /**
@@ -95,7 +168,20 @@ class Url
      */
     public function getPassword(): ?string
     {
-        return $this->data['pass'];
+        return $this->password;
+    }
+
+    /**
+     * Set the url password
+     *
+     * @param string $password
+     * @return static
+     */
+    public function setPassword(string $password): self
+    {
+        $this->password = $password;
+
+        return $this;
     }
 
     /**
@@ -104,25 +190,87 @@ class Url
      */
     public function getPath(): ?string
     {
-        return $this->data['path'] ?? '/';
+        return $this->path ?? '/';
     }
 
     /**
-     * Get querystring from url
-     * @return string|null
+     * Set the url path
+     *
+     * @param string $path
+     * @return static
      */
-    public function getQueryString(): ?string
+    public function setPath(string $path): self
     {
-        return $this->data['query'];
+        $this->path = rtrim($path, '/') . '/';
+
+        return $this;
+    }
+
+    /**
+     * Get query-string from url
+     *
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->params;
+    }
+
+    /**
+     * Merge parameters array
+     *
+     * @param array $params
+     * @return static
+     */
+    public function mergeParams(array $params): self
+    {
+        return $this->setParams(array_merge($this->getParams(), $params));
+    }
+
+    /**
+     * Set the url params
+     *
+     * @param array $params
+     * @return static
+     */
+    public function setParams(array $params): self
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * Get query-string params as string
+     *
+     * @return string
+     */
+    public function getQueryString(): string
+    {
+        return static::arrayToParams($this->getParams());
     }
 
     /**
      * Get fragment from url (everything after #)
+     *
      * @return string|null
      */
     public function getFragment(): ?string
     {
-        return $this->data['fragment'];
+        return $this->fragment;
+    }
+
+    /**
+     * Set url fragment
+     *
+     * @param string $fragment
+     * @return static
+     */
+    public function setFragment(string $fragment): self
+    {
+        $this->fragment = $fragment;
+
+        return $this;
     }
 
     /**
@@ -133,32 +281,6 @@ class Url
         return $this->originalUrl;
     }
 
-    /**
-     * UTF-8 aware parse_url() replacement.
-     * @param string $url
-     * @param int $component
-     * @throws MalformedUrlException
-     * @return array
-     */
-    public function parseUrl(string $url, int $component = -1): array
-    {
-        $encodedUrl = preg_replace_callback(
-            '/[^:\/@?&=#]+/u',
-            function ($matches) {
-                return urlencode($matches[0]);
-            },
-            $url
-        );
-
-        $parts = parse_url($encodedUrl, $component);
-
-        if ($parts === false) {
-            throw new MalformedUrlException('Malformed URL: ' . $url);
-        }
-
-        return array_map('urldecode', $parts);
-    }
-
     /**
      * Get position of value.
      * Returns -1 on failure.
@@ -185,17 +307,143 @@ class Url
     }
 
     /**
-     * Returns data array with information about the url
-     * @return array
+     * Check if url contains parameter/query string.
+     *
+     * @param string $name
+     * @return bool
      */
-    public function getData(): array
+    public function hasParam(string $name): bool
     {
-        return $this->data;
+        return \in_array($name, $this->getParams(), true);
+    }
+
+    /**
+     * Removes parameter from query-string
+     *
+     * @param string $name
+     */
+    public function removeParam(string $name): void
+    {
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                unset($params[$key]);
+                $this->setParams($params);
+            }
+        }
+    }
+
+    /**
+     * Get parameter by name.
+     * Returns parameter value or default value.
+     *
+     * @param string $name
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getParam(string $name, ?string $defaultValue = null): ?string
+    {
+        $output = null;
+
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                $output = $params[$key];
+            }
+        }
+
+        return $output ?? $defaultValue;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @return array
+     * @throws MalformedUrlException
+     */
+    public function parseUrl(string $url, int $component = -1): array
+    {
+        $encodedUrl = preg_replace_callback(
+            '/[^:\/@?&=#]+/u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new MalformedUrlException(sprintf('Failed to parse url: "%s"', $url));
+        }
+
+        return array_map('urldecode', $parts);
+    }
+
+    /**
+     * Convert array to query-string params
+     *
+     * @param array $getParams
+     * @param bool $includeEmpty
+     * @return string
+     */
+    public static function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
+    {
+        if (\count($getParams) !== 0) {
+
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    return (trim($item) !== '');
+                });
+            }
+
+            return http_build_query($getParams);
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the relative url
+     *
+     * @return string
+     */
+    public function getRelativeUrl(): string
+    {
+        $params = $this->getQueryString();
+
+        $path = $this->path ?? '';
+        $query = $params !== '' ? '?' . $params : '';
+        $fragment = $this->fragment !== null ? '#' . $this->fragment : '';
+
+        return $path . $query . $fragment;
+    }
+
+    /**
+     * Returns the absolute url
+     *
+     * @return string
+     */
+    public function getAbsoluteUrl(): string
+    {
+        $scheme = $this->scheme !== null ? $this->scheme . '://' : '';
+        $host = $this->host ?? '';
+        $port = $this->port !== null ? ':' . $this->port : '';
+        $user = $this->username ?? '';
+        $pass = $this->password !== null ? ':' . $this->password : '';
+        $pass = ($user || $pass) ? $pass . '@' : '';
+
+        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
     }
 
     public function __toString()
     {
-        return $this->getOriginalUrl();
+        return $this->getRelativeUrl();
     }
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Event/EventArgument.php b/src/Pecee/SimpleRouter/Event/EventArgument.php
new file mode 100644
index 0000000..f4aeed8
--- /dev/null
+++ b/src/Pecee/SimpleRouter/Event/EventArgument.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Pecee\SimpleRouter\Event;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+class EventArgument implements IEventArgument
+{
+    /**
+     * Event name
+     * @var string
+     */
+    protected $eventName;
+
+    /**
+     * @var Router
+     */
+    protected $router;
+
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    public function __construct($eventName, $router, array $arguments = [])
+    {
+        $this->eventName = $eventName;
+        $this->router = $router;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Get event name
+     *
+     * @return string
+     */
+    public function getEventName(): string
+    {
+        return $this->eventName;
+    }
+
+    /**
+     * Set the event name
+     *
+     * @param string $name
+     */
+    public function setEventName(string $name): void
+    {
+        $this->eventName = $name;
+    }
+
+    /**
+     * Get the router instance
+     *
+     * @return Router
+     */
+    public function getRouter(): Router
+    {
+        return $this->router;
+    }
+
+    /**
+     * Get the request instance
+     *
+     * @return Request
+     */
+    public function getRequest(): Request
+    {
+        return $this->getRouter()->getRequest();
+    }
+
+    /**
+     * Get arguments
+     *
+     * @return array
+     */
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Event/IEventArgument.php b/src/Pecee/SimpleRouter/Event/IEventArgument.php
new file mode 100644
index 0000000..a8a6d7e
--- /dev/null
+++ b/src/Pecee/SimpleRouter/Event/IEventArgument.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Pecee\SimpleRouter\Event;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+interface IEventArgument
+{
+
+    /**
+     * Get event name
+     *
+     * @return string
+     */
+    public function getEventName(): string;
+
+    /**
+     * Set event name
+     *
+     * @param string $name
+     */
+    public function setEventName(string $name): void;
+
+    /**
+     * Get router instance
+     *
+     * @return Router
+     */
+    public function getRouter(): Router;
+
+    /**
+     * Get request instance
+     *
+     * @return Request
+     */
+    public function getRequest(): Request;
+
+    /**
+     * Get all event arguments
+     *
+     * @return array
+     */
+    public function getArguments(): array;
+
+}
\ No newline at end of file
diff --git a/src/Pecee/Handlers/CallbackExceptionHandler.php b/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php
similarity index 90%
rename from src/Pecee/Handlers/CallbackExceptionHandler.php
rename to src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php
index bc82f05..296c228 100644
--- a/src/Pecee/Handlers/CallbackExceptionHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pecee\Handlers;
+namespace Pecee\SimpleRouter\Handlers;
 
 use Pecee\Http\Request;
 
@@ -10,7 +10,7 @@ use Pecee\Http\Request;
  * Class is used to create callbacks which are fired when an exception is reached.
  * This allows for easy handling 404-exception etc. without creating an custom ExceptionHandler.
  *
- * @package Pecee\Handlers
+ * @package \Pecee\SimpleRouter\Handlers
  */
 class CallbackExceptionHandler implements IExceptionHandler
 {
diff --git a/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php b/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
new file mode 100644
index 0000000..2aa693f
--- /dev/null
+++ b/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class DebugEventHandler implements IEventHandler
+{
+
+    /**
+     * Debug callback
+     * @var \Closure
+     */
+    protected $callback;
+
+    public function __construct()
+    {
+        $this->callback = function (EventArgument $argument) {
+            // todo: log in database
+        };
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array
+    {
+        return [
+            $name => [
+                $this->callback,
+            ],
+        ];
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array ...$eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, ...$eventArgs): void
+    {
+        $callback = $this->callback;
+        $callback(new EventArgument($router, $eventArgs));
+    }
+
+    /**
+     * Set debug callback
+     *
+     * @param \Closure $event
+     */
+    public function setCallback(\Closure $event): void
+    {
+        $this->callback = $event;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Handlers/EventHandler.php b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
new file mode 100644
index 0000000..7b3b5af
--- /dev/null
+++ b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class EventHandler implements IEventHandler
+{
+    /**
+     * Fires when a event is triggered.
+     */
+    public const EVENT_ALL = '*';
+
+    /**
+     * Fires when router is initializing and before routes are loaded.
+     */
+    public const EVENT_INIT = 'onInit';
+
+    /**
+     * Fires when all routes has been loaded and rendered, just before the output is returned.
+     */
+    public const EVENT_LOAD = 'onLoad';
+
+    /**
+     * Fires when a url-rewrite is and just before the routes are re-initialized.
+     */
+    public const EVENT_REWRITE = 'onRewrite';
+
+    /**
+     * Fires when the router is booting.
+     * This happens just before boot-managers are rendered and before any routes has been loaded.
+     */
+    public const EVENT_BOOT = 'onBoot';
+
+    /**
+     * Fires before a boot-manager is rendered.
+     */
+    public const EVENT_RENDER_BOOTMANAGER = 'onRenderBootManager';
+
+    /**
+     * Fires when the router is about to load all routes.
+     */
+    public const EVENT_LOAD_ROUTES = 'onLoadRoutes';
+
+    /**
+     * Fires whenever the `findRoute` method is called within the `Router`.
+     * This usually happens when the router tries to find routes that
+     * contains a certain url, usually after the EventHandler::EVENT_GET_URL event.
+     */
+    public const EVENT_FIND_ROUTE = 'onFindRoute';
+
+    /**
+     * Fires whenever the `Router::getUrl` method or `url`-helper function
+     * is called and the router tries to find the route.
+     */
+    public const EVENT_GET_URL = 'onGetUrl';
+
+    /**
+     * Fires when a route is matched and valid (correct request-type etc).
+     * and before the route is rendered.
+     */
+    public const EVENT_MATCH_ROUTE = 'onMatchRoute';
+
+    /**
+     * Fires before a route is rendered.
+     */
+    public const EVENT_RENDER_ROUTE = 'onRenderRoute';
+
+    /**
+     * Fires when the router is loading exception-handlers.
+     */
+    public const EVENT_LOAD_EXCEPTIONS = 'onLoadExceptions';
+
+    /**
+     * Fires before the router is rendering a exception-handler.
+     */
+    public const EVENT_RENDER_EXCEPTION = 'onRenderException';
+
+    /**
+     * Fires before a middleware is rendered.
+     */
+    public const EVENT_RENDER_MIDDLEWARE = 'onRenderMiddleware';
+
+    /**
+     * Fires before the CSRF-verifier is rendered.
+     */
+    public const EVENT_RENDER_CSRF = 'onRenderCsrfVerifier';
+
+    /**
+     * All available events
+     * @var array
+     */
+    public static $events = [
+        self::EVENT_ALL,
+        self::EVENT_INIT,
+        self::EVENT_LOAD,
+        self::EVENT_REWRITE,
+        self::EVENT_BOOT,
+        self::EVENT_RENDER_BOOTMANAGER,
+        self::EVENT_LOAD_ROUTES,
+        self::EVENT_FIND_ROUTE,
+        self::EVENT_GET_URL,
+        self::EVENT_MATCH_ROUTE,
+        self::EVENT_RENDER_ROUTE,
+        self::EVENT_LOAD_EXCEPTIONS,
+        self::EVENT_RENDER_EXCEPTION,
+        self::EVENT_RENDER_MIDDLEWARE,
+        self::EVENT_RENDER_CSRF,
+    ];
+
+    /**
+     * List of all registered events
+     * @var array
+     */
+    private $registeredEvents = [];
+
+    /**
+     * Register new event
+     *
+     * @param string $name
+     * @param \Closure $callback
+     * @return static
+     */
+    public function register(string $name, \Closure $callback): IEventHandler
+    {
+        if (isset($this->registeredEvents[$name]) === true) {
+            $this->registeredEvents[$name][] = $callback;
+        } else {
+            $this->registeredEvents[$name] = [$callback];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @param array ...$names Add multiple names...
+     * @return array
+     */
+    public function getEvents(?string $name, ...$names): array
+    {
+        if ($name === null) {
+            return $this->registeredEvents;
+        }
+
+        $names[] = $name;
+        $events = [];
+
+        foreach ($names as $eventName) {
+            if(isset($this->registeredEvents[$eventName]) === true) {
+                $events += $this->registeredEvents[$eventName];
+            }
+        }
+
+        return $events;
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array ...$eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, ...$eventArgs): void
+    {
+        $events = $this->getEvents(static::EVENT_ALL, $name);
+
+        /* @var $event \Closure */
+        foreach ($events as $event) {
+            $event(new EventArgument($name, $router, $eventArgs));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Handlers/IEventHandler.php b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
new file mode 100644
index 0000000..2276778
--- /dev/null
+++ b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Router;
+
+interface IEventHandler {
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name) : array;
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array ...$eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, ...$eventArgs) : void;
+
+}
\ No newline at end of file
diff --git a/src/Pecee/Handlers/IExceptionHandler.php b/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php
similarity index 84%
rename from src/Pecee/Handlers/IExceptionHandler.php
rename to src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php
index 5cd21d8..b32a86d 100644
--- a/src/Pecee/Handlers/IExceptionHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pecee\Handlers;
+namespace Pecee\SimpleRouter\Handlers;
 
 use Pecee\Http\Request;
 
diff --git a/src/Pecee/SimpleRouter/IRouterBootManager.php b/src/Pecee/SimpleRouter/IRouterBootManager.php
index c3686ec..7268bb8 100644
--- a/src/Pecee/SimpleRouter/IRouterBootManager.php
+++ b/src/Pecee/SimpleRouter/IRouterBootManager.php
@@ -9,7 +9,8 @@ interface IRouterBootManager
     /**
      * Called when router loads it's routes
      *
+     * @param Router $router
      * @param Request $request
      */
-    public function boot(Request $request): void;
+    public function boot(Router $router, Request $request): void;
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IGroupRoute.php b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
index 1a5eb41..a1ebd33 100644
--- a/src/Pecee/SimpleRouter/Route/IGroupRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
@@ -2,7 +2,7 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\Handlers\IExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 
 interface IGroupRoute extends IRoute
diff --git a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
index 49028fc..68cbbef 100644
--- a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
@@ -12,11 +12,11 @@ interface ILoadableRoute extends IRoute
      * Used when calling the url() helper.
      *
      * @param string|null $method
-     * @param array|null $parameters
+     * @param array|string|null $parameters
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null): string;
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string;
 
     /**
      * Loads and renders middleware-classes
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index 48d02c6..51c2591 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -97,7 +97,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
         $url = $this->getUrl();
 
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 2f349c3..2f0d4eb 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -136,7 +136,7 @@ abstract class Route implements IRoute
 
         $parameters = [];
 
-        // Ensures that hostnames/domains will work with parameters
+        // Ensures that host names/domains will work with parameters
         $url = '/' . ltrim($url, '/');
 
         if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
diff --git a/src/Pecee/SimpleRouter/Route/RouteController.php b/src/Pecee/SimpleRouter/Route/RouteController.php
index b15a402..e090652 100644
--- a/src/Pecee/SimpleRouter/Route/RouteController.php
+++ b/src/Pecee/SimpleRouter/Route/RouteController.php
@@ -49,7 +49,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
         if (strpos($name, '.') !== false) {
             $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
diff --git a/src/Pecee/SimpleRouter/Route/RouteGroup.php b/src/Pecee/SimpleRouter/Route/RouteGroup.php
index 8c88e6b..3ad9060 100644
--- a/src/Pecee/SimpleRouter/Route/RouteGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RouteGroup.php
@@ -2,7 +2,7 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\Handlers\IExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 
 class RouteGroup extends Route implements IGroupRoute
diff --git a/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php b/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
index 9656554..956c248 100644
--- a/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php
@@ -6,7 +6,14 @@ use Pecee\Http\Request;
 
 class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
 {
-    protected $urlRegex = '/^%s\/?/u';
+
+    /**
+     * RoutePartialGroup constructor.
+     */
+    public function __construct()
+    {
+        $this->urlRegex = '/^%s\/?/u';
+    }
 
     /**
      * Method called to check if route matches
diff --git a/src/Pecee/SimpleRouter/Route/RouteResource.php b/src/Pecee/SimpleRouter/Route/RouteResource.php
index 13fe2e7..2096831 100644
--- a/src/Pecee/SimpleRouter/Route/RouteResource.php
+++ b/src/Pecee/SimpleRouter/Route/RouteResource.php
@@ -60,7 +60,13 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return (strtolower($this->name) === strtolower($name));
     }
 
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    /**
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
         $url = array_search($name, $this->names, false);
         if ($url !== false) {
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 4a96f7a..c2a0eec 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -3,7 +3,11 @@
 namespace Pecee\SimpleRouter;
 
 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\IExceptionHandler;
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\Handlers\EventHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\HttpException;
@@ -27,32 +31,32 @@ class Router
      * Defines if a route is currently being processed.
      * @var bool
      */
-    protected $processingRoute;
+    protected $isProcessingRoute;
 
     /**
      * All added routes
      * @var array
      */
-    protected $routes;
+    protected $routes = [];
 
     /**
      * List of processed routes
      * @var array
      */
-    protected $processedRoutes;
+    protected $processedRoutes = [];
 
     /**
      * Stack of routes used to keep track of sub-routes added
      * when a route is being processed.
      * @var array
      */
-    protected $routeStack;
+    protected $routeStack = [];
 
     /**
      * List of added bootmanagers
      * @var array
      */
-    protected $bootManagers;
+    protected $bootManagers = [];
 
     /**
      * Csrf verifier class
@@ -64,7 +68,7 @@ class Router
      * Get exception handlers
      * @var array
      */
-    protected $exceptionHandlers;
+    protected $exceptionHandlers = [];
 
     /**
      * List of loaded exception that has been loaded.
@@ -72,7 +76,7 @@ class Router
      *
      * @var array
      */
-    protected $loadedExceptionHandlers;
+    protected $loadedExceptionHandlers = [];
 
     /**
      * Enable or disabled debugging
@@ -92,9 +96,14 @@ class Router
      */
     protected $debugList = [];
 
+    /**
+     * Contains any registered event-handler.
+     * @var array
+     */
+    protected $eventHandlers = [];
+
     /**
      * Router constructor.
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public function __construct()
     {
@@ -102,18 +111,28 @@ class Router
     }
 
     /**
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * Resets the router by reloading request and clearing all routes and data.
      */
     public function reset(): void
     {
-        $this->processingRoute = false;
-        $this->request = new Request();
+        $this->isProcessingRoute = false;
+
+        try {
+            $this->request = new Request();
+        } catch (MalformedUrlException $e) {
+            $this->debug(sprintf('Invalid request-uri url: %s', $e->getMessage()));
+        }
+
         $this->routes = [];
         $this->bootManagers = [];
         $this->routeStack = [];
         $this->processedRoutes = [];
         $this->exceptionHandlers = [];
         $this->loadedExceptionHandlers = [];
+        $this->eventHandlers = [];
+        $this->debugList = [];
+        $this->csrfVerifier = null;
+        $this->debugStartTime = microtime(true);
     }
 
     /**
@@ -127,7 +146,7 @@ class Router
          * 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) {
+        if ($this->isProcessingRoute === true) {
             $this->routeStack[] = $route;
 
             return $route;
@@ -147,9 +166,9 @@ class Router
     protected function renderAndProcess(IRoute $route): void
     {
 
-        $this->processingRoute = true;
+        $this->isProcessingRoute = true;
         $route->renderRoute($this->request, $this);
-        $this->processingRoute = false;
+        $this->isProcessingRoute = false;
 
         if (\count($this->routeStack) !== 0) {
 
@@ -239,46 +258,78 @@ class Router
     {
         $this->debug('Loading routes');
 
+        $this->fireEvents(EventHandler::EVENT_BOOT);
+
         /* Initialize boot-managers */
+
         /* @var $manager IRouterBootManager */
         foreach ($this->bootManagers as $manager) {
+
             $this->debug('Rendering bootmanager %s', \get_class($manager));
-            $manager->boot($this->request);
+            $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, $manager);
+
+            /* Render bootmanager */
+            $manager->boot($this, $this->request);
+
             $this->debug('Finished rendering bootmanager');
         }
 
+        $this->fireEvents(EventHandler::EVENT_LOAD_ROUTES);
+
         /* Loop through each route-request */
         $this->processRoutes($this->routes);
 
         $this->debug('Finished loading routes');
     }
 
+    /**
+     * Start the routing
+     *
+     * @return string|null
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public function start(): ?string
+    {
+        $this->debug('Router starting');
+
+        $this->fireEvents(EventHandler::EVENT_INIT);
+
+        $this->loadRoutes();
+
+        if ($this->csrfVerifier !== null) {
+
+            $this->fireEvents(EventHandler::EVENT_RENDER_CSRF);
+
+            /* Verify csrf token for request */
+            $this->csrfVerifier->handle($this->request);
+        }
+
+        $output = $this->routeRequest();
+
+        $this->fireEvents(EventHandler::EVENT_LOAD);
+
+        $this->debug('Routing complete');
+
+        return $output;
+    }
+
     /**
      * Routes the request
      *
-     * @param bool $rewrite
      * @return string|null
      * @throws HttpException
      * @throws \Exception
      */
-    public function routeRequest(bool $rewrite = false): ?string
+    public function routeRequest(): ?string
     {
-        $this->debug('Started routing request (rewrite: %s)', $rewrite === true ? 'yes' : 'no');
+        $this->debug('Routing request');
 
         $methodNotAllowed = false;
 
         try {
-
-            if ($rewrite === false) {
-                $this->loadRoutes();
-
-                if ($this->csrfVerifier !== null) {
-
-                    /* Verify csrf token for request */
-                    $this->csrfVerifier->handle($this->request);
-                }
-            }
-
             $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
 
             /* @var $route ILoadableRoute */
@@ -289,6 +340,8 @@ class Router
                 /* If the route matches */
                 if ($route->matchRoute($url, $this->request) === true) {
 
+                    $this->fireEvents(EventHandler::EVENT_MATCH_ROUTE);
+
                     /* Check if request method matches */
                     if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
                         $this->debug('Method "%s" not allowed', $this->request->getMethod());
@@ -296,6 +349,8 @@ class Router
                         continue;
                     }
 
+                    $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARE);
+
                     $route->loadMiddleware($this->request, $this);
 
                     $output = $this->handleRouteRewrite($key, $url);
@@ -303,13 +358,10 @@ class Router
                         return $output;
                     }
 
-                    /* Render route */
                     $methodNotAllowed = false;
 
                     $this->request->addLoadedRoute($route);
-
                     $output = $route->renderRoute($this->request, $this);
-
                     if ($output !== null) {
                         return $output;
                     }
@@ -360,7 +412,7 @@ class Router
     protected function handleRouteRewrite($key, string $url): ?string
     {
         /* If the request has changed */
-        if ($this->request->hasRewrite() === false) {
+        if ($this->request->hasPendingRewrite() === false) {
             return null;
         }
 
@@ -373,9 +425,11 @@ class Router
 
         if ($this->request->getRewriteUrl() !== $url) {
             unset($this->processedRoutes[$key]);
-            $this->request->setHasRewrite(false);
+            $this->request->setHasPendingRewrite(false);
 
-            return $this->routeRequest(true);
+            $this->fireEvents(EventHandler::EVENT_REWRITE);
+
+            return $this->routeRequest();
         }
 
         return null;
@@ -391,6 +445,8 @@ class Router
     {
         $this->debug('Starting exception handling for "%s"', \get_class($e));
 
+        $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS);
+
         /* @var $handler IExceptionHandler */
         foreach ($this->exceptionHandlers as $key => $handler) {
 
@@ -398,6 +454,8 @@ class Router
                 $handler = new $handler();
             }
 
+            $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION);
+
             $this->debug('Processing exception-handler "%s"', \get_class($handler));
 
             if (($handler instanceof IExceptionHandler) === false) {
@@ -410,12 +468,14 @@ class Router
                 $handler->handleError($this->request, $e);
                 $this->debug('Finished rendering exception-handler');
 
-                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasRewrite() === true) {
+                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasPendingRewrite() === true) {
                     $this->loadedExceptionHandlers[$key] = $handler;
 
                     $this->debug('Exception handler contains rewrite, reloading routes');
 
-                    return $this->routeRequest(true);
+                    $this->fireEvents(EventHandler::EVENT_REWRITE);
+
+                    return $this->routeRequest();
                 }
 
             } catch (\Exception $e) {
@@ -429,22 +489,6 @@ class Router
         throw $e;
     }
 
-    public function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
-    {
-        if (\count($getParams) !== 0) {
-
-            if ($includeEmpty === false) {
-                $getParams = array_filter($getParams, function ($item) {
-                    return (trim($item) !== '');
-                });
-            }
-
-            return '?' . http_build_query($getParams);
-        }
-
-        return '';
-    }
-
     /**
      * Find route by alias, class, callback or method.
      *
@@ -453,8 +497,8 @@ class Router
      */
     public function findRoute(string $name): ?ILoadableRoute
     {
-
         $this->debug('Finding route by name "%s"', $name);
+        $this->fireEvents(EventHandler::EVENT_FIND_ROUTE);
 
         /* @var $route ILoadableRoute */
         foreach ($this->processedRoutes as $route) {
@@ -485,10 +529,11 @@ class Router
             }
 
             /* Check if callback matches (if it's not a function) */
-            if (\is_string($name) === true && \is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && \is_callable($route->getCallback()) === false) {
+            $callback = $route->getCallback();
+            if (\is_string($name) === true && \is_string($callback) === true && strpos($name, '@') !== false && strpos($callback, '@') !== false && \is_callable($callback) === false) {
 
                 /* Check if the entire callback is matching */
-                if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
+                if (strpos($callback, $name) === 0 || strtolower($callback) === strtolower($name)) {
                     $this->debug('Found route "%s" by callback "%s"', $route->getUrl(), $name);
 
                     return $route;
@@ -523,19 +568,22 @@ class Router
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
+     * @return Url
      * @throws InvalidArgumentException
-     * @return string
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public function getUrl(?string $name = null, $parameters = null, $getParams = null): string
+    public function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
     {
         $this->debug('Finding url', \func_get_args());
 
+        $this->fireEvents(EventHandler::EVENT_GET_URL);
+
         if ($getParams !== null && \is_array($getParams) === false) {
             throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
         }
 
         if ($name === '' && $parameters === '') {
-            return '/';
+            return new Url('/');
         }
 
         /* Only merge $_GET when all parameters are null */
@@ -547,21 +595,29 @@ class Router
 
         /* Return current route if no options has been specified */
         if ($name === null && $parameters === null) {
-            return $this->request->getUrl()->getPath() . $this->arrayToParams($getParams);
+            return $this->request
+                ->getUrlCopy()
+                ->setParams($getParams);
         }
 
         $loadedRoute = $this->request->getLoadedRoute();
 
         /* If nothing is defined and a route is loaded we use that */
         if ($name === null && $loadedRoute !== null) {
-            return $loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name))
+                ->setParams($getParams);
         }
 
         /* We try to find a match on the given name */
         $route = $this->findRoute($name);
 
         if ($route !== null) {
-            return $route->findUrl($route->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($route->findUrl($route->getMethod(), $parameters, $name))
+                ->setParams($getParams);
         }
 
         /* Using @ is most definitely a controller@method or alias@method */
@@ -575,12 +631,18 @@ class Router
 
                 /* Check if the route contains the name/alias */
                 if ($route->hasName($controller) === true) {
-                    return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
                 }
 
                 /* Check if the route controller is equal to the name */
                 if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($controller)) {
-                    return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
                 }
 
             }
@@ -588,8 +650,12 @@ class Router
 
         /* No result so we assume that someone is using a hardcoded url and join everything together. */
         $url = trim(implode('/', array_merge((array)$name, (array)$parameters)), '/');
+        $url = (($url === '') ? '/' : '/' . $url . '/');
 
-        return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
+        return $this->request
+            ->getUrlCopy()
+            ->setPath($url)
+            ->setParams($getParams);
     }
 
     /**
@@ -682,6 +748,47 @@ class Router
         return $this;
     }
 
+    /**
+     * Register event handler
+     *
+     * @param IEventHandler $handler
+     * @return static
+     */
+    public function addEventHandler(IEventHandler $handler): self
+    {
+        $this->eventHandlers[] = $handler;
+
+        return $this;
+    }
+
+    /**
+     * Get registered event-handler.
+     *
+     * @return array
+     */
+    public function getEventHandlers(): array
+    {
+        return $this->eventHandlers;
+    }
+
+    /**
+     * Fire event
+     *
+     * @param string $name
+     * @param array ...$args
+     */
+    protected function fireEvents($name, ...$args): void
+    {
+        if (\count($this->eventHandlers) === 0) {
+            return;
+        }
+
+        /* @var IEventHandler $eventHandler */
+        foreach ($this->eventHandlers as $eventHandler) {
+            $eventHandler->fireEvents($this, $name, $args);
+        }
+    }
+
     /**
      * Add new debug message
      * @param string $message
@@ -708,10 +815,6 @@ class Router
      */
     public function setDebugEnabled(bool $boolean): void
     {
-        if ($boolean === true) {
-            $this->debugStartTime = microtime(true);
-        }
-
         $this->debugEnabled = $boolean;
     }
 
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index ea0410f..4f495e6 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -11,11 +11,14 @@
 namespace Pecee\SimpleRouter;
 
 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\CallbackExceptionHandler;
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
@@ -48,20 +51,18 @@ class SimpleRouter
     /**
      * Start routing
      *
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws HttpException
      * @throws \Exception
      */
     public static function start(): void
     {
-        echo static::router()->routeRequest();
+        echo static::router()->start();
     }
 
     /**
      * Start the routing an return array with debugging-information
      *
      * @return array
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function startDebug(): array
     {
@@ -94,19 +95,23 @@ class SimpleRouter
             }
         }
 
+        $request = static::request();
+        $router = static::router();
+
         return [
-            'url'             => static::request()->getUrl(),
-            'method'          => static::request()->getMethod(),
-            'host'            => static::request()->getHost(),
-            'loaded_routes'   => static::request()->getLoadedRoutes(),
-            'all_routes'      => static::router()->getRoutes(),
-            'boot_managers'   => static::router()->getBootManagers(),
-            'csrf_verifier'   => static::router()->getCsrfVerifier(),
-            'log'             => static::router()->getDebugLog(),
+            'url'             => $request->getUrl(),
+            'method'          => $request->getMethod(),
+            'host'            => $request->getHost(),
+            'loaded_routes'   => $request->getLoadedRoutes(),
+            'all_routes'      => $router->getRoutes(),
+            'boot_managers'   => $router->getBootManagers(),
+            'csrf_verifier'   => $router->getCsrfVerifier(),
+            'log'             => $router->getDebugLog(),
+            'event_handlers'  => $router->getEventHandlers(),
             'router_output'   => $routerOutput,
             'library_version' => $version,
             'php_version'     => PHP_VERSION,
-            'server_params'   => static::request()->getHeaders(),
+            'server_params'   => $request->getHeaders(),
         ];
     }
 
@@ -124,19 +129,27 @@ class SimpleRouter
      * Base CSRF verifier
      *
      * @param BaseCsrfVerifier $baseCsrfVerifier
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
     {
         static::router()->setCsrfVerifier($baseCsrfVerifier);
     }
 
+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }
+
     /**
      * Boot managers allows you to alter the routes before the routing occurs.
      * Perfect if you want to load pretty-urls from a file or database.
      *
      * @param IRouterBootManager $bootManager
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function addBootManager(IRouterBootManager $bootManager): void
     {
@@ -151,7 +164,6 @@ class SimpleRouter
      * @param array|null $settings
      *
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function get(string $url, $callback, array $settings = null): IRoute
     {
@@ -165,7 +177,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function post(string $url, $callback, array $settings = null): IRoute
     {
@@ -179,7 +190,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function put(string $url, $callback, array $settings = null): IRoute
     {
@@ -193,7 +203,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function patch(string $url, $callback, array $settings = null): IRoute
     {
@@ -207,7 +216,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function options(string $url, $callback, array $settings = null): IRoute
     {
@@ -221,7 +229,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function delete(string $url, $callback, array $settings = null): IRoute
     {
@@ -234,7 +241,6 @@ class SimpleRouter
      * @param array $settings
      * @param \Closure $callback
      * @return RouteGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws InvalidArgumentException
      */
     public static function group(array $settings = [], \Closure $callback): IGroupRoute
@@ -260,7 +266,6 @@ class SimpleRouter
      * @param \Closure $callback
      * @param array $settings
      * @return RoutePartialGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws InvalidArgumentException
      */
     public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
@@ -288,7 +293,6 @@ class SimpleRouter
      * @param array|null $settings
      * @see SimpleRouter::form
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function basic(string $url, $callback, array $settings = null): IRoute
     {
@@ -304,7 +308,6 @@ class SimpleRouter
      * @param array|null $settings
      * @see SimpleRouter::form
      * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function form(string $url, $callback, array $settings = null): IRoute
     {
@@ -319,7 +322,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function match(array $requestMethods, string $url, $callback, array $settings = null)
     {
@@ -343,7 +345,6 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function all(string $url, $callback, array $settings = null)
     {
@@ -366,7 +367,6 @@ class SimpleRouter
      * @param string $controller
      * @param array|null $settings
      * @return RouteController|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function controller(string $url, $controller, array $settings = null)
     {
@@ -389,7 +389,6 @@ class SimpleRouter
      * @param string $controller
      * @param array|null $settings
      * @return RouteResource|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function resource(string $url, $controller, array $settings = null)
     {
@@ -410,7 +409,6 @@ class SimpleRouter
      *
      * @param \Closure $callback
      * @return CallbackExceptionHandler $callbackHandler
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function error(\Closure $callback): CallbackExceptionHandler
     {
@@ -443,20 +441,28 @@ class SimpleRouter
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \Pecee\Exceptions\InvalidArgumentException
-     * @return string
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @return Url
      */
-    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): string
+    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): Url
     {
-        return static::router()->getUrl($name, $parameters, $getParams);
+        try {
+            return static::router()->getUrl($name, $parameters, $getParams);
+        } catch (\Exception $e) {
+            try {
+                return new Url('/');
+            } catch (MalformedUrlException $e) {
+
+            }
+        }
+
+        // This will never happen...
+        return null;
     }
 
     /**
      * Get the request
      *
      * @return \Pecee\Http\Request
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function request(): Request
     {
@@ -467,7 +473,6 @@ class SimpleRouter
      * Get the response object
      *
      * @return Response
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function response(): Response
     {
@@ -482,7 +487,6 @@ class SimpleRouter
      * Returns the router instance
      *
      * @return Router
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
     public static function router(): Router
     {
diff --git a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
index 2db833f..90dfc1a 100644
--- a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandler implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error)  : void
 	{
diff --git a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
index 561ebde..ca72071 100644
--- a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php
@@ -1,13 +1,13 @@
 <?php
 
-class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerFirst implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
 	    global $stack;
 	    $stack[] = static::class;
 
-		$request->setUrl('/');
+		$request->setUrl(new \Pecee\Http\Url('/'));
 	}
 
 }
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
index 2360047..274bd3c 100644
--- a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php
@@ -1,13 +1,13 @@
 <?php
 
-class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerSecond implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
         global $stack;
         $stack[] = static::class;
 
-        $request->setUrl('/');
+        $request->setUrl(new \Pecee\Http\Url('/'));
 	}
 
 }
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
index d295157..793746a 100644
--- a/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
+++ b/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php
@@ -1,6 +1,6 @@
 <?php
 
-class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerThird implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
diff --git a/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php b/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php
new file mode 100644
index 0000000..8516aae
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php
@@ -0,0 +1,32 @@
+<?php
+
+class TestBootManager implements \Pecee\SimpleRouter\IRouterBootManager
+{
+
+    protected $routes;
+    protected $aliasUrl;
+
+    public function __construct(array $routes, string $aliasUrl)
+    {
+        $this->routes = $routes;
+        $this->aliasUrl = $aliasUrl;
+    }
+
+    /**
+     * Called when router loads it's routes
+     *
+     * @param \Pecee\SimpleRouter\Router $router
+     * @param \Pecee\Http\Request $request
+     */
+    public function boot(\Pecee\SimpleRouter\Router $router, \Pecee\Http\Request $request): void
+    {
+        foreach ($this->routes as $url) {
+            // If the current url matches the rewrite url, we use our custom route
+
+            if ($request->getUrl()->contains($url) === true) {
+                $request->setRewriteUrl($this->aliasUrl);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php b/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php
new file mode 100644
index 0000000..f7dfe52
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php
@@ -0,0 +1,41 @@
+<?php
+
+class SilentTokenProvider implements \Pecee\Http\Security\ITokenProvider {
+
+    protected $token;
+
+    public function __construct()
+    {
+        $this->refresh();
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void
+    {
+        $this->token = uniqid('', false);
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        return ($token === $this->token);
+    }
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string
+    {
+        return $this->token ?? $defaultValue;
+    }
+}
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/EventHandlerTest.php b/tests/Pecee/SimpleRouter/EventHandlerTest.php
new file mode 100644
index 0000000..7e49e6a
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/EventHandlerTest.php
@@ -0,0 +1,75 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Dummy/Security/SilentTokenProvider.php';
+
+use \Pecee\SimpleRouter\Handlers\EventHandler;
+use \Pecee\SimpleRouter\Event\EventArgument;
+
+class EventHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testMissingEvents() {
+
+        $events = EventHandler::$events;
+
+        // Remove the all event
+        unset($events[\array_search(EventHandler::EVENT_ALL, $events, true)], $events[\array_search(EventHandler::EVENT_REWRITE, $events, true)]);
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function(EventArgument $arg) use(&$events) {
+            $key = \array_search($arg->getEventName(), $events, true);
+            unset($events[$key]);
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            // Trigger rewrite
+            $request->setRewriteUrl('/');
+
+        });
+
+        TestRouter::get('/', 'DummyController@method1')->name('home');
+
+        TestRouter::router()->findRoute('home');
+        TestRouter::router()->getUrl('home');
+
+        $csrfVerifier = new \Pecee\Http\Middleware\BaseCsrfVerifier();
+        $csrfVerifier->setTokenProvider(new SilentTokenProvider());
+        TestRouter::csrfVerifier($csrfVerifier);
+
+        TestRouter::debug('/not-existing');
+
+        $this->assertEquals($events, []);
+
+        TestRouter::router()->reset();
+
+    }
+
+    public function testAllEvent() {
+
+        $status = 0;
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function(EventArgument $arg) use(&$status) {
+            $status++;
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::debug('/');
+
+        // All event should fire for each other event
+        $this->assertEquals(\count(EventHandler::$events), $status);
+    }
+
+    public function testEvents() {
+        $this->assertEquals(true, true);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/InputHandlerTest.php b/tests/Pecee/SimpleRouter/InputHandlerTest.php
new file mode 100644
index 0000000..69e36c0
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/InputHandlerTest.php
@@ -0,0 +1,30 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class InputHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testGet() {
+        $this->assertEquals(true, true);
+    }
+
+    public function testPost() {
+        $this->assertEquals(true, true);
+    }
+
+    public function testFile() {
+        $this->assertEquals(true, true);
+    }
+
+    public function testFiles() {
+        $this->assertEquals(true, true);
+    }
+
+    public function testAll() {
+        $this->assertEquals(true, true);
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/RouterRouteTest.php b/tests/Pecee/SimpleRouter/RouterRouteTest.php
index 63d69f9..cfdd490 100644
--- a/tests/Pecee/SimpleRouter/RouterRouteTest.php
+++ b/tests/Pecee/SimpleRouter/RouterRouteTest.php
@@ -93,6 +93,7 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
     public function testDomainAllowedRoute()
     {
         $this->result = false;
+        TestRouter::request()->setHost('hello.world.com');
 
         TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
             TestRouter::get('/test', function ($subdomain = null) {
@@ -100,7 +101,7 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
             });
         });
 
-        TestRouter::request()->setHost('hello.world.com');
+
         TestRouter::debug('/test', 'get');
 
         $this->assertTrue($this->result);
@@ -109,6 +110,8 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
 
     public function testDomainNotAllowedRoute()
     {
+        TestRouter::request()->setHost('other.world.com');
+
         $this->result = false;
 
         TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
@@ -117,9 +120,6 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
             });
         });
 
-        TestRouter::request()->setHost('other.world.com');
-
-
         TestRouter::debug('/test', 'get');
 
         $this->assertFalse($this->result);
diff --git a/tests/TestRouter.php b/tests/TestRouter.php
index 60f820c..a6a5321 100644
--- a/tests/TestRouter.php
+++ b/tests/TestRouter.php
@@ -5,8 +5,10 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
 
     public static function debugNoReset($testUrl, $testMethod = 'get')
     {
-        static::request()->setUrl($testUrl);
-        static::request()->setMethod($testMethod);
+        $request = static::request();
+
+        $request->setUrl((new \Pecee\Http\Url($testUrl))->setHost('local.unitTest'));
+        $request->setMethod($testMethod);
 
         static::start();
     }

From f5a023117aacbf069de1626a1f91bc70f3a48ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 18:51:28 +0200
Subject: [PATCH 06/25] Development - Added event-arguments data. - Added
 event-arguments to the event list in documentation. - Fixed missing
 exceptions thrown in phpDocs. - Added unit-tests for new event functionality.

---
 README.md                                     | 43 +++++-----
 .../SimpleRouter/Event/EventArgument.php      | 28 +++++++
 .../Handlers/DebugEventHandler.php            |  4 +-
 .../SimpleRouter/Handlers/EventHandler.php    |  8 +-
 .../SimpleRouter/Handlers/IEventHandler.php   |  4 +-
 .../SimpleRouter/Route/LoadableRoute.php      |  6 +-
 src/Pecee/SimpleRouter/Route/Route.php        |  2 +-
 src/Pecee/SimpleRouter/Router.php             | 80 ++++++++++++++-----
 src/Pecee/SimpleRouter/SimpleRouter.php       |  2 +
 tests/Pecee/SimpleRouter/EventHandlerTest.php | 40 ++++++----
 tests/Pecee/SimpleRouter/InputHandlerTest.php | 15 ++--
 11 files changed, 162 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index a592726..6e6294c 100644
--- a/README.md
+++ b/README.md
@@ -1238,23 +1238,25 @@ It will also cover the basics of event-handlers; how to use the handlers provide
 
 This section contains all available events that can be registered using the `EventHandler`.
 
-| Name                                      | Description               | 
-| -------------                             |-------------                      | 
-| `EventHandler::EVENT_ALL`                 | Fires when a event is triggered. |
-| `EventHandler::EVENT_INIT`                | Fires when router is initializing and before routes are loaded. |
-| `EventHandler::EVENT_LOAD`                | Fires when all routes has been loaded and rendered, just before the output is returned. |
-| `EventHandler::EVENT_REWRITE`             | Fires when a url-rewrite is and just before the routes are re-initialized. |
-| `EventHandler::EVENT_BOOT`                | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
-| `EventHandler::EVENT_RENDER_BOOTMANAGER`  | Fires before a boot-manager is rendered. |
-| `EventHandler::EVENT_LOAD_ROUTES`         | Fires when the router is about to load all routes. |
-| `EventHandler::EVENT_FIND_ROUTE`          | Fires whenever the `findRoute` method is called within the `Router`. This usually happens when the router tries to find routes that contains a certain url, usually after the `EventHandler::EVENT_GET_URL` event. |
-| `EventHandler::EVENT_GET_URL`             | Fires whenever the `Router::getUrl` method or `url`-helper function is called and the router tries to find the route. |
-| `EventHandler::EVENT_MATCH_ROUTE`         | Fires when a route is matched and valid (correct request-type etc). and before the route is rendered. |
-| `EventHandler::EVENT_RENDER_ROUTE`        | Fires before a route is rendered. |
-| `EventHandler::EVENT_LOAD_EXCEPTIONS`     | Fires when the router is loading exception-handlers. |
-| `EventHandler::EVENT_RENDER_EXCEPTION`    | Fires before the router is rendering a exception-handler. |
-| `EventHandler::EVENT_RENDER_MIDDLEWARE`   | Fires before a middleware is rendered. |
-| `EventHandler::EVENT_RENDER_CSRF`         | Fires before the CSRF-verifier is rendered. |
+All event callbacks will retrieve a `EventArgument` object as parameter. This object contains easy access to event-name, router- and request instance and any special event-arguments related to the given event. You can see what special event arguments each event returns in the list below.  
+
+| Name                        | Special arguments | Description               | 
+| -------------               |-----------      | ----                      | 
+| `EVENT_ALL`                 | - | Fires when a event is triggered. |
+| `EVENT_INIT`                | - | Fires when router is initializing and before routes are loaded. |
+| `EVENT_LOAD`                | `loadedRoutes` | Fires when all routes has been loaded and rendered, just before the output is returned. |
+| `EVENT_REWRITE`             | `rewriteUrl`<br>`rewriteRoute` | Fires when a url-rewrite is and just before the routes are re-initialized. |
+| `EVENT_BOOT`                | `bootmanagers` | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
+| `EVENT_RENDER_BOOTMANAGER`  | `bootmanagers`<br>`bootmanager` | Fires before a boot-manager is rendered. |
+| `EVENT_LOAD_ROUTES`         | `routes` | Fires when the router is about to load all routes. |
+| `EVENT_FIND_ROUTE`          | `name` | Fires whenever the `findRoute` method is called within the `Router`. This usually happens when the router tries to find routes that contains a certain url, usually after the `EventHandler::EVENT_GET_URL` event. |
+| `EVENT_GET_URL`             | `name`<br>`parameters`<br>`getParams` | Fires whenever the `Router::getUrl` method or `url`-helper function is called and the router tries to find the route. |
+| `EVENT_MATCH_ROUTE`         | `route` | Fires when a route is matched and valid (correct request-type etc). and before the route is rendered. |
+| `EVENT_RENDER_ROUTE`        | `route` | Fires before a route is rendered. |
+| `EVENT_LOAD_EXCEPTIONS`     | `exception`<br>`exceptionHandlers` | Fires when the router is loading exception-handlers. |
+| `EVENT_RENDER_EXCEPTION`    | `exception`<br>`exceptionHandler`<br>`exceptionHandlers` | Fires before the router is rendering a exception-handler. |
+| `EVENT_RENDER_MIDDLEWARES`  | `route`<br>`middlewares` | Fires before middlewares for a route is rendered. |
+| `EVENT_RENDER_CSRF`         | `csrfVerifier` | Fires before the CSRF-verifier is rendered. |
 
 ## Registering new event
 
@@ -1272,9 +1274,14 @@ use Pecee\SimpleRouter\Event\EventArgument;
 // --- your routes goes here ---
 
 $eventHandler = new EventHandler();
+
+// Add event that fires when a route is rendered
 $eventHandler->register(EventHandler::EVENT_RENDER_ROUTE, function(EventArgument $argument) {
    
-   // Fires when route is rendered ...
+   // Get the route by using the special argument for this event.
+   $route = $argument->route;
+   
+   // DO STUFF...
     
 });
 
diff --git a/src/Pecee/SimpleRouter/Event/EventArgument.php b/src/Pecee/SimpleRouter/Event/EventArgument.php
index f4aeed8..3346ffe 100644
--- a/src/Pecee/SimpleRouter/Event/EventArgument.php
+++ b/src/Pecee/SimpleRouter/Event/EventArgument.php
@@ -70,6 +70,34 @@ class EventArgument implements IEventArgument
         return $this->getRouter()->getRequest();
     }
 
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->arguments[$name] ?? null;
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->arguments);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @throws \InvalidArgumentException
+     */
+    public function __set($name, $value)
+    {
+        throw new \InvalidArgumentException('Not supported');
+    }
+
     /**
      * Get arguments
      *
diff --git a/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php b/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
index 2aa693f..690b275 100644
--- a/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php
@@ -41,9 +41,9 @@ class DebugEventHandler implements IEventHandler
      *
      * @param Router $router Router instance
      * @param string $name Event name
-     * @param array ...$eventArgs Event arguments
+     * @param array $eventArgs Event arguments
      */
-    public function fireEvents(Router $router, string $name, ...$eventArgs): void
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
     {
         $callback = $this->callback;
         $callback(new EventArgument($router, $eventArgs));
diff --git a/src/Pecee/SimpleRouter/Handlers/EventHandler.php b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
index 7b3b5af..57e0727 100644
--- a/src/Pecee/SimpleRouter/Handlers/EventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
@@ -80,7 +80,7 @@ class EventHandler implements IEventHandler
     /**
      * Fires before a middleware is rendered.
      */
-    public const EVENT_RENDER_MIDDLEWARE = 'onRenderMiddleware';
+    public const EVENT_RENDER_MIDDLEWARES = 'onRenderMiddlewares';
 
     /**
      * Fires before the CSRF-verifier is rendered.
@@ -105,7 +105,7 @@ class EventHandler implements IEventHandler
         self::EVENT_RENDER_ROUTE,
         self::EVENT_LOAD_EXCEPTIONS,
         self::EVENT_RENDER_EXCEPTION,
-        self::EVENT_RENDER_MIDDLEWARE,
+        self::EVENT_RENDER_MIDDLEWARES,
         self::EVENT_RENDER_CSRF,
     ];
 
@@ -163,9 +163,9 @@ class EventHandler implements IEventHandler
      *
      * @param Router $router Router instance
      * @param string $name Event name
-     * @param array ...$eventArgs Event arguments
+     * @param array $eventArgs Event arguments
      */
-    public function fireEvents(Router $router, string $name, ...$eventArgs): void
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
     {
         $events = $this->getEvents(static::EVENT_ALL, $name);
 
diff --git a/src/Pecee/SimpleRouter/Handlers/IEventHandler.php b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
index 2276778..9ae63c2 100644
--- a/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
@@ -19,8 +19,8 @@ interface IEventHandler {
      *
      * @param Router $router Router instance
      * @param string $name Event name
-     * @param array ...$eventArgs Event arguments
+     * @param array $eventArgs Event arguments
      */
-    public function fireEvents(Router $router, string $name, ...$eventArgs) : void;
+    public function fireEvents(Router $router, string $name, array $eventArgs = []) : void;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index 51c2591..d76cee7 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -42,9 +42,11 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                 throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
             }
 
-            $router->debug('Loading middleware "%s"', \get_class($middleware));
+            $className = \get_class($middleware);
+
+            $router->debug('Loading middleware "%s"', $className);
             $middleware->handle($request);
-            $router->debug('Finished loading middleware');
+            $router->debug('Finished loading middleware "%s"', $className);
         }
 
         $router->debug('Finished loading middlewares');
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 2f0d4eb..0426dfb 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -82,7 +82,7 @@ abstract class Route implements IRoute
      */
     public function renderRoute(Request $request, Router $router): ?string
     {
-        $router->debug('Starting rendering route');
+        $router->debug('Starting rendering route "%s"', \get_class($this));
 
         $callback = $this->getCallback();
 
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index c2a0eec..425a44d 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -258,23 +258,31 @@ class Router
     {
         $this->debug('Loading routes');
 
-        $this->fireEvents(EventHandler::EVENT_BOOT);
+        $this->fireEvents(EventHandler::EVENT_BOOT, [
+            'bootmanagers' => $this->bootManagers,
+        ]);
 
         /* Initialize boot-managers */
 
         /* @var $manager IRouterBootManager */
         foreach ($this->bootManagers as $manager) {
 
-            $this->debug('Rendering bootmanager %s', \get_class($manager));
-            $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, $manager);
+            $className = \get_class($manager);
+            $this->debug('Rendering bootmanager "%s"', $className);
+            $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, [
+                'bootmanagers' => $this->bootManagers,
+                'bootmanager' => $manager,
+            ]);
 
             /* Render bootmanager */
             $manager->boot($this, $this->request);
 
-            $this->debug('Finished rendering bootmanager');
+            $this->debug('Finished rendering bootmanager "%s"', $className);
         }
 
-        $this->fireEvents(EventHandler::EVENT_LOAD_ROUTES);
+        $this->fireEvents(EventHandler::EVENT_LOAD_ROUTES, [
+            'routes' => $this->routes,
+        ]);
 
         /* Loop through each route-request */
         $this->processRoutes($this->routes);
@@ -301,7 +309,9 @@ class Router
 
         if ($this->csrfVerifier !== null) {
 
-            $this->fireEvents(EventHandler::EVENT_RENDER_CSRF);
+            $this->fireEvents(EventHandler::EVENT_RENDER_CSRF, [
+                'csrfVerifier' => $this->csrfVerifier,
+            ]);
 
             /* Verify csrf token for request */
             $this->csrfVerifier->handle($this->request);
@@ -309,7 +319,9 @@ class Router
 
         $output = $this->routeRequest();
 
-        $this->fireEvents(EventHandler::EVENT_LOAD);
+        $this->fireEvents(EventHandler::EVENT_LOAD, [
+            'loadedRoutes' => $this->getRequest()->getLoadedRoutes(),
+        ]);
 
         $this->debug('Routing complete');
 
@@ -340,7 +352,9 @@ class Router
                 /* If the route matches */
                 if ($route->matchRoute($url, $this->request) === true) {
 
-                    $this->fireEvents(EventHandler::EVENT_MATCH_ROUTE);
+                    $this->fireEvents(EventHandler::EVENT_MATCH_ROUTE, [
+                        'route' => $route,
+                    ]);
 
                     /* Check if request method matches */
                     if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
@@ -349,7 +363,10 @@ class Router
                         continue;
                     }
 
-                    $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARE);
+                    $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARES, [
+                        'route' => $route,
+                        'middlewares' => $route->getMiddlewares(),
+                    ]);
 
                     $route->loadMiddleware($this->request, $this);
 
@@ -361,6 +378,11 @@ class Router
                     $methodNotAllowed = false;
 
                     $this->request->addLoadedRoute($route);
+
+                    $this->fireEvents(EventHandler::EVENT_RENDER_ROUTE, [
+                        'route' => $route,
+                    ]);
+
                     $output = $route->renderRoute($this->request, $this);
                     if ($output !== null) {
                         return $output;
@@ -427,7 +449,10 @@ class Router
             unset($this->processedRoutes[$key]);
             $this->request->setHasPendingRewrite(false);
 
-            $this->fireEvents(EventHandler::EVENT_REWRITE);
+            $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                'rewriteUrl'   => $this->request->getRewriteUrl(),
+                'rewriteRoute' => $this->request->getRewriteRoute(),
+            ]);
 
             return $this->routeRequest();
         }
@@ -445,7 +470,10 @@ class Router
     {
         $this->debug('Starting exception handling for "%s"', \get_class($e));
 
-        $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS);
+        $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS, [
+            'exception'         => $e,
+            'exceptionHandlers' => $this->exceptionHandlers,
+        ]);
 
         /* @var $handler IExceptionHandler */
         foreach ($this->exceptionHandlers as $key => $handler) {
@@ -454,7 +482,11 @@ class Router
                 $handler = new $handler();
             }
 
-            $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION);
+            $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION, [
+                'exception'        => $e,
+                'exceptionHandler' => $handler,
+                'exceptionHandlers' => $this->exceptionHandlers,
+            ]);
 
             $this->debug('Processing exception-handler "%s"', \get_class($handler));
 
@@ -473,7 +505,10 @@ class Router
 
                     $this->debug('Exception handler contains rewrite, reloading routes');
 
-                    $this->fireEvents(EventHandler::EVENT_REWRITE);
+                    $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                        'rewriteUrl'   => $this->request->getRewriteUrl(),
+                        'rewriteRoute' => $this->request->getRewriteRoute(),
+                    ]);
 
                     return $this->routeRequest();
                 }
@@ -498,7 +533,10 @@ class Router
     public function findRoute(string $name): ?ILoadableRoute
     {
         $this->debug('Finding route by name "%s"', $name);
-        $this->fireEvents(EventHandler::EVENT_FIND_ROUTE);
+
+        $this->fireEvents(EventHandler::EVENT_FIND_ROUTE, [
+            'name' => $name,
+        ]);
 
         /* @var $route ILoadableRoute */
         foreach ($this->processedRoutes as $route) {
@@ -576,7 +614,11 @@ class Router
     {
         $this->debug('Finding url', \func_get_args());
 
-        $this->fireEvents(EventHandler::EVENT_GET_URL);
+        $this->fireEvents(EventHandler::EVENT_GET_URL, [
+            'name'       => $name,
+            'parameters' => $parameters,
+            'getParams'  => $getParams,
+        ]);
 
         if ($getParams !== null && \is_array($getParams) === false) {
             throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
@@ -772,12 +814,12 @@ class Router
     }
 
     /**
-     * Fire event
+     * Fire event in event-handler.
      *
      * @param string $name
-     * @param array ...$args
+     * @param array $arguments
      */
-    protected function fireEvents($name, ...$args): void
+    protected function fireEvents($name, array $arguments = []): void
     {
         if (\count($this->eventHandlers) === 0) {
             return;
@@ -785,7 +827,7 @@ class Router
 
         /* @var IEventHandler $eventHandler */
         foreach ($this->eventHandlers as $eventHandler) {
-            $eventHandler->fireEvents($this, $name, $args);
+            $eventHandler->fireEvents($this, $name, $arguments);
         }
     }
 
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 4f495e6..8e56f2d 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -51,6 +51,8 @@ class SimpleRouter
     /**
      * Start routing
      *
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
      * @throws HttpException
      * @throws \Exception
      */
diff --git a/tests/Pecee/SimpleRouter/EventHandlerTest.php b/tests/Pecee/SimpleRouter/EventHandlerTest.php
index 7e49e6a..2447c9f 100644
--- a/tests/Pecee/SimpleRouter/EventHandlerTest.php
+++ b/tests/Pecee/SimpleRouter/EventHandlerTest.php
@@ -4,6 +4,7 @@ require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
 require_once 'Dummy/Security/SilentTokenProvider.php';
+require_once 'Dummy/Managers/TestBootManager.php';
 
 use \Pecee\SimpleRouter\Handlers\EventHandler;
 use \Pecee\SimpleRouter\Event\EventArgument;
@@ -11,21 +12,22 @@ use \Pecee\SimpleRouter\Event\EventArgument;
 class EventHandlerTest extends \PHPUnit\Framework\TestCase
 {
 
-    public function testMissingEvents() {
-
+    public function testAllEventTriggered()
+    {
         $events = EventHandler::$events;
 
         // Remove the all event
-        unset($events[\array_search(EventHandler::EVENT_ALL, $events, true)], $events[\array_search(EventHandler::EVENT_REWRITE, $events, true)]);
+        unset($events[\array_search(EventHandler::EVENT_ALL, $events, true)]);
 
         $eventHandler = new EventHandler();
-        $eventHandler->register(EventHandler::EVENT_ALL, function(EventArgument $arg) use(&$events) {
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$events) {
             $key = \array_search($arg->getEventName(), $events, true);
             unset($events[$key]);
         });
 
         TestRouter::addEventHandler($eventHandler);
 
+        // Add rewrite
         TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
 
             // Trigger rewrite
@@ -35,28 +37,36 @@ class EventHandlerTest extends \PHPUnit\Framework\TestCase
 
         TestRouter::get('/', 'DummyController@method1')->name('home');
 
+        // Trigger findRoute
         TestRouter::router()->findRoute('home');
+
+        // Trigger getUrl
         TestRouter::router()->getUrl('home');
 
+        // Add csrf-verifier
         $csrfVerifier = new \Pecee\Http\Middleware\BaseCsrfVerifier();
         $csrfVerifier->setTokenProvider(new SilentTokenProvider());
         TestRouter::csrfVerifier($csrfVerifier);
 
-        TestRouter::debug('/not-existing');
+        // Add boot-manager
+        TestRouter::addBootManager(new TestBootManager([
+            '/test',
+        ], '/'));
+
+        // Start router
+        TestRouter::debug('/non-existing');
 
         $this->assertEquals($events, []);
-
-        TestRouter::router()->reset();
-
     }
 
-    public function testAllEvent() {
+    public function testAllEvent()
+    {
 
-        $status = 0;
+        $status = false;
 
         $eventHandler = new EventHandler();
-        $eventHandler->register(EventHandler::EVENT_ALL, function(EventArgument $arg) use(&$status) {
-            $status++;
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$status) {
+            $status = true;
         });
 
         TestRouter::addEventHandler($eventHandler);
@@ -65,11 +75,7 @@ class EventHandlerTest extends \PHPUnit\Framework\TestCase
         TestRouter::debug('/');
 
         // All event should fire for each other event
-        $this->assertEquals(\count(EventHandler::$events), $status);
-    }
-
-    public function testEvents() {
-        $this->assertEquals(true, true);
+        $this->assertEquals(true, $status);
     }
 
 }
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/InputHandlerTest.php b/tests/Pecee/SimpleRouter/InputHandlerTest.php
index 69e36c0..7cdebc3 100644
--- a/tests/Pecee/SimpleRouter/InputHandlerTest.php
+++ b/tests/Pecee/SimpleRouter/InputHandlerTest.php
@@ -7,23 +7,28 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
 class InputHandlerTest extends \PHPUnit\Framework\TestCase
 {
 
-    public function testGet() {
+    public function testGet()
+    {
         $this->assertEquals(true, true);
     }
 
-    public function testPost() {
+    public function testPost()
+    {
         $this->assertEquals(true, true);
     }
 
-    public function testFile() {
+    public function testFile()
+    {
         $this->assertEquals(true, true);
     }
 
-    public function testFiles() {
+    public function testFiles()
+    {
         $this->assertEquals(true, true);
     }
 
-    public function testAll() {
+    public function testAll()
+    {
         $this->assertEquals(true, true);
     }
 

From 931b50098cc0f5f5dcc9a34a2c44cd127ddfe3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 18:54:03 +0200
Subject: [PATCH 07/25] Updated documentation

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 6e6294c..553cf8b 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,6 @@
 
 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 expand-ability in mind.
 
-**Please note that this documentation is currently work-in-progress. Feel free to contribute.**
-
----
-
 ## Table of Contents
 
 - [Getting started](#getting-started)

From 4c61899560747b6ab4add3a09c64206648e3362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 19:00:18 +0200
Subject: [PATCH 08/25] Updated documentation

---
 README.md | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 553cf8b..a46e868 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,6 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 - [Getting started](#getting-started)
 	- [Notes](#notes-1)
 	- [Requirements](#requirements)
-	- [Feedback and development](#feedback-and-development)
-	    - [Contribution development guidelines](#contribution-development-guidelines)
 	- [Features](#features)
 	- [Installation](#installation)
 		- [Setting up Apache](#setting-up-apache)
@@ -91,6 +89,8 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
     - [Reporting a new issue](#reporting-a-new-issue)
         - [Procedure for reporting a new issue](#procedure-for-reporting-a-new-issue)
         - [Issue template](#issue-template)
+    - [Feedback and development](#feedback-and-development)
+   	    - [Contribution development guidelines](#contribution-development-guidelines)
 
 - [Credits](#credits)
 	- [Sites](#sites)
@@ -99,7 +99,8 @@ Simple, fast and yet powerful PHP router that is easy to get integrated and in a
 ___
 
 # Getting started
-Add the latest version of Simple PHP Router running this command.
+
+Add the latest version of the simple-router project running this command.
 
 ```
 composer require pecee/simple-router
@@ -129,29 +130,7 @@ You can find the demo-project here: [https://github.com/skipperbent/simple-route
 
 ## Requirements
 
-- PHP 5.5 or greater
-
-### Feedback and development
-
-If the library is missing a feature that you need in your project or if you have feedback, we'd love to hear from you. 
-Feel free to leave us feedback by [creating a new issue](https://github.com/skipperbent/simple-php-router/issues/new).
-
-**Experiencing an issue?**
-
-Please refer to our [Help and support](#help-and-support) section in the documentation before reporting a new issue.
-
-##### 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.
+- PHP 7.1 or greater (version 3.x and below supports PHP 5.5+)
 
 ## Features
 
@@ -1685,6 +1664,28 @@ Remember that a more detailed issue- description and debug-info might suck to wr
 
 **Note:** 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. Providing the necessary steps to reproduce the error within your description, adding useful debugging info etc. will help others quickly resolve the issue you are reporting.
 
+### Feedback and development
+
+If the library is missing a feature that you need in your project or if you have feedback, we'd love to hear from you. 
+Feel free to leave us feedback by [creating a new issue](https://github.com/skipperbent/simple-php-router/issues/new).
+
+**Experiencing an issue?**
+
+Please refer to our [Help and support](#help-and-support) section in the documentation before reporting a new issue.
+
+##### 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.
+
 ---
 
 # Credits

From 1a59a659fe1dede205e67a71470c591a652ec0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 19:02:31 +0200
Subject: [PATCH 09/25] Updated documentation

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a46e868..5d48ba2 100644
--- a/README.md
+++ b/README.md
@@ -1664,7 +1664,7 @@ Remember that a more detailed issue- description and debug-info might suck to wr
 
 **Note:** 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. Providing the necessary steps to reproduce the error within your description, adding useful debugging info etc. will help others quickly resolve the issue you are reporting.
 
-### Feedback and development
+## Feedback and development
 
 If the library is missing a feature that you need in your project or if you have feedback, we'd love to hear from you. 
 Feel free to leave us feedback by [creating a new issue](https://github.com/skipperbent/simple-php-router/issues/new).
@@ -1673,7 +1673,7 @@ Feel free to leave us feedback by [creating a new issue](https://github.com/skip
 
 Please refer to our [Help and support](#help-and-support) section in the documentation before reporting a new issue.
 
-##### Contribution development guidelines
+### Contribution development guidelines
 
 - Please try to follow the PSR-2 codestyle guidelines.
 

From cca2f5cb88ac157b6e14ff7bf5c328801093e851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 19:13:55 +0200
Subject: [PATCH 10/25] Added donate option

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5d48ba2..0850b38 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
-# Simple PHP router
+# simple-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 expand-ability in mind.
+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.
+
+### Support the project
+
+If you like simple-router and wish to see the continued development and maintenance of the project,
+please consider showing your support by buying me a coffee. Supporters will be listed under the credits section of this documentation.
+
+You can donate any amount of your choice by [clicking here](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NNX4D2RUSALCN).
 
 ## Table of Contents
 

From af2ac6031da76240ac81729844ce24ef296a6840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 21:16:02 +0200
Subject: [PATCH 11/25] Development - Added dependency injection support. -
 Added php-di composer dependency. - Added `ClassLoader` class. - Added
 `IClassLoader` interface. - Added unit-tests for dependency injection. -
 Updated documentation to reflect new features.

---
 .gitignore                                    |   3 +-
 README.md                                     |  89 ++++++++++++-
 composer.json                                 |   5 +-
 src/Pecee/Http/Input/InputHandler.php         |   4 +-
 .../SimpleRouter/ClassLoader/ClassLoader.php  | 118 ++++++++++++++++++
 .../SimpleRouter/ClassLoader/IClassLoader.php |  12 ++
 .../SimpleRouter/Handlers/EventHandler.php    |   2 +-
 .../SimpleRouter/Handlers/IEventHandler.php   |   7 +-
 src/Pecee/SimpleRouter/Route/IGroupRoute.php  |   2 +-
 .../SimpleRouter/Route/LoadableRoute.php      |   2 +-
 src/Pecee/SimpleRouter/Route/Route.php        |  20 +--
 src/Pecee/SimpleRouter/Route/RouteGroup.php   |   2 +-
 src/Pecee/SimpleRouter/Router.php             |  73 ++++++++---
 src/Pecee/SimpleRouter/SimpleRouter.php       |  20 ++-
 .../SimpleRouter/DependencyInjectionTest.php  |  53 ++++++++
 tests/Pecee/SimpleRouter/GroupTest.php        |   9 +-
 tests/Pecee/SimpleRouter/RouterRouteTest.php  |  29 +++--
 17 files changed, 382 insertions(+), 68 deletions(-)
 create mode 100644 src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php
 create mode 100644 src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php
 create mode 100644 tests/Pecee/SimpleRouter/DependencyInjectionTest.php

diff --git a/.gitignore b/.gitignore
index 848a58c..4d58d1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 composer.lock
-vendor/
\ No newline at end of file
+vendor/
+tests/tmp/*
\ No newline at end of file
diff --git a/README.md b/README.md
index 0850b38..80c329a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # simple-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.
+Heavily inspired by the way Laravel handles routing, with both simplicity and expand-ability in mind.
 
 ### Support the project
 
@@ -43,6 +43,9 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 	- [Partial groups](#partial-groups)
 	- [Form Method Spoofing](#form-method-spoofing)
 	- [Accessing The Current Route](#accessing-the-current-route)
+	- [Dependency injection](#dependency-injection)
+	    - [Enabling dependency injection](#enabling-dependency-injection)
+	    - [More reading](#more-reading)
 	- [Other examples](#other-examples)
 
 - [CSRF-protection](#csrf-protection)
@@ -52,7 +55,7 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 	- [Custom Token-provider](#custom-token-provider)
 
 - [Middlewares](#middlewares)
-	- [Example](#example)
+	- [Example](#example-1)
 	
 - [ExceptionHandlers](#exceptionhandlers)
     - [Handling 404, 403 and other errors](#handling-404-403-and-other-errors)
@@ -674,6 +677,88 @@ SimpleRouter::request()->getLoadedRoute();
 request()->getLoadedRoute();
 ```
 
+## Dependency injection
+
+simple-router supports dependency injection using the [`php-di`](http://php-di.org/) library.
+
+Dependency injection allows the framework to automatically "inject" (load) classes added as parameters. This can simplify your code, as you can avoid creating new instances of objects you are using often in your `Controllers` etc.
+
+Here's a basic example of a controller class using dependency injection:
+
+```php
+namespace Demo\Controllers;
+
+class DefaultController {
+    
+    public function login(User $user): string 
+    {
+        // ...
+    }
+    
+}
+```
+
+The example above will automatically create a new instance of the `User` from the `$user` parameter. This means that the `$user` class contains a new instance of the `User` class and we won't need to create a new instance our self.
+
+**WARNING:** dependency injection can have some negative impact in performance. If you experience any performance issues, we recommend disabling this functionality.
+
+### Enabling dependency injection
+
+Dependency injection is disabled per default to avoid any performance issues.
+
+Before enabling dependency injection, we recommend that you read the [Container configuration](http://php-di.org/doc/container-configuration.html) section of the php-di documentation. This section covers how to configure php-di to different environments and speed-up the performance.
+
+#### Enabling for development environment
+
+The example below should ONLY be used on a development environment.
+
+```php
+// Create our new php-di container
+$container = (new \DI\ContainerBuilder())
+            ->useAutowiring(true)
+            ->build();
+
+// Add our container to simple-router and enable dependency injection
+SimpleRouter::enableDependencyInjection($container);
+```
+
+Please check the [More reading](#more-reading) section of the documentation for useful php-di links and tutorials.
+
+#### Enabling for production environment
+
+The example below compiles the injections, which can help speed up performance. 
+
+**Note:** You should change the `$cacheDir` to a cache-storage within your project.
+
+```php
+// Cache directory
+$cacheDir = sys_get_temp_dir('simple-router');
+
+// Create our new php-di container
+$container = (new \DI\ContainerBuilder())
+            ->enableCompilation($cacheDir)
+            ->writeProxiesToFile(true, $cacheDir . '/proxies')
+            ->useAutowiring(true)
+            ->build();
+
+// Add our container to simple-router and enable dependency injection
+SimpleRouter::enableDependencyInjection($container);
+```
+
+Please check the [More reading](#more-reading) section of the documentation for useful php-di links and tutorials.
+
+### More reading
+
+For more information about dependency injection, configuration and settings - we recommend that you check the php-di documentation or some of the useful links we've gathered below.
+
+#### Useful links
+
+- [php-di documentation](http://php-di.org/doc/)
+- [Understanding dependency injection](http://php-di.org/doc/understanding-di.html)
+- [Best practices guide](http://php-di.org/doc/best-practices.html)
+- [Configuring the container](http://php-di.org/doc/container-configuration.html)
+- [Definitions](http://php-di.org/doc/definition.html)
+
 ## Other examples
 
 You can find many more examples in the `routes.php` example-file below:
diff --git a/composer.json b/composer.json
index 9c88dd6..d0af205 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
     }
   ],
   "require": {
-    "php": ">=7.1"
+    "php": ">=7.1",
+    "php-di/php-di": "^6.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0",
@@ -38,4 +39,4 @@
       "Pecee\\": "src/Pecee/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 1f1d0e1..9b15a2a 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -214,7 +214,7 @@ class InputHandler
      * @param array ...$methods
      * @return IInputItem|null
      */
-    public function get(string $index, ...$methods) : ?IInputItem
+    public function get(string $index, ...$methods): ?IInputItem
     {
         $element = null;
 
@@ -241,7 +241,7 @@ class InputHandler
      * @param array ...$methods
      * @return string
      */
-    public function getValue(string $index, ?string $defaultValue = null, ...$methods) : ?string
+    public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
     {
         $input = $this->get($index, $methods);
 
diff --git a/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php b/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php
new file mode 100644
index 0000000..caea1a5
--- /dev/null
+++ b/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Pecee\SimpleRouter\ClassLoader;
+
+use DI\Container;
+use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+
+class ClassLoader implements IClassLoader
+{
+    /**
+     * Dependency injection enabled
+     * @var bool
+     */
+    protected $useDependencyInjection = false;
+
+    /**
+     * @var Container|null
+     */
+    protected $container;
+
+    /**
+     * Load class
+     *
+     * @param string $class
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function loadClass(string $class)
+    {
+        if (class_exists($class) === false) {
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404);
+        }
+
+        if ($this->useDependencyInjection === true) {
+            $container = $this->getContainer();
+            if ($container !== null) {
+                try {
+                    return $container->get($class);
+                } catch (\Exception $e) {
+                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+                }
+            }
+        }
+
+        return new $class();
+    }
+
+    /**
+     * Load closure
+     *
+     * @param \Closure $closure
+     * @param array $parameters
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function loadClosure(\Closure $closure, array $parameters)
+    {
+        if ($this->useDependencyInjection === true) {
+            $container = $this->getContainer();
+            if ($container !== null) {
+                try {
+                    return $container->call($closure, $parameters);
+                } catch (\Exception $e) {
+                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+                }
+            }
+        }
+
+        return \call_user_func_array($closure, $parameters);
+    }
+
+    /**
+     * Get dependency injector container.
+     *
+     * @return Container|null
+     */
+    public function getContainer(): ?Container
+    {
+        return $this->container;
+    }
+
+    /**
+     * Set the dependency-injector container.
+     *
+     * @param Container $container
+     * @return ClassLoader
+     */
+    public function setContainer(Container $container): self
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * Enable or disable dependency injection.
+     *
+     * @param bool $enabled
+     * @return static
+     */
+    public function useDependencyInjection(bool $enabled): self
+    {
+        $this->useDependencyInjection = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Return true if dependency injection is enabled.
+     *
+     * @return bool
+     */
+    public function isDependencyInjectionEnabled(): bool
+    {
+        return $this->useDependencyInjection;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php b/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php
new file mode 100644
index 0000000..d978ac1
--- /dev/null
+++ b/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Pecee\SimpleRouter\ClassLoader;
+
+interface IClassLoader
+{
+
+    public function loadClass(string $class);
+
+    public function loadClosure(\Closure $closure, array $parameters);
+
+}
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Handlers/EventHandler.php b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
index 57e0727..d3ba142 100644
--- a/src/Pecee/SimpleRouter/Handlers/EventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
@@ -150,7 +150,7 @@ class EventHandler implements IEventHandler
         $events = [];
 
         foreach ($names as $eventName) {
-            if(isset($this->registeredEvents[$eventName]) === true) {
+            if (isset($this->registeredEvents[$eventName]) === true) {
                 $events += $this->registeredEvents[$eventName];
             }
         }
diff --git a/src/Pecee/SimpleRouter/Handlers/IEventHandler.php b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
index 9ae63c2..bf4e49a 100644
--- a/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/IEventHandler.php
@@ -4,7 +4,8 @@ namespace Pecee\SimpleRouter\Handlers;
 
 use Pecee\SimpleRouter\Router;
 
-interface IEventHandler {
+interface IEventHandler
+{
 
     /**
      * Get events.
@@ -12,7 +13,7 @@ interface IEventHandler {
      * @param string|null $name Filter events by name.
      * @return array
      */
-    public function getEvents(?string $name) : array;
+    public function getEvents(?string $name): array;
 
     /**
      * Fires any events registered with given event-name
@@ -21,6 +22,6 @@ interface IEventHandler {
      * @param string $name Event name
      * @param array $eventArgs Event arguments
      */
-    public function fireEvents(Router $router, string $name, array $eventArgs = []) : void;
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/IGroupRoute.php b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
index a1ebd33..2c18d1d 100644
--- a/src/Pecee/SimpleRouter/Route/IGroupRoute.php
+++ b/src/Pecee/SimpleRouter/Route/IGroupRoute.php
@@ -2,8 +2,8 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 
 interface IGroupRoute extends IRoute
 {
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index d76cee7..9fc4cb3 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -35,7 +35,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         foreach ($this->getMiddlewares() as $middleware) {
 
             if (\is_object($middleware) === false) {
-                $middleware = $this->loadClass($middleware);
+                $middleware = $router->getClassLoader()->loadClass($middleware);
             }
 
             if (($middleware instanceof IMiddleware) === false) {
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index 0426dfb..ad56adc 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -57,21 +57,6 @@ 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) {
-            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
-        }
-
-        return new $name();
-    }
-
     /**
      * Render route
      *
@@ -107,7 +92,7 @@ abstract class Route implements IRoute
 
             /* When the callback is a function */
 
-            return \call_user_func_array($callback, $parameters);
+            return $router->getClassLoader()->loadClosure($callback, $parameters);
         }
 
         /* When the callback is a class + method */
@@ -118,7 +103,8 @@ abstract class Route implements IRoute
         $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
 
         $router->debug('Loading class %s', $className);
-        $class = $this->loadClass($className);
+        $class = $router->getClassLoader()->loadClass($className);
+
         $method = $controller[1];
 
         if (method_exists($class, $method) === false) {
diff --git a/src/Pecee/SimpleRouter/Route/RouteGroup.php b/src/Pecee/SimpleRouter/Route/RouteGroup.php
index 3ad9060..4e72215 100644
--- a/src/Pecee/SimpleRouter/Route/RouteGroup.php
+++ b/src/Pecee/SimpleRouter/Route/RouteGroup.php
@@ -2,8 +2,8 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 
 class RouteGroup extends Route implements IGroupRoute
 {
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 425a44d..05d9908 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -4,14 +4,16 @@ namespace Pecee\SimpleRouter;
 
 use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
 use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\ClassLoader;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
+use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Handlers\EventHandler;
 use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Handlers\IExceptionHandler;
-use Pecee\Http\Middleware\BaseCsrfVerifier;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\HttpException;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IControllerRoute;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
@@ -102,6 +104,12 @@ class Router
      */
     protected $eventHandlers = [];
 
+    /**
+     * Class loader instance
+     * @var ClassLoader
+     */
+    protected $classLoader;
+
     /**
      * Router constructor.
      */
@@ -115,6 +123,7 @@ class Router
      */
     public function reset(): void
     {
+        $this->debugStartTime = microtime(true);
         $this->isProcessingRoute = false;
 
         try {
@@ -132,7 +141,7 @@ class Router
         $this->eventHandlers = [];
         $this->debugList = [];
         $this->csrfVerifier = null;
-        $this->debugStartTime = microtime(true);
+        $this->classLoader = new ClassLoader();
     }
 
     /**
@@ -271,7 +280,7 @@ class Router
             $this->debug('Rendering bootmanager "%s"', $className);
             $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, [
                 'bootmanagers' => $this->bootManagers,
-                'bootmanager' => $manager,
+                'bootmanager'  => $manager,
             ]);
 
             /* Render bootmanager */
@@ -364,7 +373,7 @@ class Router
                     }
 
                     $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARES, [
-                        'route' => $route,
+                        'route'       => $route,
                         'middlewares' => $route->getMiddlewares(),
                     ]);
 
@@ -483,8 +492,8 @@ class Router
             }
 
             $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION, [
-                'exception'        => $e,
-                'exceptionHandler' => $handler,
+                'exception'         => $e,
+                'exceptionHandler'  => $handler,
                 'exceptionHandlers' => $this->exceptionHandlers,
             ]);
 
@@ -711,20 +720,28 @@ class Router
 
     /**
      * Set BootManagers
+     *
      * @param array $bootManagers
+     * @return static
      */
-    public function setBootManagers(array $bootManagers): void
+    public function setBootManagers(array $bootManagers): self
     {
         $this->bootManagers = $bootManagers;
+
+        return $this;
     }
 
     /**
      * Add BootManager
+     *
      * @param IRouterBootManager $bootManager
+     * @return static
      */
-    public function addBootManager(IRouterBootManager $bootManager): void
+    public function addBootManager(IRouterBootManager $bootManager): self
     {
         $this->bootManagers[] = $bootManager;
+
+        return $this;
     }
 
     /**
@@ -783,13 +800,36 @@ class Router
      * @param BaseCsrfVerifier $csrfVerifier
      * @return static
      */
-    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier)
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier): self
     {
         $this->csrfVerifier = $csrfVerifier;
 
         return $this;
     }
 
+    /**
+     * Set class loader
+     *
+     * @param IClassLoader $loader
+     * @return static
+     */
+    public function setClassLoader(IClassLoader $loader)
+    {
+        $this->classLoader = $loader;
+
+        return $this;
+    }
+
+    /**
+     * Get class loader
+     *
+     * @return ClassLoader
+     */
+    public function getClassLoader(): IClassLoader
+    {
+        return $this->classLoader;
+    }
+
     /**
      * Register event handler
      *
@@ -853,11 +893,14 @@ class Router
     /**
      * Enable or disables debugging
      *
-     * @param bool $boolean
+     * @param bool $enabled
+     * @return static
      */
-    public function setDebugEnabled(bool $boolean): void
+    public function setDebugEnabled(bool $enabled): self
     {
-        $this->debugEnabled = $boolean;
+        $this->debugEnabled = $enabled;
+
+        return $this;
     }
 
     /**
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 8e56f2d..3209812 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -10,14 +10,16 @@
 
 namespace Pecee\SimpleRouter;
 
+use DI\Container;
 use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Exceptions\MalformedUrlException;
-use Pecee\Http\Url;
-use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
 use Pecee\Http\Response;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
 use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\IPartialGroupRoute;
@@ -530,6 +532,20 @@ class SimpleRouter
         return $route;
     }
 
+    /**
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
+     */
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
     /**
      * Get default namespace
      * @return string|null
diff --git a/tests/Pecee/SimpleRouter/DependencyInjectionTest.php b/tests/Pecee/SimpleRouter/DependencyInjectionTest.php
new file mode 100644
index 0000000..8863f19
--- /dev/null
+++ b/tests/Pecee/SimpleRouter/DependencyInjectionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+
+class DependencyInjectionTest extends \PHPUnit\Framework\TestCase
+{
+    public function testDependencyInjectionDevelopment()
+    {
+        $builder = new \DI\ContainerBuilder();
+        $container = $builder
+            ->useAutowiring(true)
+            ->ignorePhpDocErrors(true)
+            ->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+
+    public function testDependencyInjectionProduction()
+    {
+        $cacheDir = dirname(__DIR__, 2) . '/tmp';
+
+        $builder = new \DI\ContainerBuilder();
+        $builder
+            ->enableCompilation($cacheDir)
+            ->writeProxiesToFile(true, $cacheDir . '/proxies')
+            ->ignorePhpDocErrors(true)
+            ->useAutowiring(true);
+
+        $container = $builder->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+}
\ No newline at end of file
diff --git a/tests/Pecee/SimpleRouter/GroupTest.php b/tests/Pecee/SimpleRouter/GroupTest.php
index c059253..ce79b26 100644
--- a/tests/Pecee/SimpleRouter/GroupTest.php
+++ b/tests/Pecee/SimpleRouter/GroupTest.php
@@ -5,14 +5,13 @@ require_once 'Dummy/DummyController.php';
 
 class GroupTest extends \PHPUnit\Framework\TestCase
 {
-    protected $result;
 
     public function testGroupLoad()
     {
-        $this->result = false;
+        $result = false;
 
-        TestRouter::group(['prefix' => '/group'], function () {
-            $this->result = true;
+        TestRouter::group(['prefix' => '/group'], function () use(&$result) {
+            $result = true;
         });
 
         try {
@@ -20,7 +19,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
         } catch(\Exception $e) {
 
         }
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
     }
 
     public function testNestedGroup()
diff --git a/tests/Pecee/SimpleRouter/RouterRouteTest.php b/tests/Pecee/SimpleRouter/RouterRouteTest.php
index cfdd490..8e3caea 100644
--- a/tests/Pecee/SimpleRouter/RouterRouteTest.php
+++ b/tests/Pecee/SimpleRouter/RouterRouteTest.php
@@ -6,21 +6,20 @@ require_once 'Dummy/Exception/ExceptionHandlerException.php';
 
 class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
-    protected $result = false;
-
     public function testMultiParam()
     {
-        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {
+        $result = false;
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use(&$result) {
 
             if ($param1 === 'param1' && $param2 === 'param2') {
-                $this->result = true;
+                $result = true;
             }
 
         });
 
         TestRouter::debug('/test-param1-param2', 'get');
 
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
 
     }
 
@@ -92,19 +91,19 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
 
     public function testDomainAllowedRoute()
     {
-        $this->result = false;
+        $result = false;
         TestRouter::request()->setHost('hello.world.com');
 
-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            TestRouter::get('/test', function ($subdomain = null) {
-                $this->result = ($subdomain === 'hello');
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
             });
         });
 
 
         TestRouter::debug('/test', 'get');
 
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
 
     }
 
@@ -112,17 +111,17 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
     {
         TestRouter::request()->setHost('other.world.com');
 
-        $this->result = false;
+        $result = false;
 
-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            TestRouter::get('/test', function ($subdomain = null) {
-                $this->result = ($subdomain === 'hello');
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
             });
         });
 
         TestRouter::debug('/test', 'get');
 
-        $this->assertFalse($this->result);
+        $this->assertFalse($result);
 
     }
 

From 8eded4a619dcb79c3fe2e4e8cda692d2c4c44d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 21:19:52 +0200
Subject: [PATCH 12/25] Updated documentation.

---
 README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 80c329a..18ec07d 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 		- [Setting up IIS](#setting-up-iis)
 		- [Configuration](#configuration)
 		- [Helper functions](#helper-functions)
-		
 - [Routes](#routes)
 	- [Basic routing](#basic-routing)
 		- [Available methods](#available-methods)
@@ -47,20 +46,16 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 	    - [Enabling dependency injection](#enabling-dependency-injection)
 	    - [More reading](#more-reading)
 	- [Other examples](#other-examples)
-
 - [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-1)
-	
 - [ExceptionHandlers](#exceptionhandlers)
     - [Handling 404, 403 and other errors](#handling-404-403-and-other-errors)
 	- [Using custom exception handlers](#using-custom-exception-handlers)
-
 - [Urls](#urls)
     - [Get the current url](#get-the-current-url)
  	- [Get by name (single route)](#get-by-name-single-route)
@@ -70,19 +65,16 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
  	- [Getting REST/resource controller urls](#getting-restresource-controller-urls)
  	- [Manipulating url](#manipulating-url)
  	- [Useful url tricks](#useful-url-tricks)
-
 - [Input & parameters](#input--parameters)
     - [Using the Input class to manage parameters](#using-the-input-class-to-manage-parameters)
 	    - [Get single parameter value](#get-single-parameter-value)
 	    - [Get parameter object](#get-parameter-object)
 	    - [Managing files](#managing-files)
 	    - [Get all parameters](#get-all-parameters)
-	    
 - [Events](#events)
     - [Available events](#available-events)
     - [Registering new event](#registering-new-event)
     - [Custom EventHandlers](#custom-eventhandlers)
-
 - [Advanced](#advanced)
 	- [Url rewriting](#url-rewriting)
 		- [Changing current route](#changing-current-route)
@@ -90,7 +82,6 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
 		- [Adding routes manually](#adding-routes-manually)
 	- [Parameters](#parameters)
 	- [Extending](#extending)
-
 - [Help and support](#help-and-support)
     - [Common issues and fixes](#common-issues-and-fixes)
     - [Debugging](#debugging)
@@ -102,7 +93,6 @@ You can donate any amount of your choice by [clicking here](https://www.paypal.c
         - [Issue template](#issue-template)
     - [Feedback and development](#feedback-and-development)
    	    - [Contribution development guidelines](#contribution-development-guidelines)
-
 - [Credits](#credits)
 	- [Sites](#sites)
 	- [License](#license)

From e6db83c97a865b74c12720d11ff6595988e9d4af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 21:44:41 +0200
Subject: [PATCH 13/25] Fixed defaultValue issue in `getValue` method in
 `InputHandler` class.

---
 src/Pecee/Http/Input/InputHandler.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 9b15a2a..051a187 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -244,12 +244,7 @@ class InputHandler
     public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
     {
         $input = $this->get($index, $methods);
-
-        if ($input !== null) {
-            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
-        }
-
-        return $input;
+        return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
     }
 
     /**

From a11595fb866df308441b381c0bc86645c32631e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 22:17:53 +0200
Subject: [PATCH 14/25] Bugfixes - Fixed `$methods` argument not properly
 passed in `InputHandler` class. - Updated helpers.php with latest changes.

---
 README.md                             | 11 +++--------
 helpers.php                           | 11 +++--------
 src/Pecee/Http/Input/InputHandler.php |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 18ec07d..de1bf4e 100644
--- a/README.md
+++ b/README.md
@@ -331,18 +331,13 @@ function request(): Request
  * Get input class
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
- * @param string|array|null $methods Default method
+ * @param array ...$methods Default methods
  * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
  */
-function input($index = null, $defaultValue = null, $methods = null)
+function input($index = null, $defaultValue = null, ...$methods)
 {
     if ($index !== null) {
-
-        if ($defaultValue !== null) {
-            return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
-        }
-
-        return request()->getInputHandler()->get($index, $methods);
+        return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
     }
 
     return request()->getInputHandler();
diff --git a/helpers.php b/helpers.php
index f7234a3..914c445 100644
--- a/helpers.php
+++ b/helpers.php
@@ -48,18 +48,13 @@ function request(): Request
  * Get input class
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
- * @param string|array|null $methods Default method
+ * @param array ...$methods Default methods
  * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
  */
-function input($index = null, $defaultValue = null, $methods = null)
+function input($index = null, $defaultValue = null, ...$methods)
 {
     if ($index !== null) {
-
-        if ($defaultValue !== null) {
-            return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
-        }
-
-        return request()->getInputHandler()->get($index, $methods);
+        return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
     }
 
     return request()->getInputHandler();
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 051a187..6275c5d 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -243,7 +243,7 @@ class InputHandler
      */
     public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
     {
-        $input = $this->get($index, $methods);
+        $input = $this->get($index, ...$methods);
         return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
     }
 

From a1dc4c5119d1393e3005dd25c271f69631f2b727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 22:35:21 +0200
Subject: [PATCH 15/25] Bugfixes - Updated `input` helper function. - Update
 documentation to reflect v4 changes in `InputHandler` class.

---
 README.md   | 24 +++++++++++-------------
 helpers.php |  8 ++++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index de1bf4e..0592ed9 100644
--- a/README.md
+++ b/README.md
@@ -284,9 +284,9 @@ To implement the functions below, simply copy the code to a new file and require
 <?php
 
 use Pecee\SimpleRouter\SimpleRouter as Router;
-use \Pecee\Http\Url;
-use \Pecee\Http\Response;
-use \Pecee\Http\Request;
+use Pecee\Http\Url;
+use Pecee\Http\Response;
+use Pecee\Http\Request;
 
 /**
  * Get url for a route by using either name/alias, class or method name.
@@ -337,7 +337,7 @@ function request(): Request
 function input($index = null, $defaultValue = null, ...$methods)
 {
     if ($index !== null) {
-        return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
+        return request()->getInputHandler()->getValue($index, $defaultValue, ...$methods);
     }
 
     return request()->getInputHandler();
@@ -1172,18 +1172,16 @@ $value = input($index, $defaultValue, $methods);
 
 ### Get parameter object
 
-Will return an instance of `InputItem` or `InputFile` depending on the type.
+The example below will return an instance of `InputItem` or `InputFile` depending on the type.
 
 You can use this in your html as it will render the value of the item.
-However if you want to compare value in your if statements, you have to use
-the `getValue` or use the `input()` instead.
+
+If you want to compare value in your if statements, you have to use the `getValue` or use the `input()` helper function instead.
 
 If items is grouped in the html, it will return an array of items.
 
-**Note:** `getObject` will only return `$defaultValue` if the item doesn't exist. If you want `$defaultValue` to be returned if the item is empty, please use `input()` instead.
-
 ```php
-$object = input()->getObject($index, $defaultValue = null, $methods = null);
+$object = input()->get($index, $defaultValue = null, $methods = null);
 ```
 
 ### Return specific GET parameter (where name is the name of your parameter):
@@ -1205,9 +1203,9 @@ $id = input($index, $defaultValue, $method);
 
 # -- match specific --
 
-$object = input($index, $defaultValue, 'get');
-$object = input($index, $defaultValue, 'post');
-$object = input($index, $defaultValue, 'file');
+$value = input($index, $defaultValue, 'get');
+$value = input($index, $defaultValue, 'post');
+$value = input($index, $defaultValue, 'file');
 
 # -- or --
 
diff --git a/helpers.php b/helpers.php
index 914c445..264df05 100644
--- a/helpers.php
+++ b/helpers.php
@@ -1,9 +1,9 @@
 <?php
 
 use Pecee\SimpleRouter\SimpleRouter as Router;
-use \Pecee\Http\Url;
-use \Pecee\Http\Response;
-use \Pecee\Http\Request;
+use Pecee\Http\Url;
+use Pecee\Http\Response;
+use Pecee\Http\Request;
 
 /**
  * Get url for a route by using either name/alias, class or method name.
@@ -54,7 +54,7 @@ function request(): Request
 function input($index = null, $defaultValue = null, ...$methods)
 {
     if ($index !== null) {
-        return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
+        return request()->getInputHandler()->getValue($index, $defaultValue, ...$methods);
     }
 
     return request()->getInputHandler();

From da219d0b19e17dfe5ef256a69ef8f0517e8e664b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 23:13:56 +0200
Subject: [PATCH 16/25] Bugfixes - Fixed rewrite from ExceptionHandler
 sometimes not working correctly. - Fixed default-namespace for Group and
 partial groups.

---
 src/Pecee/SimpleRouter/Router.php       | 5 +++++
 src/Pecee/SimpleRouter/SimpleRouter.php | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 05d9908..28ad270 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -510,6 +510,7 @@ class Router
                 $this->debug('Finished rendering exception-handler');
 
                 if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasPendingRewrite() === true) {
+
                     $this->loadedExceptionHandlers[$key] = $handler;
 
                     $this->debug('Exception handler contains rewrite, reloading routes');
@@ -519,6 +520,10 @@ class Router
                         'rewriteRoute' => $this->request->getRewriteRoute(),
                     ]);
 
+                    if ($this->request->getRewriteRoute() !== null) {
+                        $this->processedRoutes[] = $this->request->getRewriteRoute();
+                    }
+
                     return $this->routeRequest();
                 }
 
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 3209812..2e4436a 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -256,6 +256,7 @@ class SimpleRouter
         $group = new RouteGroup();
         $group->setCallback($callback);
         $group->setSettings($settings);
+        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -283,6 +284,7 @@ class SimpleRouter
         $group = new RoutePartialGroup();
         $group->setSettings($settings);
         $group->setCallback($callback);
+        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -511,6 +513,12 @@ class SimpleRouter
     {
         if (static::$defaultNamespace !== null) {
 
+            if ($route instanceof IGroupRoute) {
+                $route->setNamespace(static::$defaultNamespace . '\\' . ltrim($route->getNamespace(), '\\'));
+
+                return $route;
+            }
+
             $callback = $route->getCallback();
 
             /* Only add default namespace on relative callbacks */

From 17471a53cd482bd72b6a7c4db7ae2e680fb2ac2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 23:28:03 +0200
Subject: [PATCH 17/25] Removed namespace from groups

---
 src/Pecee/SimpleRouter/SimpleRouter.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 2e4436a..3209812 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -256,7 +256,6 @@ class SimpleRouter
         $group = new RouteGroup();
         $group->setCallback($callback);
         $group->setSettings($settings);
-        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -284,7 +283,6 @@ class SimpleRouter
         $group = new RoutePartialGroup();
         $group->setSettings($settings);
         $group->setCallback($callback);
-        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -513,12 +511,6 @@ class SimpleRouter
     {
         if (static::$defaultNamespace !== null) {
 
-            if ($route instanceof IGroupRoute) {
-                $route->setNamespace(static::$defaultNamespace . '\\' . ltrim($route->getNamespace(), '\\'));
-
-                return $route;
-            }
-
             $callback = $route->getCallback();
 
             /* Only add default namespace on relative callbacks */

From 80a42030ea059a9c92eedb43a09b54c2f57038f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Thu, 29 Mar 2018 23:47:27 +0200
Subject: [PATCH 18/25] Bugfixes - Fixed getting specific input-value by
 request-method in InputHandler. - Added .idea files

---
 .gitignore                                    |   1 -
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 .idea/dictionaries/simon.xml                  |  12 +
 .idea/markdown-navigator.xml                  |  72 ++
 .../markdown-navigator/profiles_settings.xml  |   3 +
 .idea/modules.xml                             |   8 +
 .idea/php-test-framework.xml                  |  14 +
 .idea/php.xml                                 |  52 +
 .idea/simple-php-router.iml                   |  49 +
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 998 ++++++++++++++++++
 src/Pecee/Http/Input/InputHandler.php         |   4 +-
 12 files changed, 1221 insertions(+), 3 deletions(-)
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/dictionaries/simon.xml
 create mode 100644 .idea/markdown-navigator.xml
 create mode 100644 .idea/markdown-navigator/profiles_settings.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/php-test-framework.xml
 create mode 100644 .idea/php.xml
 create mode 100644 .idea/simple-php-router.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 4d58d1e..f3bdaaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.idea
 composer.lock
 vendor/
 tests/tmp/*
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..91dfc80
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Simon" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/simon.xml b/.idea/dictionaries/simon.xml
new file mode 100644
index 0000000..87f7ef2
--- /dev/null
+++ b/.idea/dictionaries/simon.xml
@@ -0,0 +1,12 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="simon">
+    <words>
+      <w>bootmanager</w>
+      <w>bootmanagers</w>
+      <w>csrf</w>
+      <w>middlewares</w>
+      <w>pecee</w>
+      <w>urldecode</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..e41dd85
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.25" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
new file mode 100644
index 0000000..57927c5
--- /dev/null
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a5ba0c2
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/simple-php-router.iml" filepath="$PROJECT_DIR$/.idea/simple-php-router.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
new file mode 100644
index 0000000..82ec95c
--- /dev/null
+++ b/.idea/php-test-framework.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local" version="6.5.7" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..db05e2b
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
+      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
+      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings load_method="CUSTOM_LOADER" configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" phpunit_phar_path="" use_configuration_file="true" />
+    </phpunit_settings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/simple-php-router.iml b/.idea/simple-php-router.iml
new file mode 100644
index 0000000..2c4d89b
--- /dev/null
+++ b/.idea/simple-php-router.iml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/Pecee" isTestSource="false" packagePrefix="Pecee\" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hamcrest/hamcrest-php" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/invoker" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/php-di" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/phpdoc-reader" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..f4f4678
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,998 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="278">
+              <caret line="509" column="45" lean-forward="false" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+              <folding>
+                <element signature="e#38#84#0#PHP" expanded="true" />
+                <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/helpers.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="363">
+              <caret line="74" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="87" selection-end-column="1" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="500">
+              <caret line="283" column="39" lean-forward="true" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+              <folding>
+                <element signature="e#302#319#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="508">
+              <caret line="224" column="80" lean-forward="false" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>EVENT_RENDER_ROUTE</find>
+      <find>function renderRoute</find>
+      <find>-&gt;renderRoute</find>
+      <find>fireEvent</find>
+      <find>renderRoute</find>
+      <find>findRoute</find>
+      <find>-&gt;fireEvents</find>
+      <find>RENDER_MIDD</find>
+      <find>EVENT_RENDER_CSRF</find>
+      <find>RENDER_ROUTE</find>
+      <find>requirements</find>
+      <find># Advan</find>
+      <find># Feed</find>
+      <find>: void</find>
+      <find>call_user_func_array</find>
+      <find>loadClass</find>
+      <find>$this-&gt;</find>
+      <find>$this-&gt;result</find>
+      <find>$this-&gt;r</find>
+      <find>getInput</find>
+      <find>getValue</find>
+      <find>helpers.php</find>
+      <find>input()-&gt;get</find>
+      <find>getObject</find>
+      <find>helpers</find>
+      <find>group</find>
+      <find>addDefault</find>
+      <find>handleExc</find>
+      <find>function group</find>
+      <find>function parti</find>
+    </findStrings>
+    <dirStrings>
+      <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
+      <dir>D:\Workspace\simple-php-router\src</dir>
+      <dir>D:\Workspace\simple-php-router\tests\Pecee\SimpleRouter\Dummy</dir>
+      <dir>D:\Workspace\simple-php-router</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
+      <dir>E:\Workspace\simple-php-router\tests</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee</dir>
+      <dir>E:\Workspace\simple-php-router</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\src</dir>
+    </dirStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/Event.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php" />
+        <option value="$PROJECT_DIR$/tests/TestRouter.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/IEventArgument.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/ITokenProvider.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/DIContainerBuilder.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ContainerInterface.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/composer.json" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/helpers.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsFlowSettings">
+    <service-enabled>false</service-enabled>
+    <exe-path />
+    <annotation-enable>false</annotation-enable>
+    <other-services-enabled>false</other-services-enabled>
+    <auto-save>true</auto-save>
+  </component>
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 7.2">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
+      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
+      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+    </include_path>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-9" />
+    <option name="width" value="2295" />
+    <option name="height" value="1234" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="ClassLoader" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Handlers" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pecee-project" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.selected.package.eslint" value="" />
+    <property name="node.js.path.for.package.standard" value="project" />
+    <property name="node.js.detected.package.standard" value="true" />
+    <property name="node.js.selected.package.standard" value="" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter" />
+      <recent name="D:\Workspace\simple-php-router\tests" />
+      <recent name="D:\Workspace\simple-php-router" />
+      <recent name="D:\Workspace\simple-php-router\test" />
+      <recent name="D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\ClassLoader\Containers" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\ClassLoader" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Handler" />
+      <recent name="D:\Workspace\simple-php-router\tests" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="PHPUnit.phpunit.xml">
+    <configuration name="RouterUrlTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="RouterUrlTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" scope="Class" />
+    </configuration>
+    <configuration name="phpunit.xml" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml" scope="XML" use_alternative_configuration_file="true" />
+    </configuration>
+    <configuration name="tests" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner directory="$PROJECT_DIR$/tests" />
+    </configuration>
+    <configuration name="debug.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/tests/debug.php" />
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="PHPUnit.tests" />
+      <item index="1" class="java.lang.String" itemvalue="PHPUnit.RouterUrlTest" />
+      <item index="2" class="java.lang.String" itemvalue="PHPUnit.phpunit.xml" />
+      <item index="3" class="java.lang.String" itemvalue="PHP Script.debug.php" />
+    </list>
+    <recent_temporary>
+      <list size="4">
+        <item index="0" class="java.lang.String" itemvalue="PHPUnit.phpunit.xml" />
+        <item index="1" class="java.lang.String" itemvalue="PHPUnit.tests" />
+        <item index="2" class="java.lang.String" itemvalue="PHP Script.debug.php" />
+        <item index="3" class="java.lang.String" itemvalue="PHPUnit.RouterUrlTest" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="" />
+      <created>1502498236860</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1502498236860</updated>
+      <workItem from="1502498238130" duration="495000" />
+      <workItem from="1502589327470" duration="1325000" />
+      <workItem from="1502643621164" duration="1124000" />
+      <workItem from="1502665379176" duration="1624000" />
+      <workItem from="1502669212357" duration="163000" />
+      <workItem from="1503009054866" duration="109000" />
+      <workItem from="1503143546207" duration="965000" />
+      <workItem from="1503146420259" duration="656000" />
+      <workItem from="1503148077591" duration="1223000" />
+      <workItem from="1503157038418" duration="7000" />
+      <workItem from="1503418539960" duration="475000" />
+      <workItem from="1503499434906" duration="6410000" />
+      <workItem from="1503519096046" duration="649000" />
+      <workItem from="1503520310378" duration="280000" />
+      <workItem from="1503521737747" duration="856000" />
+      <workItem from="1503524427576" duration="2573000" />
+      <workItem from="1503536487719" duration="1589000" />
+      <workItem from="1503542802083" duration="820000" />
+      <workItem from="1503585789014" duration="820000" />
+      <workItem from="1504176764746" duration="658000" />
+      <workItem from="1504283976613" duration="694000" />
+      <workItem from="1504448385820" duration="7834000" />
+      <workItem from="1504459201935" duration="83000" />
+      <workItem from="1504459311471" duration="1376000" />
+      <workItem from="1504486369526" duration="451000" />
+      <workItem from="1504917061077" duration="1291000" />
+      <workItem from="1507375921398" duration="131000" />
+      <workItem from="1508785846050" duration="916000" />
+      <workItem from="1508786969551" duration="615000" />
+      <workItem from="1508787603350" duration="1889000" />
+      <workItem from="1509491007644" duration="14000" />
+      <workItem from="1509491033605" duration="6000" />
+      <workItem from="1510192196700" duration="11000" />
+      <workItem from="1510192217149" duration="152000" />
+      <workItem from="1510193026656" duration="140000" />
+      <workItem from="1511567082879" duration="3024000" />
+      <workItem from="1511629790083" duration="1115000" />
+      <workItem from="1511632906778" duration="6000" />
+      <workItem from="1511709768816" duration="954000" />
+      <workItem from="1511710733832" duration="10000" />
+      <workItem from="1511710754848" duration="6388000" />
+      <workItem from="1511717327384" duration="1762000" />
+      <workItem from="1511736112440" duration="855000" />
+      <workItem from="1511741616771" duration="3149000" />
+      <workItem from="1512583258866" duration="985000" />
+      <workItem from="1512706044104" duration="1603000" />
+      <workItem from="1521506970558" duration="7811000" />
+      <workItem from="1522072655826" duration="1072000" />
+      <workItem from="1522073747209" duration="63000" />
+      <workItem from="1522073847648" duration="23574000" />
+      <workItem from="1522309434425" duration="745000" />
+      <workItem from="1522310203119" duration="120000" />
+      <workItem from="1522310337826" duration="117000" />
+      <workItem from="1522310475899" duration="12840000" />
+      <workItem from="1522325810130" duration="29849000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 47m 20s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 48m 57s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 49m 08s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 04s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 18s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 23s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 21h 12m 55s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 02s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 18s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 37s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="134466000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-9" y="-9" width="2578" height="1408" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32983023" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.50919265" order="6" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.327405" sideWeight="0.49080735" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32902184" sideWeight="0.49680257" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21183054" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.327405" sideWeight="0.48880896" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="3" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IControllerRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IGroupRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-288">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IPartialGroupRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="27" column="20" lean-forward="false" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="107" column="38" lean-forward="false" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="45" column="26" lean-forward="true" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.codeclimate.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.lock">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.scrutinizer.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="16" column="36" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="80" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/ContainerBuilder.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="121" column="21" lean-forward="false" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/IContainer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="6" column="40" lean-forward="true" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/FactoryInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="14" column="10" lean-forward="false" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/invoker/src/InvokerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="10" column="10" lean-forward="false" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="72">
+          <caret line="3" column="41" lean-forward="false" selection-start-line="3" selection-start-column="41" selection-end-line="3" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/CompiledContainer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/mockery/mockery/library/Mockery/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3360">
+          <caret line="26" column="6" lean-forward="false" selection-start-line="26" selection-start-column="6" selection-end-line="26" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="266" column="20" lean-forward="false" selection-start-line="266" selection-start-column="20" selection-end-line="266" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="47" column="25" lean-forward="false" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tmp/CompiledContainer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/TestRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="24" column="30" lean-forward="false" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="90" column="49" lean-forward="false" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="30" column="27" lean-forward="false" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="34" column="47" lean-forward="false" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="16" column="8" lean-forward="false" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="105" column="33" lean-forward="false" selection-start-line="105" selection-start-column="33" selection-end-line="105" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="8" column="8" lean-forward="false" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="696">
+          <caret line="29" column="38" lean-forward="false" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="223" column="5" lean-forward="false" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="522">
+            <caret line="286" column="4" lean-forward="false" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
+            <folding>
+              <marker date="1522355637164" expanded="true" signature="8637:9494" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="8660:9477" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="8671:9453" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="8682:9441" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="8773:8940" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="8869:8887" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="9087:9429" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="9176:9341" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="11011:11176" ph=" The default namespace for route-callbacks, so we don't have to specify it each time. ..." />
+              <marker date="1522355637164" expanded="true" signature="11645:11756" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="11761:12446" ph=" Get url for a route by using either name/alias, class or method name. ..." />
+              <marker date="1522355637164" expanded="true" signature="12534:12597" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="12602:12636" ph=" @return \Pecee\Http\Response ..." />
+              <marker date="1522355637164" expanded="true" signature="12668:12703" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="12708:12741" ph=" @return \Pecee\Http\Request ..." />
+              <marker date="1522355637164" expanded="true" signature="12771:12805" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="12810:13060" ph=" Get input class ..." />
+              <marker date="1522355637164" expanded="true" signature="13127:13297" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="13156:13252" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="13302:13351" ph=" @param string $url ..." />
+              <marker date="1522355637164" expanded="true" signature="13409:13515" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="13437:13479" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="13520:13571" ph=" Get current csrf-token ..." />
+              <marker date="1522355637164" expanded="true" signature="13604:13785" ph="{...}" />
+              <marker date="1522355637164" expanded="true" signature="13697:13764" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="26989:27818" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="27118:27816" ph="..." />
+              <marker date="1522355637164" expanded="true" signature="27229:27313" ph=" Restful resource (see IRestController interface for available methods) ..." />
+              <marker date="1522355637164" expanded="true" signature="27391:27744" ph=" Load the entire controller (where url matches method names - getIndex(), postIndex(), putIndex()). ..." />
+              <marker date="1522355637164" expanded="true" signature="29571:29691" ph="..." />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="278">
+          <caret line="509" column="45" lean-forward="false" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="74" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="87" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="500">
+          <caret line="283" column="39" lean-forward="true" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+          <folding>
+            <element signature="e#302#319#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="508">
+          <caret line="224" column="80" lean-forward="false" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index 6275c5d..c83a690 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -222,11 +222,11 @@ class InputHandler
             $element = $this->findGet($index);
         }
 
-        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('post', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) !== 0 && \in_array('post', $methods, true) === true)) {
             $element = $this->findPost($index);
         }
 
-        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('file', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) !== 0 && \in_array('file', $methods, true) === true)) {
             $element = $this->findFile($index);
         }
 

From ce63e247b16e1ea513bf898918ebc3268152631d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 30 Mar 2018 05:22:41 +0200
Subject: [PATCH 19/25] Bugfixes - Fixed `Url` not outputting correct class
 when used in json_encode. - Fixed `IInputItem` being too strict about strings
 which may be nullable.

---
 .idea/workspace.xml                 | 891 ++++++++++++----------------
 src/Pecee/Http/Input/IInputItem.php |   6 +-
 src/Pecee/Http/Input/InputFile.php  |   8 +-
 src/Pecee/Http/Input/InputItem.php  |   6 +-
 src/Pecee/Http/Url.php              |  16 +-
 5 files changed, 418 insertions(+), 509 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4f4678..7507829 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -20,8 +23,8 @@
       <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="278">
-              <caret line="509" column="45" lean-forward="false" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+            <state relative-caret-position="9860">
+              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
               <folding>
                 <element signature="e#38#84#0#PHP" expanded="true" />
                 <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
@@ -33,9 +36,8 @@
       <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpers.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="363">
-              <caret line="74" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="87" selection-end-column="1" />
-              <folding />
+            <state relative-caret-position="1420">
+              <caret line="74" selection-end-line="87" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -43,8 +45,8 @@
       <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="500">
-              <caret line="283" column="39" lean-forward="true" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+            <state relative-caret-position="5160">
+              <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
               <folding>
                 <element signature="e#302#319#0#PHP" expanded="true" />
               </folding>
@@ -55,19 +57,44 @@
       <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="224" column="80" lean-forward="false" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
-              <folding />
+            <state relative-caret-position="484">
+              <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="20">
+              <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="398">
+              <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="197">
+              <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="IInputItem.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="380">
+              <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -76,7 +103,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>EVENT_RENDER_ROUTE</find>
       <find>function renderRoute</find>
       <find>-&gt;renderRoute</find>
       <find>fireEvent</find>
@@ -96,7 +122,6 @@
       <find>$this-&gt;result</find>
       <find>$this-&gt;r</find>
       <find>getInput</find>
-      <find>getValue</find>
       <find>helpers.php</find>
       <find>input()-&gt;get</find>
       <find>getObject</find>
@@ -106,6 +131,8 @@
       <find>handleExc</find>
       <find>function group</find>
       <find>function parti</find>
+      <find>__toString</find>
+      <find>getValue</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -127,7 +154,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/Event.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php" />
         <option value="$PROJECT_DIR$/tests/TestRouter.php" />
@@ -136,14 +162,11 @@
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Security/ITokenProvider.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
@@ -178,6 +201,10 @@
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
       </list>
     </option>
   </component>
@@ -194,7 +221,7 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 7.2">
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.2">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
@@ -238,30 +265,19 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-9" />
+    <option name="x" value="106" />
+    <option name="y" value="51" />
     <option name="width" value="2295" />
-    <option name="height" value="1234" />
+    <option name="height" value="1235" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -280,6 +296,21 @@
               <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Input" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
               <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -325,19 +356,20 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pecee-project" />
-    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dscuz-v1" />
     <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.selected.package.eslint" value="" />
-    <property name="node.js.path.for.package.standard" value="project" />
     <property name="node.js.detected.package.standard" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.standard" value="project" />
+    <property name="node.js.selected.package.eslint" value="" />
     <property name="node.js.selected.package.standard" value="" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -378,24 +410,21 @@
       <TestRunner directory="$PROJECT_DIR$/tests" />
     </configuration>
     <configuration name="debug.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/tests/debug.php" />
-    <list size="4">
-      <item index="0" class="java.lang.String" itemvalue="PHPUnit.tests" />
-      <item index="1" class="java.lang.String" itemvalue="PHPUnit.RouterUrlTest" />
-      <item index="2" class="java.lang.String" itemvalue="PHPUnit.phpunit.xml" />
-      <item index="3" class="java.lang.String" itemvalue="PHP Script.debug.php" />
+    <list>
+      <item itemvalue="PHPUnit.tests" />
+      <item itemvalue="PHPUnit.RouterUrlTest" />
+      <item itemvalue="PHPUnit.phpunit.xml" />
+      <item itemvalue="PHP Script.debug.php" />
     </list>
     <recent_temporary>
-      <list size="4">
-        <item index="0" class="java.lang.String" itemvalue="PHPUnit.phpunit.xml" />
-        <item index="1" class="java.lang.String" itemvalue="PHPUnit.tests" />
-        <item index="2" class="java.lang.String" itemvalue="PHP Script.debug.php" />
-        <item index="3" class="java.lang.String" itemvalue="PHPUnit.RouterUrlTest" />
+      <list>
+        <item itemvalue="PHPUnit.phpunit.xml" />
+        <item itemvalue="PHPUnit.tests" />
+        <item itemvalue="PHP Script.debug.php" />
+        <item itemvalue="PHPUnit.RouterUrlTest" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -460,7 +489,9 @@
       <workItem from="1522310203119" duration="120000" />
       <workItem from="1522310337826" duration="117000" />
       <workItem from="1522310475899" duration="12840000" />
-      <workItem from="1522325810130" duration="29849000" />
+      <workItem from="1522325810130" duration="30260000" />
+      <workItem from="1522360506281" duration="168000" />
+      <workItem from="1522378435862" duration="1346000" />
     </task>
     <servers />
   </component>
@@ -497,7 +528,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="134466000" />
+    <option name="totallyTimeSpent" value="136391000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -509,29 +540,30 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="2578" height="1408" extended-state="6" />
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32983023" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.50919265" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.327405" sideWeight="0.49080735" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32902184" sideWeight="0.49680257" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21183054" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32902184" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.327405" sideWeight="0.48880896" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info anchor="bottom" id="TODO" order="10" weight="0.32983023" />
+      <window_info anchor="bottom" id="Event Log" order="6" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
+      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" weight="0.28282827" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1923077" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info active="true" anchor="bottom" id="Find" order="1" sideWeight="0.48880896" visible="true" weight="0.3272727" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="8" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection Results" order="12" weight="0.32902184" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -544,415 +576,12 @@
     <breakpoint-manager>
       <option name="time" value="3" />
     </breakpoint-manager>
-    <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IControllerRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IGroupRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-288">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="555">
-          <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IPartialGroupRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="27" column="20" lean-forward="false" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="107" column="38" lean-forward="false" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="45" column="26" lean-forward="true" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.codeclimate.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/composer.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.scrutinizer.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="16" column="36" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="80" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/ContainerBuilder.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="121" column="21" lean-forward="false" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/IContainer.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="6" column="40" lean-forward="true" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/FactoryInterface.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="14" column="10" lean-forward="false" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-di/invoker/src/InvokerInterface.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="10" column="10" lean-forward="false" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="3" column="41" lean-forward="false" selection-start-line="3" selection-start-column="41" selection-end-line="3" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/CompiledContainer.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/mockery/mockery/library/Mockery/Container.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3360">
-          <caret line="26" column="6" lean-forward="false" selection-start-line="26" selection-start-column="6" selection-end-line="26" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/Container.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-21">
-          <caret line="266" column="20" lean-forward="false" selection-start-line="266" selection-start-column="20" selection-end-line="266" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="47" column="25" lean-forward="false" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tmp/CompiledContainer.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/TestRouter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="474">
-          <caret line="24" column="30" lean-forward="false" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="90" column="49" lean-forward="false" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="30" column="27" lean-forward="false" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="384">
-          <caret line="34" column="47" lean-forward="false" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="16" column="8" lean-forward="false" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="105" column="33" lean-forward="false" selection-start-line="105" selection-start-column="33" selection-end-line="105" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="8" column="8" lean-forward="false" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="696">
-          <caret line="29" column="38" lean-forward="false" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="223" column="5" lean-forward="false" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="522">
-            <caret line="286" column="4" lean-forward="false" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
-            <folding>
-              <marker date="1522355637164" expanded="true" signature="8637:9494" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="8660:9477" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="8671:9453" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="8682:9441" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="8773:8940" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="8869:8887" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="9087:9429" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="9176:9341" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="11011:11176" ph=" The default namespace for route-callbacks, so we don't have to specify it each time. ..." />
-              <marker date="1522355637164" expanded="true" signature="11645:11756" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="11761:12446" ph=" Get url for a route by using either name/alias, class or method name. ..." />
-              <marker date="1522355637164" expanded="true" signature="12534:12597" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="12602:12636" ph=" @return \Pecee\Http\Response ..." />
-              <marker date="1522355637164" expanded="true" signature="12668:12703" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="12708:12741" ph=" @return \Pecee\Http\Request ..." />
-              <marker date="1522355637164" expanded="true" signature="12771:12805" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="12810:13060" ph=" Get input class ..." />
-              <marker date="1522355637164" expanded="true" signature="13127:13297" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="13156:13252" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="13302:13351" ph=" @param string $url ..." />
-              <marker date="1522355637164" expanded="true" signature="13409:13515" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="13437:13479" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="13520:13571" ph=" Get current csrf-token ..." />
-              <marker date="1522355637164" expanded="true" signature="13604:13785" ph="{...}" />
-              <marker date="1522355637164" expanded="true" signature="13697:13764" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="26989:27818" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="27118:27816" ph="..." />
-              <marker date="1522355637164" expanded="true" signature="27229:27313" ph=" Restful resource (see IRestController interface for available methods) ..." />
-              <marker date="1522355637164" expanded="true" signature="27391:27744" ph=" Load the entire controller (where url matches method names - getIndex(), postIndex(), putIndex()). ..." />
-              <marker date="1522355637164" expanded="true" signature="29571:29691" ph="..." />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="278">
-          <caret line="509" column="45" lean-forward="false" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+        <state relative-caret-position="9860">
+          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
           <folding>
             <element signature="e#38#84#0#PHP" expanded="true" />
             <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
@@ -962,16 +591,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/helpers.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="74" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="87" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="1420">
+          <caret line="74" selection-end-line="87" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
-          <caret line="283" column="39" lean-forward="true" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+        <state relative-caret-position="5160">
+          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
           <folding>
             <element signature="e#302#319#0#PHP" expanded="true" />
           </folding>
@@ -980,17 +608,286 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="224" column="80" lean-forward="false" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
-          <folding />
+        <state relative-caret-position="4460">
+          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="264">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IGroupRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-288" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="45" column="26" lean-forward="true" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="16" column="36" lean-forward="true" selection-end-line="80" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/ContainerBuilder.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="121" column="21" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/IContainer.php" />
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php" />
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/FactoryInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="14" column="10" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/invoker/src/InvokerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
+    <entry file="file://$PROJECT_DIR$/vendor/mockery/mockery/library/Mockery/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3360">
+          <caret line="26" column="6" selection-start-line="26" selection-start-column="6" selection-end-line="26" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="266" column="20" selection-start-line="266" selection-start-column="20" selection-end-line="266" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tmp/CompiledContainer.php" />
+    <entry file="file://$PROJECT_DIR$/tests/TestRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="34" column="47" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="105" column="33" selection-start-line="105" selection-start-column="33" selection-end-line="105" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="696">
+          <caret line="29" column="38" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="223" column="5" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="522">
+            <caret line="286" column="4" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="9860">
+          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1420">
+          <caret line="74" selection-end-line="87" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5160">
+          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+          <folding>
+            <element signature="e#302#319#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="398">
+          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="20">
+          <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
         </state>
       </provider>
     </entry>
diff --git a/src/Pecee/Http/Input/IInputItem.php b/src/Pecee/Http/Input/IInputItem.php
index ae32b50..cc5a4e0 100644
--- a/src/Pecee/Http/Input/IInputItem.php
+++ b/src/Pecee/Http/Input/IInputItem.php
@@ -9,14 +9,14 @@ interface IInputItem
 
     public function setIndex(string $index): self;
 
-    public function getName(): string;
+    public function getName(): ?string;
 
     public function setName(string $name): self;
 
-    public function getValue(): string;
+    public function getValue(): ?string;
 
     public function setValue(string $value): self;
 
-    public function __toString();
+    public function __toString(): string;
 
 }
\ No newline at end of file
diff --git a/src/Pecee/Http/Input/InputFile.php b/src/Pecee/Http/Input/InputFile.php
index 1af9a28..e4b5672 100644
--- a/src/Pecee/Http/Input/InputFile.php
+++ b/src/Pecee/Http/Input/InputFile.php
@@ -140,7 +140,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getName(): string
+    public function getName(): ?string
     {
         return $this->name;
     }
@@ -177,7 +177,7 @@ class InputFile implements IInputItem
      *
      * @return string mixed
      */
-    public function getFilename(): string
+    public function getFilename(): ?string
     {
         return $this->filename;
     }
@@ -256,12 +256,12 @@ class InputFile implements IInputItem
         return $this;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getTmpName();
     }
 
-    public function getValue(): string
+    public function getValue(): ?string
     {
         return $this->getFilename();
     }
diff --git a/src/Pecee/Http/Input/InputItem.php b/src/Pecee/Http/Input/InputItem.php
index c3f8129..6c677b8 100644
--- a/src/Pecee/Http/Input/InputItem.php
+++ b/src/Pecee/Http/Input/InputItem.php
@@ -35,7 +35,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getName(): string
+    public function getName(): ?string
     {
         return $this->name;
     }
@@ -55,7 +55,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getValue(): string
+    public function getValue(): ?string
     {
         return $this->value;
     }
@@ -72,7 +72,7 @@ class InputItem implements IInputItem
         return $this;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return (string)$this->value;
     }
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index 212ae6e..099dd0a 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -4,7 +4,7 @@ namespace Pecee\Http;
 
 use Pecee\Http\Exceptions\MalformedUrlException;
 
-class Url
+class Url implements \JsonSerializable
 {
     private $originalUrl;
 
@@ -441,7 +441,19 @@ class Url
         return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
     }
 
-    public function __toString()
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    public function jsonSerialize(): string
+    {
+        return $this->getRelativeUrl();
+    }
+
+    public function __toString(): string
     {
         return $this->getRelativeUrl();
     }

From 833961ddc37cc4acd97fd4b18b59b282e909a82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 30 Mar 2018 05:37:04 +0200
Subject: [PATCH 20/25] Fixed `getError` in `InputFile` returning string
 instead of int.

---
 .idea/workspace.xml                | 42 ++++++++++++++----------------
 src/Pecee/Http/Input/InputFile.php |  8 +++---
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7507829..97854c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -63,11 +59,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="20">
-              <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+              <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -81,11 +77,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+            <state relative-caret-position="200">
+              <caret line="10" column="21" lean-forward="true" selection-end-line="291" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -103,9 +99,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>function renderRoute</find>
-      <find>-&gt;renderRoute</find>
-      <find>fireEvent</find>
       <find>renderRoute</find>
       <find>findRoute</find>
       <find>-&gt;fireEvents</find>
@@ -133,6 +126,9 @@
       <find>function parti</find>
       <find>__toString</find>
       <find>getValue</find>
+      <find>getError</find>
+      <find>(int)</find>
+      <find>setSize</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -202,9 +198,9 @@
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
       </list>
     </option>
   </component>
@@ -491,7 +487,7 @@
       <workItem from="1522310475899" duration="12840000" />
       <workItem from="1522325810130" duration="30260000" />
       <workItem from="1522360506281" duration="168000" />
-      <workItem from="1522378435862" duration="1346000" />
+      <workItem from="1522378435862" duration="1993000" />
     </task>
     <servers />
   </component>
@@ -528,7 +524,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="136391000" />
+    <option name="totallyTimeSpent" value="137038000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -870,13 +866,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="398">
@@ -887,7 +876,14 @@
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
-          <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+          <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="10" column="21" lean-forward="true" selection-end-line="291" selection-end-column="1" />
         </state>
       </provider>
     </entry>
diff --git a/src/Pecee/Http/Input/InputFile.php b/src/Pecee/Http/Input/InputFile.php
index e4b5672..2919187 100644
--- a/src/Pecee/Http/Input/InputFile.php
+++ b/src/Pecee/Http/Input/InputFile.php
@@ -49,7 +49,7 @@ class InputFile implements IInputItem
 
         return (new static($values['index']))
             ->setSize((int)$values['size'])
-            ->setError($values['error'])
+            ->setError((int)$values['error'])
             ->setType($values['type'])
             ->setTmpName($values['tmp_name'])
             ->setFilename($values['name']);
@@ -216,11 +216,11 @@ class InputFile implements IInputItem
     /**
      * Get upload-error code.
      *
-     * @return string
+     * @return int
      */
-    public function getError(): string
+    public function getError(): int
     {
-        return $this->errors;
+        return (int)$this->errors;
     }
 
     /**

From 5df0c128641d0a734e0bba9c8df5f7aeed153319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 30 Mar 2018 05:54:12 +0200
Subject: [PATCH 21/25] Updated helpers

---
 .idea/workspace.xml | 83 ++++++++++++++++++++++++++++-----------------
 README.md           |  2 +-
 helpers.php         |  2 +-
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 97854c5..1e9ac9b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/helpers.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -32,8 +33,23 @@
       <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpers.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1420">
-              <caret line="74" selection-end-line="87" selection-end-column="1" />
+            <state relative-caret-position="242">
+              <caret line="70" column="5" lean-forward="true" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="357">
+                <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
+                <folding>
+                  <element signature="e#6#52#0" expanded="true" />
+                </folding>
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -77,11 +93,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="10" column="21" lean-forward="true" selection-end-line="291" selection-end-column="1" />
+            <state relative-caret-position="180">
+              <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -115,7 +131,6 @@
       <find>$this-&gt;result</find>
       <find>$this-&gt;r</find>
       <find>getInput</find>
-      <find>helpers.php</find>
       <find>input()-&gt;get</find>
       <find>getObject</find>
       <find>helpers</find>
@@ -129,6 +144,7 @@
       <find>getError</find>
       <find>(int)</find>
       <find>setSize</find>
+      <find>helpers.php</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -191,8 +207,6 @@
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/helpers.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
@@ -201,6 +215,8 @@
         <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/helpers.php" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -487,7 +503,7 @@
       <workItem from="1522310475899" duration="12840000" />
       <workItem from="1522325810130" duration="30260000" />
       <workItem from="1522360506281" duration="168000" />
-      <workItem from="1522378435862" duration="1993000" />
+      <workItem from="1522378435862" duration="2680000" />
     </task>
     <servers />
   </component>
@@ -524,7 +540,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="137038000" />
+    <option name="totallyTimeSpent" value="137725000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -544,11 +560,11 @@
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
       <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
-      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" weight="0.28282827" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" visible="true" weight="0.28282827" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1923077" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="3" />
-      <window_info active="true" anchor="bottom" id="Find" order="1" sideWeight="0.48880896" visible="true" weight="0.3272727" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
@@ -814,16 +830,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="522">
-            <caret line="286" column="4" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="9860">
@@ -835,13 +841,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/helpers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <caret line="74" selection-end-line="87" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5160">
@@ -882,8 +881,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="10" column="21" lean-forward="true" selection-end-line="291" selection-end-column="1" />
+        <state relative-caret-position="180">
+          <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="70" column="5" lean-forward="true" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="357">
+            <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
+            <folding>
+              <element signature="e#6#52#0" expanded="true" />
+            </folding>
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/README.md b/README.md
index 0592ed9..16aa41c 100644
--- a/README.md
+++ b/README.md
@@ -332,7 +332,7 @@ function request(): Request
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param array ...$methods Default methods
- * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
+ * @return \Pecee\Http\Input\InputHandler|string
  */
 function input($index = null, $defaultValue = null, ...$methods)
 {
diff --git a/helpers.php b/helpers.php
index 264df05..00ffa4b 100644
--- a/helpers.php
+++ b/helpers.php
@@ -49,7 +49,7 @@ function request(): Request
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
  * @param array ...$methods Default methods
- * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
+ * @return \Pecee\Http\Input\InputHandler|string
  */
 function input($index = null, $defaultValue = null, ...$methods)
 {

From 53f0b7d8e23e895f1a056c08f6d18e41ddbb40f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Fri, 30 Mar 2018 06:47:27 +0200
Subject: [PATCH 22/25] - Fixed `getName` method in `LoadableRoute` class can
 contain nullable value.

---
 .idea/workspace.xml                           | 192 +++++++++++-------
 .../SimpleRouter/Route/LoadableRoute.php      |   2 +-
 src/Pecee/SimpleRouter/Route/Route.php        |   2 +-
 3 files changed, 120 insertions(+), 76 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e9ac9b..1da4204 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/helpers.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -17,51 +18,50 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9860">
-              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
-              <folding>
-                <element signature="e#38#84#0#PHP" expanded="true" />
-                <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpers.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="70" column="5" lean-forward="true" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
+            <state relative-caret-position="1340">
+              <caret line="70" column="5" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="357">
+              <first_editor relative-caret-position="619">
                 <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
-                <folding>
-                  <element signature="e#6#52#0" expanded="true" />
-                </folding>
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <file leaf-file-name="LoadableRoute.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5160">
-              <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
-              <folding>
-                <element signature="e#302#319#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="357">
+              <caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="160" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ILoadableRoute.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="900">
+              <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Route.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-2762">
+              <caret line="194" column="25" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -69,7 +69,7 @@
       <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="484">
+            <state relative-caret-position="4460">
               <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
             </state>
           </provider>
@@ -78,7 +78,7 @@
       <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="20">
+            <state relative-caret-position="80">
               <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
             </state>
           </provider>
@@ -87,7 +87,7 @@
       <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
+            <state relative-caret-position="9100">
               <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
             </state>
           </provider>
@@ -97,7 +97,7 @@
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="180">
-              <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+              <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -115,7 +115,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>renderRoute</find>
       <find>findRoute</find>
       <find>-&gt;fireEvents</find>
       <find>RENDER_MIDD</find>
@@ -145,19 +144,20 @@
       <find>(int)</find>
       <find>setSize</find>
       <find>helpers.php</find>
+      <find>getName</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
       <dir>D:\Workspace\simple-php-router\src</dir>
       <dir>D:\Workspace\simple-php-router\tests\Pecee\SimpleRouter\Dummy</dir>
       <dir>D:\Workspace\simple-php-router</dir>
-      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
       <dir>E:\Workspace\simple-php-router\tests</dir>
       <dir>E:\Workspace\simple-php-router\src\Pecee</dir>
       <dir>E:\Workspace\simple-php-router</dir>
       <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter</dir>
       <dir>E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter</dir>
       <dir>E:\Workspace\simple-php-router\src</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -200,8 +200,6 @@
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ContainerInterface.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php" />
         <option value="$PROJECT_DIR$/composer.json" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
@@ -217,6 +215,8 @@
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
         <option value="$PROJECT_DIR$/helpers.php" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
       </list>
     </option>
   </component>
@@ -277,8 +277,8 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="106" />
-    <option name="y" value="51" />
+    <option name="x" value="105" />
+    <option name="y" value="50" />
     <option name="width" value="2295" />
     <option name="height" value="1235" />
   </component>
@@ -346,6 +346,14 @@
               <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="Handlers" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Route" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
               <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -503,7 +511,8 @@
       <workItem from="1522310475899" duration="12840000" />
       <workItem from="1522325810130" duration="30260000" />
       <workItem from="1522360506281" duration="168000" />
-      <workItem from="1522378435862" duration="2680000" />
+      <workItem from="1522378435862" duration="2772000" />
+      <workItem from="1522385007533" duration="189000" />
     </task>
     <servers />
   </component>
@@ -540,7 +549,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="137725000" />
+    <option name="totallyTimeSpent" value="138006000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -560,8 +569,8 @@
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
       <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" visible="true" weight="0.28282827" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1923077" />
+      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" visible="true" weight="0.28282827" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19430569" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
@@ -590,6 +599,44 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="9100">
+          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="7400">
+            <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="9860">
@@ -637,13 +684,6 @@
         <state relative-caret-position="-288" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="555">
-          <caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -745,13 +785,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -767,13 +800,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/composer.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="370">
@@ -853,7 +879,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
+        <state relative-caret-position="4460">
           <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
         </state>
       </provider>
@@ -867,14 +893,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
+        <state relative-caret-position="9100">
           <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
+        <state relative-caret-position="80">
           <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
         </state>
       </provider>
@@ -882,29 +908,47 @@
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/helpers.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="70" column="5" lean-forward="true" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
+        <state relative-caret-position="1340">
+          <caret line="70" column="5" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="357">
+          <first_editor relative-caret-position="619">
             <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
-            <folding>
-              <element signature="e#6#52#0" expanded="true" />
-            </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="160" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="900">
+          <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2762">
+          <caret line="194" column="25" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index 9fc4cb3..a719af7 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -154,7 +154,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getName(): string
+    public function getName(): ?string
     {
         return $this->name;
     }
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
index ad56adc..c71686c 100644
--- a/src/Pecee/SimpleRouter/Route/Route.php
+++ b/src/Pecee/SimpleRouter/Route/Route.php
@@ -192,7 +192,7 @@ abstract class Route implements IRoute
             return $this->callback;
         }
 
-        return 'function_' . md5($this->callback);
+        return 'function:' . md5($this->callback);
     }
 
     /**

From 1dc88d23e1d1c10a3aa57cc77605bab1d76b9bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sun, 1 Apr 2018 03:02:21 +0200
Subject: [PATCH 23/25] Bugfixes and optimizations - Fixed `hasParam` not
 working returning expected value in `Url` class. - Chained the remaining
 methods in the `Url` class. - Simplified `removeParam` method in `Url` class.
 - Added new `removeParams` method to `Url` class for removal of multiple
 params.

---
 .idea/workspace.xml                     | 232 ++++++++++++------------
 src/Pecee/Http/Url.php                  |  46 ++---
 src/Pecee/SimpleRouter/SimpleRouter.php |   2 +-
 3 files changed, 142 insertions(+), 138 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1da4204..0bf9070 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -18,11 +18,23 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/helpers.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1340">
-              <caret line="70" column="5" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
+            <state relative-caret-position="275">
+              <caret line="75" selection-start-line="75" selection-end-line="87" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="8480">
+              <caret line="449" column="77" selection-start-line="449" selection-start-column="77" selection-end-line="449" selection-end-column="77" />
+              <folding>
+                <element signature="e#302#319#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -31,8 +43,8 @@
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="619">
-                <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
+              <first_editor relative-caret-position="22680">
+                <caret line="1134" column="75" selection-start-line="1134" selection-start-column="75" selection-end-line="1134" selection-end-column="75" />
               </first_editor>
               <second_editor />
             </state>
@@ -42,8 +54,8 @@
       <file leaf-file-name="LoadableRoute.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="160" />
+            <state relative-caret-position="3140">
+              <caret line="160" selection-start-line="160" selection-end-line="160" />
             </state>
           </provider>
         </entry>
@@ -57,20 +69,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Route.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Route.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2762">
-              <caret line="194" column="25" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4460">
-              <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+            <state relative-caret-position="4280">
+              <caret line="217" column="37" selection-start-line="217" selection-start-column="37" selection-end-line="217" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -87,8 +90,20 @@
       <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9100">
-              <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+            <state relative-caret-position="-917">
+              <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="205">
+              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+              <folding>
+                <element signature="e#38#84#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -102,28 +117,13 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="IInputItem.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>findRoute</find>
-      <find>-&gt;fireEvents</find>
-      <find>RENDER_MIDD</find>
-      <find>EVENT_RENDER_CSRF</find>
-      <find>RENDER_ROUTE</find>
       <find>requirements</find>
       <find># Advan</find>
       <find># Feed</find>
-      <find>: void</find>
       <find>call_user_func_array</find>
       <find>loadClass</find>
       <find>$this-&gt;</find>
@@ -145,6 +145,12 @@
       <find>setSize</find>
       <find>helpers.php</find>
       <find>getName</find>
+      <find>url(</find>
+      <find>url()</find>
+      <find>: void</find>
+      <find>void</find>
+      <find>set</find>
+      <find>hasParam</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -205,18 +211,18 @@
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
         <option value="$PROJECT_DIR$/helpers.php" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
       </list>
     </option>
   </component>
@@ -276,9 +282,8 @@
       <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="105" />
-    <option name="y" value="50" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-10" />
     <option name="width" value="2295" />
     <option name="height" value="1235" />
   </component>
@@ -290,6 +295,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -376,7 +382,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -389,7 +394,7 @@
     <property name="node.js.selected.package.eslint" value="" />
     <property name="node.js.selected.package.standard" value="" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -512,7 +517,10 @@
       <workItem from="1522325810130" duration="30260000" />
       <workItem from="1522360506281" duration="168000" />
       <workItem from="1522378435862" duration="2772000" />
-      <workItem from="1522385007533" duration="189000" />
+      <workItem from="1522385007533" duration="313000" />
+      <workItem from="1522507670882" duration="309000" />
+      <workItem from="1522508007514" duration="2427000" />
+      <workItem from="1522530661439" duration="1363000" />
     </task>
     <servers />
   </component>
@@ -549,7 +557,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="138006000" />
+    <option name="totallyTimeSpent" value="142229000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -561,30 +569,31 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
-    <editor active="true" />
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="7" />
     <layout>
-      <window_info anchor="bottom" id="TODO" order="10" weight="0.32983023" />
-      <window_info anchor="bottom" id="Event Log" order="6" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
-      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="11" weight="0.32983023" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
-      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
-      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" visible="true" weight="0.28282827" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19430569" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32902184" />
+      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.28282827" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2002997" />
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="PHP-CGI Server" order="8" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection Results" order="12" weight="0.32902184" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="REST Client" order="5" weight="0.32929292" />
+      <window_info anchor="bottom" id="Command Line Tools Console" order="9" weight="0.32928804" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -641,10 +650,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="9860">
           <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
-          <folding>
-            <element signature="e#38#84#0#PHP" expanded="true" />
-            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -856,27 +861,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9860">
-          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
-          <folding>
-            <element signature="e#38#84#0#PHP" expanded="true" />
-            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5160">
-          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
-          <folding>
-            <element signature="e#302#319#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4460">
@@ -891,13 +875,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9100">
-          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -912,27 +889,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/helpers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1340">
-          <caret line="70" column="5" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="619">
-            <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="160" />
+        <state relative-caret-position="3140">
+          <caret line="160" selection-start-line="160" selection-end-line="160" />
         </state>
       </provider>
     </entry>
@@ -945,8 +905,52 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2762">
-          <caret line="194" column="25" selection-start-line="194" selection-start-column="25" selection-end-line="194" selection-end-column="25" />
+        <state relative-caret-position="4280">
+          <caret line="217" column="37" selection-start-line="217" selection-start-column="37" selection-end-line="217" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8480">
+          <caret line="449" column="77" selection-start-line="449" selection-start-column="77" selection-end-line="449" selection-end-column="77" />
+          <folding>
+            <element signature="e#302#319#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="22680">
+            <caret line="1134" column="75" selection-start-line="1134" selection-start-column="75" selection-end-line="1134" selection-end-column="75" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-917">
+          <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="75" selection-start-line="75" selection-end-line="87" selection-end-column="1" />
         </state>
       </provider>
     </entry>
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index 099dd0a..3ee29b0 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -314,25 +314,36 @@ class Url implements \JsonSerializable
      */
     public function hasParam(string $name): bool
     {
-        return \in_array($name, $this->getParams(), true);
+        return array_key_exists($name, $this->getParams());
     }
 
     /**
-     * Removes parameter from query-string
+     * Removes multiple parameters from the query-string
+     *
+     * @param array ...$names
+     * @return static
+     */
+    public function removeParams(...$names): self
+    {
+        $params = array_diff_key($this->getParams(), array_flip($names));
+        $this->setParams($params);
+
+        return $this;
+    }
+
+    /**
+     * Removes parameter from the query-string
      *
      * @param string $name
+     * @return static
      */
-    public function removeParam(string $name): void
+    public function removeParam(string $name): self
     {
-        if ($this->hasParam($name) === true) {
-            $params = $this->getParams();
-            $key = \array_search($name, $params, true);
+        $params = $this->getParams();
+        unset($params[$name]);
+        $this->setParams($params);
 
-            if ($key === true) {
-                unset($params[$key]);
-                $this->setParams($params);
-            }
-        }
+        return $this;
     }
 
     /**
@@ -345,18 +356,7 @@ class Url implements \JsonSerializable
      */
     public function getParam(string $name, ?string $defaultValue = null): ?string
     {
-        $output = null;
-
-        if ($this->hasParam($name) === true) {
-            $params = $this->getParams();
-            $key = \array_search($name, $params, true);
-
-            if ($key === true) {
-                $output = $params[$key];
-            }
-        }
-
-        return $output ?? $defaultValue;
+        return isset($this->getParams()[$name]) ?? $defaultValue;
     }
 
     /**
diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
index 3209812..b4faf62 100644
--- a/src/Pecee/SimpleRouter/SimpleRouter.php
+++ b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -447,7 +447,7 @@ class SimpleRouter
      * @param array|null $getParams
      * @return Url
      */
-    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): Url
+    public static function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
     {
         try {
             return static::router()->getUrl($name, $parameters, $getParams);

From 17a7b28e82e4e2aee845d7c6319585665b3736f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Sun, 1 Apr 2018 04:26:48 +0200
Subject: [PATCH 24/25] Fixed `exists` method in `InputHandler` returning
 incorrect value.

---
 .idea/workspace.xml                   | 62 +++++++++++++--------------
 src/Pecee/Http/Input/InputHandler.php |  6 +--
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0bf9070..365744e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -18,11 +17,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpers.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="275">
-              <caret line="75" selection-start-line="75" selection-end-line="87" selection-end-column="1" />
+            <state relative-caret-position="355">
+              <caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="191">
+              <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -78,15 +86,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -121,7 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>requirements</find>
       <find># Advan</find>
       <find># Feed</find>
       <find>call_user_func_array</find>
@@ -151,6 +149,7 @@
       <find>void</find>
       <find>set</find>
       <find>hasParam</find>
+      <find>csrf_token</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -211,7 +210,6 @@
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
@@ -223,6 +221,7 @@
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
       </list>
     </option>
   </component>
@@ -282,7 +281,7 @@
       <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-10" />
     <option name="width" value="2295" />
     <option name="height" value="1235" />
@@ -520,7 +519,7 @@
       <workItem from="1522385007533" duration="313000" />
       <workItem from="1522507670882" duration="309000" />
       <workItem from="1522508007514" duration="2427000" />
-      <workItem from="1522530661439" duration="1363000" />
+      <workItem from="1522530661439" duration="2179000" />
     </task>
     <servers />
   </component>
@@ -557,7 +556,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="142229000" />
+    <option name="totallyTimeSpent" value="143045000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -569,15 +568,16 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="2062" height="1126" extended-state="7" />
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32983023" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
       <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
       <window_info anchor="bottom" id="Version Control" order="14" weight="0.32902184" />
-      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.28282827" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2002997" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.28282827" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2002997" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
       <window_info anchor="right" id="Database" order="3" />
@@ -861,13 +861,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4460">
-          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -949,8 +942,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/helpers.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="75" selection-start-line="75" selection-end-line="87" selection-end-column="1" />
+        <state relative-caret-position="355">
+          <caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
         </state>
       </provider>
     </entry>
diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php
index c83a690..028f9ec 100644
--- a/src/Pecee/Http/Input/InputHandler.php
+++ b/src/Pecee/Http/Input/InputHandler.php
@@ -251,12 +251,12 @@ class InputHandler
      * Check if a input-item exist
      *
      * @param string $index
-     * @param array ...$method
+     * @param array ...$methods
      * @return bool
      */
-    public function exists(string $index, ...$method): bool
+    public function exists(string $index, ...$methods): bool
     {
-        return $this->get($index, $method) !== null;
+        return $this->get($index, ...$methods) !== null;
     }
 
     /**

From 30a2ddeed9d99ed79f317017815631e208ae64e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Sessing=C3=B8?= <simon.sessingoe@gmail.com>
Date: Mon, 2 Apr 2018 14:53:36 +0200
Subject: [PATCH 25/25] Development - Added new event when adding route. -
 Added `prependUrl` method to `LoadableRoute` class. - Added unit-test for
 add-route event. - Updated documentation to reflect new changes.

---
 .idea/workspace.xml                           | 338 ++++++++++--------
 README.md                                     |   1 +
 .../SimpleRouter/Handlers/EventHandler.php    |   6 +
 .../SimpleRouter/Route/ILoadableRoute.php     |   7 +
 .../SimpleRouter/Route/LoadableRoute.php      |  13 +-
 src/Pecee/SimpleRouter/Router.php             |  10 +-
 tests/Pecee/SimpleRouter/EventHandlerTest.php |  30 +-
 7 files changed, 245 insertions(+), 160 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 365744e..6383a15 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -17,42 +22,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/helpers.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="355">
-              <caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="191">
-              <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="8480">
-              <caret line="449" column="77" selection-start-line="449" selection-start-column="77" selection-end-line="449" selection-end-column="77" />
-              <folding>
-                <element signature="e#302#319#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="22680">
-                <caret line="1134" column="75" selection-start-line="1134" selection-start-column="75" selection-end-line="1134" selection-end-column="75" />
+              <first_editor relative-caret-position="230">
+                <caret line="1298" column="39" selection-start-line="1298" selection-start-column="39" selection-end-line="1298" selection-end-column="39" />
               </first_editor>
               <second_editor />
             </state>
@@ -62,8 +37,38 @@
       <file leaf-file-name="LoadableRoute.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3140">
-              <caret line="160" selection-start-line="160" selection-end-line="160" />
+            <state relative-caret-position="146">
+              <caret line="92" column="7" lean-forward="true" selection-start-line="92" selection-start-column="7" selection-end-line="92" selection-end-column="7" />
+              <folding>
+                <element signature="e#44#82#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteController.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="213">
+              <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteResource.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="213">
+              <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteUrl.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
             </state>
           </provider>
         </entry>
@@ -71,8 +76,11 @@
       <file leaf-file-name="ILoadableRoute.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="900">
-              <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+            <state relative-caret-position="362">
+              <caret line="42" column="18" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
+              <folding>
+                <element signature="e#44#67#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -80,17 +88,8 @@
       <file leaf-file-name="Route.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4280">
-              <caret line="217" column="37" selection-start-line="217" selection-start-column="37" selection-end-line="217" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-917">
-              <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
+            <state relative-caret-position="211">
+              <caret line="239" column="10" selection-start-line="239" selection-start-column="10" selection-end-line="239" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -98,8 +97,8 @@
       <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+            <state relative-caret-position="245">
+              <caret line="156" selection-start-line="156" selection-end-line="156" />
               <folding>
                 <element signature="e#38#84#0#PHP" expanded="true" />
               </folding>
@@ -107,11 +106,26 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+      <file leaf-file-name="EventHandler.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+            <state relative-caret-position="-742">
+              <caret line="28" selection-start-line="28" selection-end-line="28" />
+              <folding>
+                <element signature="e#47#90#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="EventHandlerTest.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="278">
+              <caret line="88" column="13" lean-forward="true" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
+              <folding>
+                <element signature="e#249#292#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -120,12 +134,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find># Advan</find>
-      <find># Feed</find>
-      <find>call_user_func_array</find>
-      <find>loadClass</find>
-      <find>$this-&gt;</find>
-      <find>$this-&gt;result</find>
       <find>$this-&gt;r</find>
       <find>getInput</find>
       <find>input()-&gt;get</find>
@@ -150,6 +158,12 @@
       <find>set</find>
       <find>hasParam</find>
       <find>csrf_token</find>
+      <find>static function start</find>
+      <find>fireEvents(</find>
+      <find>EVENT_LOAD</find>
+      <find>-&gt;setUrl</find>
+      <find>setUrl</find>
+      <find>addRoute</find>
     </findStrings>
     <dirStrings>
       <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -184,18 +198,14 @@
         <option value="$PROJECT_DIR$/src/Pecee/Http/Security/ITokenProvider.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" />
         <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
-        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassHandler.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassLoader.php" />
@@ -215,13 +225,17 @@
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
         <option value="$PROJECT_DIR$/helpers.php" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
         <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
         <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
       </list>
     </option>
   </component>
@@ -385,7 +399,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dscuz-v1" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pecee-pixie" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.standard" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -423,7 +437,10 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="PHPUnit.phpunit.xml">
+  <component name="RunManager" selected="PHPUnit.EventHandlerTest">
+    <configuration name="EventHandlerTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="EventHandlerTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" scope="Class" />
+    </configuration>
     <configuration name="RouterUrlTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
       <TestRunner class="RouterUrlTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" scope="Class" />
     </configuration>
@@ -439,9 +456,11 @@
       <item itemvalue="PHPUnit.RouterUrlTest" />
       <item itemvalue="PHPUnit.phpunit.xml" />
       <item itemvalue="PHP Script.debug.php" />
+      <item itemvalue="PHPUnit.EventHandlerTest" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="PHPUnit.EventHandlerTest" />
         <item itemvalue="PHPUnit.phpunit.xml" />
         <item itemvalue="PHPUnit.tests" />
         <item itemvalue="PHP Script.debug.php" />
@@ -519,44 +538,45 @@
       <workItem from="1522385007533" duration="313000" />
       <workItem from="1522507670882" duration="309000" />
       <workItem from="1522508007514" duration="2427000" />
-      <workItem from="1522530661439" duration="2179000" />
+      <workItem from="1522530661439" duration="3502000" />
+      <workItem from="1522668357317" duration="2371000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 47m 20s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 00s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 48m 57s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 14s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 49m 08s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 37s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 04s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 42s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 18s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 43m 05s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 23s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 43m 07s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 21h 12m 55s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 14h 48m 41s.xml">
       <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 02s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 50m 26s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 18s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 50m 34s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 37s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 51m 17s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="143045000" />
+    <option name="totallyTimeSpent" value="146739000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -574,26 +594,26 @@
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32983023" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
       <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49080735" visible="true" weight="0.3272727" />
       <window_info anchor="bottom" id="Version Control" order="14" weight="0.32902184" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.28282827" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2002997" />
+      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" weight="0.28282827" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2027972" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="REST Client" order="5" weight="0.32929292" />
-      <window_info anchor="bottom" id="Command Line Tools Console" order="9" weight="0.32928804" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
+      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
+      <window_info anchor="bottom" id="REST Client" order="5" weight="0.32929292" />
+      <window_info anchor="bottom" id="Command Line Tools Console" order="9" weight="0.32928804" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -608,27 +628,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9100">
-          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -717,13 +716,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="54">
@@ -731,13 +723,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="16" column="36" lean-forward="true" selection-end-line="80" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -882,31 +867,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3140">
-          <caret line="160" selection-start-line="160" selection-end-line="160" />
+        <state relative-caret-position="6160">
+          <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+    <entry file="file://$PROJECT_DIR$/helpers.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="900">
-          <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+        <state relative-caret-position="1520">
+          <caret line="79" column="30" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4280">
-          <caret line="217" column="37" selection-start-line="217" selection-start-column="37" selection-end-line="217" selection-end-column="37" />
+        <state relative-caret-position="191">
+          <caret line="255" column="7" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8480">
-          <caret line="449" column="77" selection-start-line="449" selection-start-column="77" selection-end-line="449" selection-end-column="77" />
+        <state relative-caret-position="165">
+          <caret line="60" column="4" lean-forward="true" selection-start-line="60" selection-start-column="4" selection-end-line="63" selection-end-column="5" />
           <folding>
             <element signature="e#302#319#0#PHP" expanded="true" />
           </folding>
@@ -916,41 +901,88 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="22680">
-            <caret line="1134" column="75" selection-start-line="1134" selection-start-column="75" selection-end-line="1134" selection-end-column="75" />
+          <first_editor relative-caret-position="230">
+            <caret line="1298" column="39" selection-start-line="1298" selection-start-column="39" selection-end-line="1298" selection-end-column="39" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-917">
-          <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
+        <state relative-caret-position="362">
+          <caret line="42" column="18" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
+          <folding>
+            <element signature="e#44#67#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="92" column="7" lean-forward="true" selection-start-line="92" selection-start-column="7" selection-end-line="92" selection-end-column="7" />
+          <folding>
+            <element signature="e#44#82#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="239" column="10" selection-start-line="239" selection-start-column="10" selection-end-line="239" selection-end-column="10" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+        <state relative-caret-position="245">
+          <caret line="156" selection-start-line="156" selection-end-line="156" />
           <folding>
             <element signature="e#38#84#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/helpers.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="79" column="30" lean-forward="true" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
+        <state relative-caret-position="-742">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+          <folding>
+            <element signature="e#47#90#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
+        <state relative-caret-position="278">
+          <caret line="88" column="13" lean-forward="true" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
+          <folding>
+            <element signature="e#249#292#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
         </state>
       </provider>
     </entry>
diff --git a/README.md b/README.md
index 16aa41c..7d35382 100644
--- a/README.md
+++ b/README.md
@@ -1296,6 +1296,7 @@ All event callbacks will retrieve a `EventArgument` object as parameter. This ob
 | `EVENT_ALL`                 | - | Fires when a event is triggered. |
 | `EVENT_INIT`                | - | Fires when router is initializing and before routes are loaded. |
 | `EVENT_LOAD`                | `loadedRoutes` | Fires when all routes has been loaded and rendered, just before the output is returned. |
+| `EVENT_ADD_ROUTE`           | `route` | Fires when route is added to the router. |
 | `EVENT_REWRITE`             | `rewriteUrl`<br>`rewriteRoute` | Fires when a url-rewrite is and just before the routes are re-initialized. |
 | `EVENT_BOOT`                | `bootmanagers` | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
 | `EVENT_RENDER_BOOTMANAGER`  | `bootmanagers`<br>`bootmanager` | Fires before a boot-manager is rendered. |
diff --git a/src/Pecee/SimpleRouter/Handlers/EventHandler.php b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
index d3ba142..9ac42ec 100644
--- a/src/Pecee/SimpleRouter/Handlers/EventHandler.php
+++ b/src/Pecee/SimpleRouter/Handlers/EventHandler.php
@@ -22,6 +22,11 @@ class EventHandler implements IEventHandler
      */
     public const EVENT_LOAD = 'onLoad';
 
+    /**
+     * Fires when route is added to the router
+     */
+    public const EVENT_ADD_ROUTE = 'onAddRoute';
+
     /**
      * Fires when a url-rewrite is and just before the routes are re-initialized.
      */
@@ -95,6 +100,7 @@ class EventHandler implements IEventHandler
         self::EVENT_ALL,
         self::EVENT_INIT,
         self::EVENT_LOAD,
+        self::EVENT_ADD_ROUTE,
         self::EVENT_REWRITE,
         self::EVENT_BOOT,
         self::EVENT_RENDER_BOOTMANAGER,
diff --git a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
index 68cbbef..d0d7090 100644
--- a/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/ILoadableRoute.php
@@ -39,6 +39,13 @@ interface ILoadableRoute extends IRoute
      */
     public function setUrl(string $url): self;
 
+    /**
+     * Prepend url
+     * @param string $url
+     * @return ILoadableRoute
+     */
+    public function prependUrl(string $url): self;
+
     /**
      * Returns the provided name for the router.
      *
diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
index a719af7..02f88df 100644
--- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php
+++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -85,6 +85,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return $this;
     }
 
+    /**
+     * Prepend url
+     *
+     * @param string $url
+     * @return ILoadableRoute
+     */
+    public function prependUrl(string $url): ILoadableRoute
+    {
+        return $this->setUrl(rtrim($url, '/') . $this->url);
+    }
+
     public function getUrl(): string
     {
         return $this->url;
@@ -240,7 +251,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         }
 
         if (isset($values['prefix']) === true) {
-            $this->setUrl($values['prefix'] . $this->getUrl());
+            $this->prependUrl($values['prefix']);
         }
 
         parent::setSettings($values, $merge);
diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index 28ad270..50acc48 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -151,18 +151,20 @@ class Router
      */
     public function addRoute(IRoute $route): IRoute
     {
+        $this->fireEvents(EventHandler::EVENT_ADD_ROUTE, [
+            'route' => $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 ($this->isProcessingRoute === true) {
             $this->routeStack[] = $route;
-
-            return $route;
+        } else {
+            $this->routes[] = $route;
         }
 
-        $this->routes[] = $route;
-
         return $route;
     }
 
diff --git a/tests/Pecee/SimpleRouter/EventHandlerTest.php b/tests/Pecee/SimpleRouter/EventHandlerTest.php
index 2447c9f..8fa873d 100644
--- a/tests/Pecee/SimpleRouter/EventHandlerTest.php
+++ b/tests/Pecee/SimpleRouter/EventHandlerTest.php
@@ -6,8 +6,8 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
 require_once 'Dummy/Security/SilentTokenProvider.php';
 require_once 'Dummy/Managers/TestBootManager.php';
 
-use \Pecee\SimpleRouter\Handlers\EventHandler;
-use \Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Handlers\EventHandler;
 
 class EventHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -78,4 +78,30 @@ class EventHandlerTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(true, $status);
     }
 
+    public function testPrefixEvent()
+    {
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ADD_ROUTE, function (EventArgument $arg) use (&$status) {
+
+            if ($arg->route instanceof \Pecee\SimpleRouter\Route\LoadableRoute) {
+                $arg->route->prependUrl('/local-path');
+            }
+
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        $status = false;
+
+        TestRouter::get('/', function () use (&$status) {
+            $status = true;
+        });
+
+        TestRouter::debug('/local-path');
+
+        $this->assertTrue($status);
+
+    }
+
 }
\ No newline at end of file