Merge pull request #393 from skipperbent/v4-development

Bugfixes

.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/**

.gitignore

@@ -1,3 +1,4 @@
 .idea
 composer.lock
-vendor/
+vendor/
+tests/tmp/*

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

.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

composer.json

@@ -9,7 +9,12 @@
     "simple-php-router",
     "laravel",
     "pecee",
-    "php"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
   ],
   "license": "MIT",
   "support": {
@@ -22,14 +27,16 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.1",
+    "php-di/php-di": "^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.7.7"
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
   },
   "autoload": {
     "psr-4": {
       "Pecee\\": "src/Pecee/"
     }
   }
-}
+}

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,9 +20,10 @@ 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
  */
-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);
 }
@@ -27,7 +31,7 @@ function url($name = null, $parameters = null, $getParams = null)
 /**
  * @return \Pecee\Http\Response
  */
-function response()
+function response(): Response
 {
     return Router::response();
 }
@@ -35,7 +39,7 @@ function response()
 /**
  * @return \Pecee\Http\Request
  */
-function request()
+function request(): Request
 {
     return Router::request();
 }
@@ -44,19 +48,23 @@ function request()
  * Get input class
  * @param string|null $index Parameter index name
  * @param string|null $defaultValue Default return value
- * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\Input|string
+ * @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) {
-        return request()->getInput()->get($index, $defaultValue, $methods);
+        return request()->getInputHandler()->getValue($index, $defaultValue, ...$methods);
     }
 
-    return request()->getInput();
+    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);
@@ -69,7 +77,7 @@ function redirect($url, $code = null)
  * Get current csrf-token
  * @return string|null
  */
-function csrf_token()
+function csrf_token(): ?string
 {
     $baseVerifier = Router::router()->getCsrfVerifier();
     if ($baseVerifier !== null) {

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>

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;
 
 }

src/Pecee/Exceptions/InvalidArgumentException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Exceptions;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+
+}

src/Pecee/Http/Exceptions/MalformedUrlException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Exceptions;
+
+class MalformedUrlException extends \Exception
+{
+
+}

src/Pecee/Http/Input/IInputItem.php

@@ -1,18 +1,21 @@
 <?php
+
 namespace Pecee\Http\Input;
 
 interface IInputItem
 {
 
-    public function getIndex();
+    public function getIndex(): string;
 
-    public function setIndex($index);
+    public function setIndex(string $index): self;
 
-    public function getName();
+    public function getName(): string;
 
-    public function setName($name);
+    public function setName(string $name): self;
 
-    public function getValue();
+    public function getValue(): string;
+
+    public function setValue(string $value): self;
 
     public function __toString();
 

src/Pecee/Http/Input/InputFile.php

@@ -2,6 +2,8 @@
 
 namespace Pecee\Http\Input;
 
+use Pecee\Exceptions\InvalidArgumentException;
+
 class InputFile implements IInputItem
 {
     public $index;
@@ -9,13 +11,15 @@ class InputFile implements IInputItem
     public $filename;
     public $size;
     public $type;
-    public $error;
+    public $errors;
     public $tmpName;
 
-    public function __construct($index)
+    public function __construct(string $index)
     {
         $this->index = $index;
 
+        $this->errors = 0;
+
         // Make the name human friendly, by replace _ with space
         $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
     }
@@ -24,13 +28,13 @@ class InputFile implements IInputItem
      * Create from array
      *
      * @param array $values
-     * @throws \InvalidArgumentException
+     * @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');
+            throw new InvalidArgumentException('Index key is required');
         }
 
         /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
@@ -44,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'])
@@ -55,7 +59,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getIndex()
+    public function getIndex(): string
     {
         return $this->index;
     }
@@ -63,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(string $index): IInputItem
     {
         $this->index = $index;
 
@@ -75,7 +79,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getSize()
+    public function getSize(): string
     {
         return $this->size;
     }
@@ -83,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(int $size): IInputItem
     {
         $this->size = $size;
 
@@ -96,7 +100,7 @@ class InputFile implements IInputItem
      * Get mime-type of file
      * @return string
      */
-    public function getMime()
+    public function getMime(): string
     {
         return $this->getType();
     }
@@ -104,7 +108,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -112,9 +116,9 @@ class InputFile implements IInputItem
     /**
      * Set type
      * @param string $type
-     * @return static $this
+     * @return static
      */
-    public function setType($type)
+    public function setType(string $type): IInputItem
     {
         $this->type = $type;
 
@@ -126,7 +130,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getExtension()
+    public function getExtension(): string
     {
         return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
     }
@@ -136,7 +140,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -146,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(string $name): IInputItem
     {
         $this->name = $name;
 
@@ -159,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;
 
@@ -173,7 +177,7 @@ class InputFile implements IInputItem
      *
      * @return string mixed
      */
-    public function getFilename()
+    public function getFilename(): string
     {
         return $this->filename;
     }
@@ -184,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);
     }
@@ -194,7 +198,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getContents()
+    public function getContents(): string
     {
         return file_get_contents($this->tmpName);
     }
@@ -204,7 +208,7 @@ class InputFile implements IInputItem
      *
      * @return bool
      */
-    public function hasError()
+    public function hasError(): bool
     {
         return ($this->getError() !== 0);
     }
@@ -214,20 +218,20 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getError()
+    public function getError(): string
     {
-        return $this->error;
+        return $this->errors;
     }
 
     /**
      * Set error
      *
      * @param int $error
-     * @return static $this
+     * @return static
      */
-    public function setError($error)
+    public function setError($error): IInputItem
     {
-        $this->error = (int)$error;
+        $this->errors = (int)$error;
 
         return $this;
     }
@@ -235,7 +239,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getTmpName()
+    public function getTmpName(): string
     {
         return $this->tmpName;
     }
@@ -243,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;
 
@@ -257,19 +261,30 @@ class InputFile implements IInputItem
         return $this->getTmpName();
     }
 
-    public function getValue()
+    public function getValue(): string
     {
         return $this->getFilename();
     }
 
-    public function toArray()
+    /**
+     * @param string $value
+     * @return static
+     */
+    public function setValue(string $value): IInputItem
+    {
+        $this->filename = $value;
+
+        return $this;
+    }
+
+    public function toArray(): array
     {
         return [
             'tmp_name' => $this->tmpName,
             'type'     => $this->type,
             'size'     => $this->size,
             'name'     => $this->name,
-            'error'    => $this->error,
+            'error'    => $this->errors,
             'filename' => $this->filename,
         ];
     }

src/Pecee/Http/Input/InputHandler.php

@@ -2,9 +2,10 @@
 
 namespace Pecee\Http\Input;
 
+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Request;
 
-class Input
+class InputHandler
 {
     /**
      * @var array
@@ -26,6 +27,10 @@ class Input
      */
     protected $request;
 
+    /**
+     * Input constructor.
+     * @param Request $request
+     */
     public function __construct(Request $request)
     {
         $this->request = $request;
@@ -33,45 +38,55 @@ class Input
         $this->parseInputs();
     }
 
-    public function parseInputs()
+    /**
+     * Parse input values
+     *
+     */
+    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();
         }
     }
 
-    public function parseFiles()
+    /**
+     * @return array
+     */
+    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;
-                $list[$key] = InputFile::createFromArray($values + $value);
+                try {
+                    $list[$key] = InputFile::createFromArray($values + $value);
+                } catch (InvalidArgumentException $e) {
+
+                }
                 continue;
             }
 
             $keys = [$key];
-
             $files = $this->rearrangeFiles($value['name'], $keys, $value);
 
             if (isset($list[$key]) === true) {
@@ -85,7 +100,7 @@ class Input
         return $list;
     }
 
-    protected function rearrangeFiles(array $values, &$index, $original)
+    protected function rearrangeFiles(array $values, &$index, $original): array
     {
 
         $originalIndex = $index[0];
@@ -95,24 +110,30 @@ class Input
 
         foreach ($values as $key => $value) {
 
-            if (is_array($original['name'][$key]) === false) {
+            if (\is_array($original['name'][$key]) === false) {
 
-                $file = InputFile::createFromArray([
-                    'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
-                    'name'     => $original['name'][$key],
-                    'error'    => $original['error'][$key],
-                    'tmp_name' => $original['tmp_name'][$key],
-                    'type'     => $original['type'][$key],
-                    'size'     => $original['size'][$key],
-                ]);
+                try {
 
-                if (isset($output[$key]) === true) {
-                    $output[$key][] = $file;
+                    $file = InputFile::createFromArray([
+                        'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
+                        'name'     => $original['name'][$key],
+                        'error'    => $original['error'][$key],
+                        'tmp_name' => $original['tmp_name'][$key],
+                        'type'     => $original['type'][$key],
+                        'size'     => $original['size'][$key],
+                    ]);
+
+                    if (isset($output[$key]) === true) {
+                        $output[$key][] = $file;
+                        continue;
+                    }
+
+                    $output[$key] = $file;
                     continue;
-                }
 
-                $output[$key] = $file;
-                continue;
+                } catch (InvalidArgumentException $e) {
+
+                }
             }
 
             $index[] = $key;
@@ -130,14 +151,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;
             }
@@ -157,9 +178,9 @@ class Input
      * @param string|null $defaultValue
      * @return InputItem|string
      */
-    public function findPost($index, $defaultValue = null)
+    public function findPost(string $index, ?string $defaultValue = null)
     {
-        return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
+        return $this->post[$index] ?? $defaultValue;
     }
 
     /**
@@ -169,9 +190,9 @@ class Input
      * @param string|null $defaultValue
      * @return InputFile|string
      */
-    public function findFile($index, $defaultValue = null)
+    public function findFile(string $index, ?string $defaultValue = null)
     {
-        return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
+        return $this->file[$index] ?? $defaultValue;
     }
 
     /**
@@ -181,40 +202,35 @@ class Input
      * @param string|null $defaultValue
      * @return InputItem|string
      */
-    public function findGet($index, $defaultValue = null)
+    public function findGet(string $index, ?string $defaultValue = null)
     {
-        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
+        return $this->get[$index] ?? $defaultValue;
     }
 
     /**
      * 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($index, $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, false) === 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, false) === 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, false) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('file', $methods, true) === true)) {
             $element = $this->findFile($index);
         }
 
-        return ($element !== null) ? $element : $defaultValue;
+        return $element;
     }
 
     /**
@@ -222,29 +238,25 @@ class Input
      *
      * @param string $index
      * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return InputItem|string
+     * @param array ...$methods
+     * @return string
      */
-    public function get($index, $defaultValue = null, $methods = null)
+    public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
     {
-        $input = $this->getObject($index, $defaultValue, $methods);
-
-        if ($input instanceof InputItem) {
-            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
-        }
-
-        return $input;
+        $input = $this->get($index, ...$methods);
+        return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
     }
 
     /**
      * Check if a input-item exist
      *
      * @param string $index
+     * @param array ...$method
      * @return bool
      */
-    public function exists($index)
+    public function exists(string $index, ...$method): bool
     {
-        return ($this->getObject($index) !== null);
+        return $this->get($index, $method) !== null;
     }
 
     /**
@@ -252,23 +264,27 @@ 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 = $_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) {
-                $output = json_decode($contents, true);
-                if ($output === false) {
-                    $output = [];
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output += $post;
                 }
             }
         }
 
-        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output);
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
     }
 
 }

src/Pecee/Http/Input/InputItem.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Input;
 
 class InputItem implements IInputItem
@@ -7,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;
@@ -19,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(string $index): IInputItem
     {
         $this->index = $index;
 
@@ -34,7 +35,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -42,9 +43,9 @@ class InputItem implements IInputItem
     /**
      * Set input name
      * @param string $name
-     * @return static $this
+     * @return static
      */
-    public function setName($name)
+    public function setName(string $name): IInputItem
     {
         $this->name = $name;
 
@@ -54,7 +55,7 @@ class InputItem implements IInputItem
     /**
      * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
         return $this->value;
     }
@@ -62,9 +63,9 @@ class InputItem implements IInputItem
     /**
      * Set input value
      * @param string $value
-     * @return static $this
+     * @return static
      */
-    public function setValue($value)
+    public function setValue(string $value): IInputItem
     {
         $this->value = $value;
 

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -9,12 +9,16 @@ 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;
 
+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
     public function __construct()
     {
         $this->tokenProvider = new CookieTokenProvider();
@@ -25,23 +29,23 @@ 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->getUri()->getPath(), $url) === 0);
+                $skip = $request->getUrl()->contains($url);
             } else {
-                $skip = ($url === $request->getUri()->getPath());
+                $skip = ($url === $request->getUrl()->getOriginalUrl());
             }
 
             if ($skip === true) {
@@ -52,19 +56,24 @@ class BaseCsrfVerifier implements IMiddleware
         return false;
     }
 
-    public function handle(Request $request)
+    /**
+     * Handle request
+     *
+     * @param Request $request
+     * @throws TokenMismatchException
+     */
+    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()->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.');
             }
 
@@ -75,7 +84,7 @@ class BaseCsrfVerifier implements IMiddleware
 
     }
 
-    public function getTokenProvider()
+    public function getTokenProvider(): ITokenProvider
     {
         return $this->tokenProvider;
     }
@@ -84,7 +93,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;
     }

src/Pecee/Http/Middleware/Exceptions/TokenMismatchException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Middleware\Exceptions;
 
 class TokenMismatchException extends \Exception

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;
 
 }

src/Pecee/Http/Request.php

@@ -2,79 +2,128 @@
 
 namespace Pecee\Http;
 
-use Pecee\Http\Input\Input;
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Input\InputHandler;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
+    /**
+     * Additional data
+     *
+     * @var array
+     */
     private $data = [];
-    protected $headers;
+
+    /**
+     * Server headers
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Request host
+     * @var string
+     */
     protected $host;
-    protected $uri;
+
+    /**
+     * Current request url
+     * @var Url
+     */
+    protected $url;
+
+    /**
+     * Request method
+     * @var string
+     */
     protected $method;
-    protected $input;
+
+    /**
+     * Input handler
+     * @var InputHandler
+     */
+    protected $inputHandler;
+
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;
 
     /**
      * @var ILoadableRoute|null
      */
     protected $rewriteRoute;
+
+    /**
+     * Rewrite url
+     * @var string|null
+     */
     protected $rewriteUrl;
 
     /**
-     * @var ILoadableRoute|null
+     * @var array
      */
-    protected $loadedRoute;
+    protected $loadedRoutes = [];
 
+    /**
+     * Request constructor.
+     * @throws MalformedUrlException
+     */
     public function __construct()
     {
-        $this->parseHeaders();
-        $this->setHost($this->getHeader('http-host'));
-
-        // Check if special IIS header exist, otherwise use default.
-        $this->setUri(new Uri($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
-
-        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
-    }
-
-    protected function parseHeaders()
-    {
-        $this->headers = [];
-
         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.
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
+
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->getValue('_method', $this->getHeader('request-method')));
     }
 
-    public function isSecure()
+    public function isSecure(): bool
     {
         return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
     }
 
     /**
-     * @return Uri
+     * @return Url
      */
-    public function getUri()
+    public function getUrl(): Url
     {
-        return $this->uri;
+        return $this->url;
     }
 
     /**
-     * @return string
+     * Copy url object
+     *
+     * @return Url
      */
-    public function getHost()
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getHost(): ?string
     {
         return $this->host;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getMethod()
+    public function getMethod(): ?string
     {
         return $this->method;
     }
@@ -83,7 +132,7 @@ class Request
      * Get http basic auth user
      * @return string|null
      */
-    public function getUser()
+    public function getUser(): ?string
     {
         return $this->getHeader('php-auth-user');
     }
@@ -92,7 +141,7 @@ class Request
      * Get http basic auth password
      * @return string|null
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->getHeader('php-auth-pw');
     }
@@ -101,16 +150,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');
@@ -127,27 +176,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');
     }
@@ -160,18 +209,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;
     }
 
     /**
@@ -181,32 +230,46 @@ 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);
+    }
+
+    /**
+     * Returns true if the request is made through Ajax
+     *
+     * @return bool
+     */
+    public function isAjax(): bool
+    {
+        return (strtolower($this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
     }
 
     /**
      * Get accept formats
      * @return array
      */
-    public function getAcceptFormats()
+    public function getAcceptFormats(): array
     {
         return explode(',', $this->getHeader('http-accept'));
     }
 
     /**
-     * @param Uri $uri
+     * @param Url $url
      */
-    public function setUri(Uri $uri)
+    public function setUrl(Url $url): void
     {
-        $this->uri = $uri;
+        $this->url = $url;
+
+        if ($this->url->getHost() === null) {
+            $this->url->setHost((string)$this->getHost());
+        }
     }
 
     /**
-     * @param string $host
+     * @param string|null $host
      */
-    public function setHost($host)
+    public function setHost(?string $host): void
     {
         $this->host = $host;
     }
@@ -214,7 +277,7 @@ class Request
     /**
      * @param string $method
      */
-    public function setMethod($method)
+    public function setMethod(string $method): void
     {
         $this->method = $method;
     }
@@ -225,8 +288,9 @@ class Request
      * @param ILoadableRoute $route
      * @return static
      */
-    public function setRewriteRoute(ILoadableRoute $route)
+    public function setRewriteRoute(ILoadableRoute $route): self
     {
+        $this->hasPendingRewrite = true;
         $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
 
         return $this;
@@ -237,7 +301,7 @@ class Request
      *
      * @return ILoadableRoute|null
      */
-    public function getRewriteRoute()
+    public function getRewriteRoute(): ?ILoadableRoute
     {
         return $this->rewriteRoute;
     }
@@ -245,9 +309,9 @@ class Request
     /**
      * Get rewrite url
      *
-     * @return string
+     * @return string|null
      */
-    public function getRewriteUrl()
+    public function getRewriteUrl(): ?string
     {
         return $this->rewriteUrl;
     }
@@ -258,48 +322,97 @@ class Request
      * @param string $rewriteUrl
      * @return static
      */
-    public function setRewriteUrl($rewriteUrl)
+    public function setRewriteUrl(string $rewriteUrl): self
     {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasPendingRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';
 
         return $this;
     }
 
     /**
      * Set rewrite callback
-     * @param string $callback
+     * @param string|\Closure $callback
      * @return static
      */
-    public function setRewriteCallback($callback)
+    public function setRewriteCallback($callback): self
     {
-        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+        $this->hasPendingRewrite = true;
+
+        return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
     }
 
     /**
      * 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
+     *
+     * @return array
+     */
+    public function getLoadedRoutes(): array
+    {
+        return $this->loadedRoutes;
+    }
+
+    /**
+     * Set loaded routes
+     *
+     * @param array $routes
+     * @return static
+     */
+    public function setLoadedRoutes(array $routes): self
+    {
+        $this->loadedRoutes = $routes;
+
+        return $this;
+    }
+
+    /**
+     * Added loaded route
      *
      * @param ILoadableRoute $route
      * @return static
      */
-    public function setLoadedRoute(ILoadableRoute $route)
+    public function addLoadedRoute(ILoadableRoute $route): self
     {
-        $this->loadedRoute = $route;
+        $this->loadedRoutes[] = $route;
+
+        return $this;
+    }
+
+    /**
+     * Returns true if the request contains a rewrite
+     *
+     * @return bool
+     */
+    public function hasPendingRewrite(): bool
+    {
+        return $this->hasPendingRewrite;
+    }
+
+    /**
+     * Defines if the current request contains a rewrite.
+     *
+     * @param bool $boolean
+     * @return Request
+     */
+    public function setHasPendingRewrite(bool $boolean): self
+    {
+        $this->hasPendingRewrite = $boolean;
 
         return $this;
     }
 
     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)
@@ -309,7 +422,7 @@ class Request
 
     public function __get($name)
     {
-        return isset($this->data[$name]) ? $this->data[$name] : null;
+        return $this->data[$name] ?? null;
     }
 
 }

src/Pecee/Http/Response.php

@@ -2,6 +2,8 @@
 
 namespace Pecee\Http;
 
+use Pecee\Exceptions\InvalidArgumentException;
+
 class Response
 {
     protected $request;
@@ -17,7 +19,7 @@ class Response
      * @param int $code
      * @return static
      */
-    public function httpCode($code)
+    public function httpCode(int $code): self
     {
         http_response_code($code);
 
@@ -30,19 +32,19 @@ class Response
      * @param string $url
      * @param int $httpCode
      */
-    public function redirect($url, $httpCode = null)
+    public function redirect(string $url, ?int $httpCode = null): void
     {
         if ($httpCode !== null) {
             $this->httpCode($httpCode);
         }
 
         $this->header('location: ' . $url);
-        die();
+        exit(0);
     }
 
-    public function refresh()
+    public function refresh(): void
     {
-        $this->redirect($this->request->getUri()->getPath());
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
     }
 
     /**
@@ -50,7 +52,7 @@ class Response
      * @param string $name
      * @return static
      */
-    public function auth($name = '')
+    public function auth(string $name = ''): self
     {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
@@ -60,23 +62,22 @@ class Response
         return $this;
     }
 
-    public function cache($eTag, $lastModified = 2592000)
+    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();
+            exit(0);
         }
 
         return $this;
@@ -85,16 +86,18 @@ class Response
     /**
      * Json encode
      * @param array|\JsonSerializable $value
-     * @throws \InvalidArgumentException;
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws InvalidArgumentException
      */
-    public function json($value)
+    public function json($value, ?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.');
+        if (($value instanceof \JsonSerializable) === false && \is_array($value) === false) {
+            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
         }
 
-        $this->header('Content-type: application/json');
-        echo json_encode($value);
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
         exit(0);
     }
 
@@ -103,7 +106,7 @@ class Response
      * @param string $value
      * @return static
      */
-    public function header($value)
+    public function header(string $value): self
     {
         header($value);
 
@@ -115,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);

src/Pecee/Http/Security/CookieTokenProvider.php

@@ -2,13 +2,19 @@
 
 namespace Pecee\Http\Security;
 
+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;
 
+    /**
+     * CookieTokenProvider constructor.
+     * @throws SecurityException
+     */
     public function __construct()
     {
         $this->token = $this->getToken();
@@ -21,23 +27,16 @@ class CookieTokenProvider implements ITokenProvider
     /**
      * Generate random identifier for CSRF token
      *
-     * @throws \RuntimeException
      * @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());
         }
-
-        $isSourceStrong = false;
-
-        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
-        if ($isSourceStrong === false || $random === false) {
-            throw new \RuntimeException('IV generation failed');
-        }
-
-        return $random;
     }
 
     /**
@@ -46,9 +45,9 @@ class CookieTokenProvider implements ITokenProvider
      * @param string $token
      * @return bool
      */
-    public function validate($token)
+    public function validate(string $token): bool
     {
-        if ($token !== null && $this->getToken() !== null) {
+        if ($this->getToken() !== null) {
             return hash_equals($token, $this->getToken());
         }
 
@@ -61,10 +60,10 @@ class CookieTokenProvider implements ITokenProvider
      *
      * @param string $token
      */
-    public function setToken($token)
+    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'));
     }
 
     /**
@@ -72,17 +71,17 @@ class CookieTokenProvider implements ITokenProvider
      * @param string|null $defaultValue
      * @return string|null
      */
-    public function getToken($defaultValue = null)
+    public function getToken(?string $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);
@@ -93,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]);
     }
@@ -102,16 +101,16 @@ class CookieTokenProvider implements ITokenProvider
      * Get timeout for cookie in minutes
      * @return int
      */
-    public function getCookieTimeoutMinutes()
+    public function getCookieTimeoutMinutes(): int
     {
         return $this->cookieTimeoutMinutes;
     }
 
     /**
      * Set cookie timeout in minutes
-     * @param $minutes
+     * @param int $minutes
      */
-    public function setCookieTimeoutMinutes($minutes)
+    public function setCookieTimeoutMinutes(int $minutes): void
     {
         $this->cookieTimeoutMinutes = $minutes;
     }

src/Pecee/Http/Security/Exceptions/SecurityException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Security\Exceptions;
+
+class SecurityException extends \Exception
+{
+
+}

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(string $token): bool;
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string;
 
 }

src/Pecee/Http/Uri.php

@@ -1,172 +0,0 @@
-<?php
-
-namespace Pecee\Http;
-
-class Uri
-{
-    private $originalUrl;
-    private $data = [
-        'scheme'   => null,
-        'host'     => null,
-        'port'     => null,
-        'user'     => null,
-        'pass'     => null,
-        'path'     => null,
-        'query'    => null,
-        'fragment' => null,
-    ];
-
-    public function __construct($url)
-    {
-        $this->originalUrl = $url;
-        $this->data = $this->parseUrl($url) + $this->data;
-
-        if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
-            $this->data['path'] = rtrim($this->data['path'], '/') . '/';
-        }
-
-    }
-
-    /**
-     * Check if url is using a secure protocol like https
-     * @return bool
-     */
-    public function isSecure()
-    {
-        return (strtolower($this->getScheme()) === 'https');
-    }
-
-    /**
-     * Checks if url is relative
-     * @return bool
-     */
-    public function isRelative()
-    {
-        return ($this->getHost() === null);
-    }
-
-    /**
-     * Get url scheme
-     * @return string|null
-     */
-    public function getScheme()
-    {
-        return $this->data['scheme'];
-    }
-
-    /**
-     * Get url host
-     * @return string|null
-     */
-    public function getHost()
-    {
-        return $this->data['host'];
-    }
-
-    /**
-     * Get url port
-     * @return int|null
-     */
-    public function getPort()
-    {
-        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
-    }
-
-    /**
-     * Parse username from url
-     * @return string|null
-     */
-    public function getUserName()
-    {
-        return $this->data['user'];
-    }
-
-    /**
-     * Parse password from url
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->data['pass'];
-    }
-
-    /**
-     * Get path from url
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->data['path'];
-    }
-
-    /**
-     * Get querystring from url
-     * @return string|null
-     */
-    public function getQueryString()
-    {
-        return $this->data['query'];
-    }
-
-    /**
-     * Get fragment from url (everything after #)
-     * @return string|null
-     */
-    public function getFragment()
-    {
-        return $this->data['fragment'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getOriginalUrl()
-    {
-        return $this->originalUrl;
-    }
-
-    /**
-     * UTF-8 aware parse_url() replacement.
-     * @param string $url
-     * @param int $component
-     * @throws \InvalidArgumentException
-     * @return array
-     */
-    public function parseUrl($url, $component = -1)
-    {
-        $encodedUrl = preg_replace_callback(
-            '%[^:/@?&=#]+%u',
-            function ($matches) {
-                return urlencode($matches[0]);
-            },
-            $url
-        );
-
-        $parts = parse_url($encodedUrl, $component);
-
-        if ($parts === false) {
-            throw new \InvalidArgumentException('Malformed URL: ' . $url);
-        }
-
-        foreach ((array)$parts as $name => $value) {
-            $parts[$name] = urldecode($value);
-        }
-
-        return $parts;
-    }
-
-    /**
-     * Returns data array with information about the url
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    public function __toString()
-    {
-        return $this->getOriginalUrl();
-    }
-
-}

src/Pecee/Http/Url.php

@@ -0,0 +1,449 @@
+<?php
+
+namespace Pecee\Http;
+
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url
+{
+    private $originalUrl;
+
+    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 && $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
+    {
+        return (strtolower($this->getScheme()) === 'https');
+    }
+
+    /**
+     * Checks if url is relative
+     *
+     * @return bool
+     */
+    public function isRelative(): bool
+    {
+        return ($this->getHost() === null);
+    }
+
+    /**
+     * Get url scheme
+     *
+     * @return string|null
+     */
+    public function getScheme(): ?string
+    {
+        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->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->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
+    {
+        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;
+    }
+
+    /**
+     * Parse password from url
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set the url password
+     *
+     * @param string $password
+     * @return static
+     */
+    public function setPassword(string $password): self
+    {
+        $this->password = $password;
+
+        return $this;
+    }
+
+    /**
+     * Get path from url
+     * @return string
+     */
+    public function getPath(): ?string
+    {
+        return $this->path ?? '/';
+    }
+
+    /**
+     * Set the url path
+     *
+     * @param string $path
+     * @return static
+     */
+    public function setPath(string $path): self
+    {
+        $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->fragment;
+    }
+
+    /**
+     * Set url fragment
+     *
+     * @param string $fragment
+     * @return static
+     */
+    public function setFragment(string $fragment): self
+    {
+        $this->fragment = $fragment;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl(): string
+    {
+        return $this->originalUrl;
+    }
+
+    /**
+     * Get position of value.
+     * Returns -1 on failure.
+     *
+     * @param string $value
+     * @return int
+     */
+    public function indexOf(string $value): int
+    {
+        $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);
+    }
+
+    /**
+     * Check if url contains parameter/query string.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasParam(string $name): bool
+    {
+        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->getRelativeUrl();
+    }
+
+}

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;
+    }
+
+}

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);
+
+}

src/Pecee/SimpleRouter/Event/EventArgument.php

@@ -0,0 +1,111 @@
+<?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();
+    }
+
+    /**
+     * @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
+     *
+     * @return array
+     */
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
+}

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;
+
+}

src/Pecee/SimpleRouter/Exceptions/HttpException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Exceptions;
 
 class HttpException extends \Exception

src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Exceptions;
 
 class NotFoundHttpException extends HttpException

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
 {
@@ -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
         );

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, array $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;
+    }
+
+}

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_MIDDLEWARES = 'onRenderMiddlewares';
+
+    /**
+     * 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_MIDDLEWARES,
+        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, array $eventArgs = []): void
+    {
+        $events = $this->getEvents(static::EVENT_ALL, $name);
+
+        /* @var $event \Closure */
+        foreach ($events as $event) {
+            $event(new EventArgument($name, $router, $eventArgs));
+        }
+    }
+
+}

src/Pecee/SimpleRouter/Handlers/IEventHandler.php

@@ -0,0 +1,27 @@
+<?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, array $eventArgs = []): void;
+
+}

src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php

@@ -1,5 +1,6 @@
 <?php
-namespace Pecee\Handlers;
+
+namespace Pecee\SimpleRouter\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;
 
 }

src/Pecee/SimpleRouter/IRouterBootManager.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter;
 
 use Pecee\Http\Request;
@@ -8,8 +9,8 @@ interface IRouterBootManager
     /**
      * Called when router loads it's routes
      *
+     * @param Router $router
      * @param Request $request
-     * @return Request
      */
-    public function boot(Request $request);
+    public function boot(Router $router, Request $request): void;
 }

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(string $controller): self;
 
 }

src/Pecee/SimpleRouter/Route/IGroupRoute.php

@@ -2,8 +2,8 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 
 interface IGroupRoute extends IRoute
 {
@@ -13,21 +13,21 @@ interface IGroupRoute extends IRoute
      * @param Request $request
      * @return bool
      */
-    public function matchDomain(Request $request);
+    public function matchDomain(Request $request): bool;
 
     /**
      * 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);
 
@@ -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;
 }

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

@@ -1,7 +1,9 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
 
 interface ILoadableRoute extends IRoute
 {
@@ -10,29 +12,39 @@ 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);
+    public function findUrl(?string $method = null, $parameters = null, ?string $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
+     * @return string|null
      */
-    public function getName();
+    public function getName(): ?string;
 
     /**
      * Check if route has given name.
@@ -40,22 +52,22 @@ interface ILoadableRoute extends IRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name);
+    public function hasName(string $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(string $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 +75,6 @@ interface ILoadableRoute extends IRoute
      * @param string $regex
      * @return static
      */
-    public function setMatch($regex);
+    public function setMatch($regex): self;
 
 }

src/Pecee/SimpleRouter/Route/IRoute.php

@@ -3,6 +3,7 @@
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
 
 interface IRoute
 {
@@ -13,17 +14,18 @@ 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.
      * Returns class to be rendered.
      *
      * @param Request $request
+     * @param Router $router
      * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
      * @return string
      */
-    public function renderRoute(Request $request);
+    public function renderRoute(Request $request, Router $router): ?string;
 
     /**
      * Returns callback name/identifier for the current route based on the callback.
@@ -32,50 +34,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,44 +85,64 @@ 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;
 
-    public function getClass();
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod(string $method): self;
 
-    public function setMethod($method);
+    /**
+     * Get class
+     *
+     * @return string|null
+     */
+    public function getClass(): ?string;
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
-    public function setNamespace($namespace);
+    public function setNamespace(string $namespace): self;
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getNamespace();
+    public function getNamespace(): ?string;
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @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.
      *
      * @return array
      */
-    public function getWhere();
+    public function getWhere(): array;
 
     /**
      * Set parameter names.
@@ -128,45 +150,45 @@ interface IRoute
      * @param array $options
      * @return static
      */
-    public function setWhere(array $options);
+    public function setWhere(array $options): self;
 
     /**
      * Get parameters
      *
      * @return array
      */
-    public function getParameters();
+    public function getParameters(): array;
 
     /**
      * 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.
      *
      * @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 +196,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;
 
 }

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,32 +25,34 @@ 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)
+    public function loadMiddleware(Request $request, Router $router): void
     {
-        $max = count($this->getMiddlewares());
+        $router->debug('Loading middlewares');
 
-        if ($max !== 0) {
+        foreach ($this->getMiddlewares() as $middleware) {
 
-            for ($i = 0; $i < $max; $i++) {
-
-                $middleware = $this->getMiddlewares()[$i];
-
-                if (is_object($middleware) === false) {
-                    $middleware = $this->loadClass($middleware);
-                }
-
-                if (($middleware instanceof IMiddleware) === false) {
-                    throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
-                }
-
-                $middleware->handle($request);
+            if (\is_object($middleware) === false) {
+                $middleware = $router->getClassLoader()->loadClass($middleware);
             }
+
+            if (($middleware instanceof IMiddleware) === false) {
+                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+            }
+
+            $className = \get_class($middleware);
+
+            $router->debug('Loading middleware "%s"', $className);
+            $middleware->handle($request);
+            $router->debug('Finished loading middleware "%s"', $className);
         }
+
+        $router->debug('Finished loading middlewares');
     }
 
-    public function matchRegex(Request $request, $url)
+    public function matchRegex(Request $request, $url): ?bool
     {
         /* Match on custom defined regular expression */
 
@@ -57,7 +60,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             return null;
         }
 
-        return (preg_match($this->regex, $request->getHost() . $url) > 0);
+        return ((bool)preg_match($this->regex, $request->getHost() . $url) !== false);
     }
 
     /**
@@ -66,7 +69,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $url
      * @return static
      */
-    public function setUrl($url)
+    public function setUrl(string $url): ILoadableRoute
     {
         $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
@@ -74,7 +77,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
             $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-            if (preg_match_all('/' . $regex . '/u', $this->url, $matches) > 0) {
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
                 $this->parameters = array_fill_keys($matches[1], null);
             }
         }
@@ -82,7 +85,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return $this;
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return $this->url;
     }
@@ -96,13 +99,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(?string $method = null, $parameters = null, ?string $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;
         }
 
@@ -118,13 +121,10 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         /* Replace any {parameter} in the url with the correct value */
 
         $params = $this->getParameters();
-        $max = count($params) - 1;
-        $keys = array_keys($params);
 
-        for ($i = $max; $i >= 0; $i--) {
-            $param = $keys[$i];
+        foreach (array_keys($params) as $param) {
 
-            if ($parameters === '' || (is_array($parameters) === true && count($parameters) === 0)) {
+            if ($parameters === '' || (\is_array($parameters) === true && \count($parameters) === 0)) {
                 $value = '';
             } else {
                 $p = (array)$parameters;
@@ -144,8 +144,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             }
         }
 
-        $url = '/' . ltrim($url, '/');
-        $url .= join('/', $unknownParams);
+        $url = '/' . ltrim($url, '/') . implode('/', $unknownParams);
 
         return rtrim($url, '/') . '/';
     }
@@ -155,7 +154,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -166,9 +165,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * @param string $name
      * @return bool
      */
-    public function hasName($name)
+    public function hasName(string $name): bool
     {
-        return (strtolower($this->name) === strtolower($name));
+        return strtolower($this->name) === strtolower($name);
     }
 
     /**
@@ -177,7 +176,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;
 
@@ -189,7 +188,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getMatch()
+    public function getMatch(): string
     {
         return $this->regex;
     }
@@ -202,7 +201,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);
     }
@@ -211,9 +210,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(string $name): ILoadableRoute
     {
         $this->name = $name;
 
@@ -227,7 +226,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, bool $merge = false): IRoute
     {
         if (isset($values['as']) === true) {
 

src/Pecee/SimpleRouter/Route/Route.php

@@ -5,18 +5,19 @@ 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
 {
-    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,
@@ -33,7 +34,7 @@ abstract class Route implements IRoute
      *
      * @var bool
      */
-    protected $filterEmptyParams = false;
+    protected $filterEmptyParams = true;
 
     /**
      * Default regular expression used for parsing parameters.
@@ -56,29 +57,42 @@ abstract class Route implements IRoute
     protected $originalParameters = [];
     protected $middlewares = [];
 
-    protected function loadClass($name)
+    /**
+     * Render route
+     *
+     * @param Request $request
+     * @param Router $router
+     * @return string|null
+     * @throws NotFoundHttpException
+     */
+    public function renderRoute(Request $request, Router $router): ?string
     {
-        if (class_exists($name) === false) {
-            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
-        }
+        $router->debug('Starting rendering route "%s"', \get_class($this));
 
-        return new $name();
-    }
-
-    public function renderRoute(Request $request)
-    {
         $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);
+            });
+        }
+
         /* Render callback function */
-        if (is_callable($callback) === true) {
+        if (\is_callable($callback) === true) {
+            $router->debug('Executing callback');
 
             /* When the callback is a function */
-            return call_user_func_array($callback, $this->getParameters());
 
+            return $router->getClassLoader()->loadClosure($callback, $parameters);
         }
 
         /* When the callback is a class + method */
@@ -88,24 +102,18 @@ abstract class Route implements IRoute
 
         $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
 
-        $class = $this->loadClass($className);
+        $router->debug('Loading class %s', $className);
+        $class = $router->getClassLoader()->loadClass($className);
+
         $method = $controller[1];
 
         if (method_exists($class, $method) === false) {
             throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
         }
 
-        $parameters = $this->getParameters();
+        $router->debug('Executing callback');
 
-        /* Filter parameters with null-value */
-
-        if ($this->filterEmptyParams === true) {
-            $parameters = array_filter($parameters, function ($var) {
-                return ($var !== null);
-            });
-        }
-
-        return call_user_func_array([$class, $method], $parameters);
+        return \call_user_func_array([$class, $method], $parameters);
     }
 
     protected function parseParameters($route, $url, $parameterRegex = null)
@@ -114,18 +122,20 @@ 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 (preg_match_all('/' . $regex . '/u', $route, $parameters) > 0) {
+        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+            $urlRegex = preg_quote($route, '/');
+        } else {
 
-            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', $route);
 
             foreach ($urlParts as $key => $t) {
 
                 $regex = '';
 
-                if ($key < count($parameters[1])) {
+                if ($key < \count($parameters[1])) {
 
                     $name = $parameters[1][$key];
 
@@ -138,39 +148,35 @@ 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;
                         }
                     }
 
                     $regex = sprintf('(?:\/|\-)%1$s(?P<%2$s>%3$s)%1$s', $parameters[2][$key], $name, $regex);
-
                 }
 
                 $urlParts[$key] = preg_quote($t, '/') . $regex;
             }
 
-            $urlRegex = join('', $urlParts);
+            $urlRegex = implode('', $urlParts);
 
-        } else {
-            $urlRegex = preg_quote($route, '/');
         }
 
-        if (preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) > 0) {
+        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+            return null;
+        }
 
-            $values = [];
+        $values = [];
 
-            if (isset($parameters[1]) === true) {
+        if (isset($parameters[1]) === true) {
 
-                /* Only take matched parameters with name */
-                foreach ((array)$parameters[1] as $name) {
-                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
-                }
+            /* Only take matched parameters with name */
+            foreach ((array)$parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
             }
-
-            return $values;
         }
 
-        return null;
+        return $values;
     }
 
     /**
@@ -180,9 +186,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;
         }
 
@@ -193,9 +199,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;
 
@@ -207,7 +213,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getRequestMethods()
+    public function getRequestMethods(): array
     {
         return $this->requestMethods;
     }
@@ -215,7 +221,7 @@ abstract class Route implements IRoute
     /**
      * @return IRoute|null
      */
-    public function getParent()
+    public function getParent(): ?IRoute
     {
         return $this->parent;
     }
@@ -225,7 +231,7 @@ abstract class Route implements IRoute
      *
      * @return IGroupRoute|null
      */
-    public function getGroup()
+    public function getGroup(): ?IGroupRoute
     {
         return $this->group;
     }
@@ -234,12 +240,15 @@ 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;
 
+        /* Add/merge parent settings with child */
+        $this->setSettings($group->toArray(), true);
+
         return $this;
     }
 
@@ -247,9 +256,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;
 
@@ -262,7 +271,7 @@ abstract class Route implements IRoute
      * @param string $callback
      * @return static
      */
-    public function setCallback($callback)
+    public function setCallback($callback): IRoute
     {
         $this->callback = $callback;
 
@@ -270,16 +279,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];
@@ -288,9 +297,9 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function getClass()
+    public function getClass(): ?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[0];
@@ -299,14 +308,14 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function setMethod($method)
+    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());
 
@@ -315,9 +324,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;
 
@@ -326,26 +335,26 @@ 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;
     }
 
     /**
-     * @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;
     }
 
     /**
@@ -353,7 +362,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -361,15 +370,15 @@ abstract class Route implements IRoute
             $values['namespace'] = $this->namespace;
         }
 
-        if (count($this->requestMethods) !== 0) {
+        if (\count($this->requestMethods) !== 0) {
             $values['method'] = $this->requestMethods;
         }
 
-        if (count($this->where) !== 0) {
+        if (\count($this->where) !== 0) {
             $values['where'] = $this->where;
         }
 
-        if (count($this->middlewares) !== 0) {
+        if (\count($this->middlewares) !== 0) {
             $values['middleware'] = $this->middlewares;
         }
 
@@ -385,9 +394,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']);
@@ -422,7 +431,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getWhere()
+    public function getWhere(): array
     {
         return $this->where;
     }
@@ -433,7 +442,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;
 
@@ -458,12 +467,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;
         }
 
@@ -474,15 +483,15 @@ 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
          * 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;
         }
 
@@ -511,7 +520,7 @@ abstract class Route implements IRoute
      * @param IMiddleware|string $middleware
      * @return static
      */
-    public function addMiddleware($middleware)
+    public function addMiddleware($middleware): IRoute
     {
         $this->middlewares[] = $middleware;
 
@@ -522,9 +531,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;
 
@@ -532,9 +541,9 @@ abstract class Route implements IRoute
     }
 
     /**
-     * @return string|array
+     * @return array
      */
-    public function getMiddlewares()
+    public function getMiddlewares(): array
     {
         return $this->middlewares;
     }
@@ -544,7 +553,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)
     {
@@ -558,7 +567,7 @@ abstract class Route implements IRoute
      *
      * @return string
      */
-    public function getDefaultParameterRegex()
+    public function getDefaultParameterRegex(): string
     {
         return $this->defaultParameterRegex;
     }

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(string $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(?string $method = null, $parameters = null, ?string $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,17 +77,21 @@ class RouteController extends LoadableRoute implements IControllerRoute
 
         $group = $this->getGroup();
 
-        if ($group !== null && count($group->getDomains()) !== 0) {
+        if ($group !== null && \count($group->getDomains()) !== 0) {
             $url .= '//' . $group->getDomains()[0];
         }
 
-        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . implode('/', $parameters);
 
         return '/' . trim($url, '/') . '/';
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
@@ -98,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);
@@ -119,7 +123,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      *
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
@@ -130,7 +134,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller)
+    public function setController(string $controller): IControllerRoute
     {
         $this->controller = $controller;
 
@@ -140,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;
     }
@@ -153,7 +157,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string $method
      * @return static
      */
-    public function setMethod($method)
+    public function setMethod(string $method): IRoute
     {
         $this->method = $method;
 
@@ -167,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, bool $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -2,8 +2,8 @@
 
 namespace Pecee\SimpleRouter\Route;
 
-use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 
 class RouteGroup extends Route implements IGroupRoute
 {
@@ -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,8 +46,12 @@ 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) {
+            return false;
+        }
+
         /* Skip if prefix doesn't match */
         if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
             return false;
@@ -60,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;
 
@@ -73,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;
 
@@ -87,7 +91,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getExceptionHandlers()
+    public function getExceptionHandlers(): array
     {
         return $this->exceptionHandlers;
     }
@@ -97,7 +101,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getDomains()
+    public function getDomains(): array
     {
         return $this->domains;
     }
@@ -106,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;
 
@@ -119,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, '/');
 
@@ -129,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;
     }
@@ -143,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, bool $merge = false): IRoute
     {
 
         if (isset($values['prefix']) === true) {
@@ -179,7 +183,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -191,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;
         }
 

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
@@ -15,8 +22,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) {
+            return false;
+        }
+
         if ($this->prefix !== null) {
             /* Parse parameters from current route */
             $parameters = $this->parseParameters($this->prefix, $url);

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(string $name): bool
     {
         if ($this->name === null) {
             return false;
@@ -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)
+    /**
+     * @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) {
@@ -77,8 +83,12 @@ 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) {
+            return false;
+        }
+
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
@@ -110,7 +120,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']);
         }
 
@@ -141,7 +151,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     /**
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
@@ -150,14 +160,14 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param string $controller
      * @return static
      */
-    public function setController($controller)
+    public function setController(string $controller): IControllerRoute
     {
         $this->controller = $controller;
 
         return $this;
     }
 
-    public function setName($name)
+    public function setName(string $name): ILoadableRoute
     {
         $this->name = $name;
 
@@ -190,9 +200,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;
     }
@@ -204,7 +214,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      * @param bool $merge
      * @return static
      */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
     {
         if (isset($values['names']) === true) {
             $this->names = $values['names'];

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -12,8 +12,12 @@ 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) {
+            return false;
+        }
+
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -10,15 +10,23 @@
 
 namespace Pecee\SimpleRouter;
 
-use Pecee\Handlers\CallbackExceptionHandler;
+use DI\Container;
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Exceptions\MalformedUrlException;
 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\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+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 +34,7 @@ class SimpleRouter
 {
     /**
      * Default namespace added to all routes
-     * @var string
+     * @var string|null
      */
     protected static $defaultNamespace;
 
@@ -43,14 +51,72 @@ class SimpleRouter
     protected static $router;
 
     /**
-     * Start/route request
+     * Start routing
      *
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
      * @throws HttpException
-     * @throws NotFoundHttpException
+     * @throws \Exception
      */
-    public static function start()
+    public static function start(): void
     {
-        echo static::router()->routeRequest();
+        echo static::router()->start();
+    }
+
+    /**
+     * Start the routing an return array with debugging-information
+     *
+     * @return 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;
+                    }
+                }
+            }
+        }
+
+        $request = static::request();
+        $router = static::router();
+
+        return [
+            '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'   => $request->getHeaders(),
+        ];
     }
 
     /**
@@ -58,7 +124,7 @@ class SimpleRouter
      *
      * @param string $defaultNamespace
      */
-    public static function setDefaultNamespace($defaultNamespace)
+    public static function setDefaultNamespace(string $defaultNamespace): void
     {
         static::$defaultNamespace = $defaultNamespace;
     }
@@ -68,18 +134,28 @@ class SimpleRouter
      *
      * @param BaseCsrfVerifier $baseCsrfVerifier
      */
-    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    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
      */
-    public static function addBootManager(IRouterBootManager $bootManager)
+    public static function addBootManager(IRouterBootManager $bootManager): void
     {
         static::router()->addBootManager($bootManager);
     }
@@ -90,9 +166,10 @@ class SimpleRouter
      * @param string $url
      * @param string|\Closure $callback
      * @param array|null $settings
+     *
      * @return RouteUrl
      */
-    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);
     }
@@ -105,7 +182,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl
      */
-    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);
     }
@@ -118,7 +195,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl
      */
-    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);
     }
@@ -131,7 +208,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl
      */
-    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);
     }
@@ -144,7 +221,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl
      */
-    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);
     }
@@ -157,7 +234,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl
      */
-    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);
     }
@@ -167,18 +244,19 @@ class SimpleRouter
      *
      * @param array $settings
      * @param \Closure $callback
-     * @throws \InvalidArgumentException
      * @return RouteGroup
+     * @throws InvalidArgumentException
      */
-    public static function group(array $settings = [], \Closure $callback)
+    public static function group(array $settings = [], \Closure $callback): IGroupRoute
     {
-        if (is_callable($callback) === false) {
-            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        if (\is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
         $group = new RouteGroup();
         $group->setCallback($callback);
         $group->setSettings($settings);
+        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -190,15 +268,15 @@ class SimpleRouter
      * parameters and which are only rendered when the url matches.
      *
      * @param string $url
-     * @param array $settings
      * @param \Closure $callback
-     * @throws \InvalidArgumentException
+     * @param array $settings
      * @return RoutePartialGroup
+     * @throws 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) {
-            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        if (\is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
         $settings['prefix'] = $url;
@@ -206,6 +284,7 @@ class SimpleRouter
         $group = new RoutePartialGroup();
         $group->setSettings($settings);
         $group->setCallback($callback);
+        $group = static::addDefaultNamespace($group);
 
         static::router()->addRoute($group);
 
@@ -221,7 +300,7 @@ class SimpleRouter
      * @see SimpleRouter::form
      * @return RouteUrl
      */
-    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);
     }
@@ -236,7 +315,7 @@ class SimpleRouter
      * @see SimpleRouter::form
      * @return RouteUrl
      */
-    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);
     }
@@ -250,7 +329,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl|IRoute
      */
-    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);
@@ -273,7 +352,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteUrl|IRoute
      */
-    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);
@@ -295,7 +374,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteController|IRoute
      */
-    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);
@@ -317,7 +396,7 @@ class SimpleRouter
      * @param array|null $settings
      * @return RouteResource|IRoute
      */
-    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);
@@ -337,7 +416,7 @@ class SimpleRouter
      * @param \Closure $callback
      * @return CallbackExceptionHandler $callbackHandler
      */
-    public static function error(\Closure $callback)
+    public static function error(\Closure $callback): CallbackExceptionHandler
     {
         $routes = static::router()->getRoutes();
 
@@ -368,12 +447,22 @@ class SimpleRouter
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \Exception
-     * @return string
+     * @return Url
      */
-    public static function getUrl($name = null, $parameters = null, $getParams = null)
+    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;
     }
 
     /**
@@ -381,7 +470,7 @@ class SimpleRouter
      *
      * @return \Pecee\Http\Request
      */
-    public static function request()
+    public static function request(): Request
     {
         return static::router()->getRequest();
     }
@@ -391,7 +480,7 @@ class SimpleRouter
      *
      * @return Response
      */
-    public static function response()
+    public static function response(): Response
     {
         if (static::$response === null) {
             static::$response = new Response(static::request());
@@ -405,7 +494,7 @@ class SimpleRouter
      *
      * @return Router
      */
-    public static function router()
+    public static function router(): Router
     {
         if (static::$router === null) {
             static::$router = new Router();
@@ -420,14 +509,20 @@ class SimpleRouter
      * @param IRoute $route
      * @return IRoute
      */
-    public static function addDefaultNamespace(IRoute $route)
+    public static function addDefaultNamespace(IRoute $route): IRoute
     {
         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 */
-            if ($callback === null || (is_string($callback) === true && $callback[0] !== '\\')) {
+            if ($callback === null || (\is_string($callback) === true && $callback[0] !== '\\')) {
 
                 $namespace = static::$defaultNamespace;
 
@@ -446,10 +541,24 @@ class SimpleRouter
     }
 
     /**
-     * Get default namespace
-     * @return string
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
      */
-    public static function getDefaultNamespace()
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public static function getDefaultNamespace(): ?string
     {
         return static::$defaultNamespace;
     }

test/Dummy/Handler/ExceptionHandlerFirst.php

@@ -1,14 +0,0 @@
-<?php
-
-class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
-	{
-	    global $stack;
-	    $stack[] = static::class;
-
-		$request->setUri(new \Pecee\Http\Uri('/'));
-		return $request;
-	}
-
-}

test/Dummy/Handler/ExceptionHandlerSecond.php

@@ -1,14 +0,0 @@
-<?php
-
-class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
-	{
-        global $stack;
-        $stack[] = static::class;
-
-        $request->setUri(new \Pecee\Http\Uri('/'));
-        return $request;
-	}
-
-}

test/Dummy/ResourceController.php

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

test/RouterRewriteTest.php

@@ -1,78 +0,0 @@
-<?php
-require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ResponseException.php';
-require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
-require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
-require_once 'Dummy/Handler/ExceptionHandlerThird.php';
-require_once 'Helpers/TestRouter.php';
-
-class RouteRewriteTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Redirects to another route through 3 exception handlers.
-     *
-     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
-     * the exceptionhandler is asking the router to reload.
-     *
-     * That means that the exceptionhandler is loaded again, but this time
-     * the router ignores the same rewrite-route to avoid loop - loads
-     * the second which have same behavior and is also ignored before
-     * throwing the final Exception in ExceptionHandler 3.
-     *
-     * So this tests:
-     * 1. If ExceptionHandlers loads
-     * 2. If ExceptionHandlers load in the correct order
-     * 3. If ExceptionHandlers can rewrite the page on error
-     * 4. If the router can avoid redirect-loop due to developer has started loop.
-     * 5. And finally if we reaches the last exception-handler and that the correct
-     *    exception-type is being thrown.
-     */
-    public function testExceptionHandlerRewrite()
-    {
-        global $stack;
-        $stack = [];
-
-        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
-
-            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
-
-                TestRouter::get('/my-path', 'DummyController@method1');
-
-            });
-        });
-
-        try {
-            TestRouter::debug('/my-non-existing-path', 'get');
-        } catch (\ResponseException $e) {
-
-        }
-
-        $expectedStack = [
-            ExceptionHandlerFirst::class,
-            ExceptionHandlerSecond::class,
-            ExceptionHandlerThird::class,
-        ];
-
-        $this->assertEquals($expectedStack, $stack);
-
-    }
-
-    public function testRewriteExceptionMessage()
-    {
-        $this->setExpectedException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
-
-        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
-
-            if (strtolower($request->getUri()->getPath()) == '/my/test') {
-                $request->setRewriteUrl('/another-non-existing');
-
-                return $request;
-            }
-
-        });
-
-        TestRouter::debug('/my/test', 'get');
-    }
-
-}

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);
+    }
+}

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!');
 	}

tests/Pecee/SimpleRouter/Dummy/Exception/ExceptionHandlerException.php

@@ -1,4 +1,5 @@
 <?php
+
 class ExceptionHandlerException extends \Exception
 {
 }

tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandler.php

@@ -1,8 +1,8 @@
 <?php
 
-class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandler implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)  : void
 	{
 	    echo $error->getMessage();
 	}

tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php

@@ -0,0 +1,13 @@
+<?php
+
+class ExceptionHandlerFirst implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
+	{
+	    global $stack;
+	    $stack[] = static::class;
+
+		$request->setUrl(new \Pecee\Http\Url('/'));
+	}
+
+}

tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php

@@ -0,0 +1,13 @@
+<?php
+
+class ExceptionHandlerSecond implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
+{
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
+	{
+        global $stack;
+        $stack[] = static::class;
+
+        $request->setUrl(new \Pecee\Http\Url('/'));
+	}
+
+}

tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerThird.php

@@ -1,8 +1,8 @@
 <?php
 
-class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerThird implements \Pecee\SimpleRouter\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;

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);
+            }
+
+        }
+    }
+}

tests/Pecee/SimpleRouter/Dummy/Middleware/RewriteMiddleware.php

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

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;
+    }
+}

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;
+    }
+}

tests/Pecee/SimpleRouter/EventHandlerTest.php

@@ -0,0 +1,81 @@
+<?php
+
+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;
+
+class EventHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testAllEventTriggered()
+    {
+        $events = EventHandler::$events;
+
+        // Remove the all event
+        unset($events[\array_search(EventHandler::EVENT_ALL, $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);
+
+        // Add rewrite
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            // Trigger rewrite
+            $request->setRewriteUrl('/');
+
+        });
+
+        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);
+
+        // Add boot-manager
+        TestRouter::addBootManager(new TestBootManager([
+            '/test',
+        ], '/'));
+
+        // Start router
+        TestRouter::debug('/non-existing');
+
+        $this->assertEquals($events, []);
+    }
+
+    public function testAllEvent()
+    {
+
+        $status = false;
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$status) {
+            $status = true;
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::debug('/');
+
+        // All event should fire for each other event
+        $this->assertEquals(true, $status);
+    }
+
+}

tests/Pecee/SimpleRouter/GroupTest.php

@@ -2,18 +2,16 @@
 
 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;
 
     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 {
@@ -21,7 +19,7 @@ class GroupTest extends PHPUnit_Framework_TestCase
         } catch(\Exception $e) {
 
         }
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
     }
 
     public function testNestedGroup()
@@ -37,6 +35,7 @@ class GroupTest extends PHPUnit_Framework_TestCase
 
         TestRouter::debug('/api/v1/test', 'get');
 
+        $this->assertTrue(true);
     }
 
     public function testMultipleRoutes()
@@ -61,6 +60,8 @@ class GroupTest extends PHPUnit_Framework_TestCase
         });
 
         TestRouter::debug('/my/match', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testUrls()

tests/Pecee/SimpleRouter/InputHandlerTest.php

@@ -0,0 +1,35 @@
+<?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);
+    }
+
+}

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);
     }
 
 }

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);
     }
 
 }

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()

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()

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()

tests/Pecee/SimpleRouter/RouterRewriteTest.php

@@ -0,0 +1,176 @@
+<?php
+require_once 'Dummy/DummyController.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 'Dummy/Middleware/RewriteMiddleware.php';
+
+class RouteRewriteTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * Redirects to another route through 3 exception handlers.
+     *
+     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
+     * the exceptionhandler is asking the router to reload.
+     *
+     * That means that the exceptionhandler is loaded again, but this time
+     * the router ignores the same rewrite-route to avoid loop - loads
+     * the second which have same behavior and is also ignored before
+     * throwing the final Exception in ExceptionHandler 3.
+     *
+     * So this tests:
+     * 1. If ExceptionHandlers loads
+     * 2. If ExceptionHandlers load in the correct order
+     * 3. If ExceptionHandlers can rewrite the page on error
+     * 4. If the router can avoid redirect-loop due to developer has started loop.
+     * 5. And finally if we reaches the last exception-handler and that the correct
+     *    exception-type is being thrown.
+     */
+    public function testExceptionHandlerRewrite()
+    {
+        global $stack;
+        $stack = [];
+
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () use ($stack) {
+
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () use ($stack) {
+
+                TestRouter::get('/my-path', 'DummyController@method1');
+
+            });
+        });
+
+        try {
+            TestRouter::debug('/my-non-existing-path', 'get');
+        } catch (\ResponseException $e) {
+
+        }
+
+        $expectedStack = [
+            ExceptionHandlerFirst::class,
+            ExceptionHandlerSecond::class,
+            ExceptionHandlerThird::class,
+        ];
+
+        $this->assertEquals($expectedStack, $stack);
+
+    }
+
+    public function testRewriteExceptionMessage()
+    {
+        $this->expectException(\Pecee\SimpleRouter\Exceptions\NotFoundHttpException::class);
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            if (strtolower($request->getUrl()->getPath()) === '/my/test/') {
+                $request->setRewriteUrl('/another-non-existing');
+            }
+
+        });
+
+        TestRouter::debug('/my/test', 'get');
+    }
+
+    public function testRewriteUrlFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new2', function () {
+            echo 'ok';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteCallbackFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            return 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new/2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteRouteFromRoute()
+    {
+
+        TestRouter::get('/match', function () {
+            TestRouter::request()->setRewriteRoute(new \Pecee\SimpleRouter\Route\RouteUrl('/match', function () {
+                return 'ok';
+            }));
+        });
+
+        TestRouter::get('/old1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/old/2', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/match');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testMiddlewareRewrite()
+    {
+
+        TestRouter::group(['middleware' => 'RewriteMiddleware'], function () {
+            TestRouter::get('/', function () {
+                return 'fail';
+            });
+
+            TestRouter::get('no/match', function () {
+                return 'fail';
+            });
+        });
+
+        $output = TestRouter::debugOutput('/');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+}

tests/Pecee/SimpleRouter/RouterRouteTest.php

@@ -2,32 +2,30 @@
 
 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;
-
     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);
 
     }
 
     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 +34,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()
@@ -85,37 +91,37 @@ 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::request()->setHost('hello.world.com');
+
         TestRouter::debug('/test', 'get');
 
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
 
     }
 
     public function testDomainNotAllowedRoute()
     {
-        $this->result = false;
+        TestRouter::request()->setHost('other.world.com');
 
-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            TestRouter::get('/test', function ($subdomain = null) {
-                $this->result = ($subdomain === 'hello');
+        $result = false;
+
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
             });
         });
 
-        TestRouter::request()->setHost('other.world.com');
-
-
         TestRouter::debug('/test', 'get');
 
-        $this->assertFalse($this->result);
+        $this->assertFalse($result);
 
     }
 
@@ -123,6 +129,22 @@ 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() {
+
+        $defaultVariable = null;
+
+        TestRouter::get('/my/{path?}', function($path = 'working') use(&$defaultVariable) {
+            $defaultVariable = $path;
+        });
+
+        TestRouter::debug('/my/');
+
+        $this->assertEquals('working', $defaultVariable);
+
     }
 
     public function testDefaultParameterRegex()

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

tests/TestRouter.php

@@ -3,18 +3,20 @@
 class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
 {
 
-    public static function debugNoReset($testUri, $testMethod = 'get')
+    public static function debugNoReset($testUrl, $testMethod = 'get')
     {
-        static::request()->setUri(new \Pecee\Http\Uri($testUri));
-        static::request()->setMethod($testMethod);
+        $request = static::request();
+
+        $request->setUrl((new \Pecee\Http\Url($testUrl))->setHost('local.unitTest'));
+        $request->setMethod($testMethod);
 
         static::start();
     }
 
-    public static function debug($testUri, $testMethod = 'get')
+    public static function debug($testUrl, $testMethod = 'get')
     {
         try {
-            static::debugNoReset($testUri, $testMethod);
+            static::debugNoReset($testUrl, $testMethod);
         } catch(\Exception $e) {
             static::router()->reset();
             throw $e;
@@ -24,13 +26,13 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
 
     }
 
-    public static function debugOutput($testUri, $testMethod = 'get')
+    public static function debugOutput($testUrl, $testMethod = 'get')
     {
         $response = null;
 
         // Route request
         ob_start();
-        static::debug($testUri, $testMethod);
+        static::debug($testUrl, $testMethod);
         $response = ob_get_contents();
         ob_end_clean();
 

tests/bootstrap.php

@@ -0,0 +1,4 @@
+<?php
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+require_once 'TestRouter.php';

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;