Merge pull request #386 from skipperbent/v4-php7-port

Version 4

.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,4 +1,3 @@
 .idea
 composer.lock
-vendor/
-demo-project/vendor
+vendor/

.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

@@ -2,11 +2,19 @@
   "name": "pecee/simple-router",
   "description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
   "keywords": [
+    "router",
     "router",
     "routing",
+    "route",
+    "simple-php-router",
     "laravel",
     "pecee",
-    "route"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
   ],
   "license": "MIT",
   "support": {
@@ -19,10 +27,11 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.7.7"
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
   },
   "autoload": {
     "psr-4": {

helpers.php

@@ -0,0 +1,86 @@
+<?php
+
+use Pecee\SimpleRouter\SimpleRouter as Router;
+
+/**
+ * Get url for a route by using either name/alias, class or method name.
+ *
+ * The name parameter supports the following values:
+ * - Route name
+ * - Controller/resource name (with or without method)
+ * - Controller class name
+ *
+ * When searching for controller/resource by name, you can use this syntax "route.name@method".
+ * You can also use the same syntax when searching for a specific controller-class "MyController@home".
+ * If no arguments is specified, it will return the url for the current loaded route.
+ *
+ * @param string|null $name
+ * @param string|array|null $parameters
+ * @param array|null $getParams
+ * @return string
+ * @throws \InvalidArgumentException
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ */
+function url($name = null, $parameters = null, $getParams = null)
+{
+    return Router::getUrl($name, $parameters, $getParams);
+}
+
+/**
+ * @return \Pecee\Http\Response
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ */
+function response()
+{
+    return Router::response();
+}
+
+/**
+ * @return \Pecee\Http\Request
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ */
+function request()
+{
+    return Router::request();
+}
+
+/**
+ * Get input class
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param string|array|null $methods Default method
+ * @return \Pecee\Http\Input\InputHandler|string
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ */
+function input($index = null, $defaultValue = null, $methods = null)
+{
+    if ($index !== null) {
+        return request()->getInputHandler()->get($index, $defaultValue, $methods);
+    }
+
+    return request()->getInputHandler();
+}
+
+function redirect($url, $code = null)
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
+}
+
+/**
+ * Get current csrf-token
+ * @return string|null
+ * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ */
+function csrf_token()
+{
+    $baseVerifier = Router::router()->getCsrfVerifier();
+    if ($baseVerifier !== null) {
+        return $baseVerifier->getTokenProvider()->getToken();
+    }
+
+    return 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/CsrfToken.php

@@ -1,79 +0,0 @@
-<?php
-namespace Pecee;
-
-class CsrfToken
-{
-    const CSRF_KEY = 'XSRF-TOKEN';
-
-    protected $token;
-
-    /**
-     * Generate random identifier for CSRF token
-     *
-     * @throws \RuntimeException
-     * @return string
-     */
-    public static function generateToken()
-    {
-        if (function_exists('random_bytes')) {
-            return bin2hex(random_bytes(32));
-        }
-
-        $isSourceStrong = false;
-
-        $random = openssl_random_pseudo_bytes(32, $isSourceStrong);
-        if ($isSourceStrong === false || $random === false) {
-            throw new \RuntimeException('IV generation failed');
-        }
-
-        return $random;
-    }
-
-    /**
-     * Validate valid CSRF token
-     *
-     * @param string $token
-     * @return bool
-     */
-    public function validate($token)
-    {
-        if ($token !== null && $this->getToken() !== null) {
-            return hash_equals($token, $this->getToken());
-        }
-
-        return false;
-    }
-
-    /**
-     * Set csrf token cookie
-     *
-     * @param $token
-     */
-    public function setToken($token)
-    {
-        setcookie(static::CSRF_KEY, $token, time() + 60 * 120, '/');
-    }
-
-    /**
-     * Get csrf token
-     * @return string|null
-     */
-    public function getToken()
-    {
-        if ($this->hasToken()) {
-            return $_COOKIE[static::CSRF_KEY];
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns whether the csrf token has been defined
-     * @return bool
-     */
-    public function hasToken()
-    {
-        return isset($_COOKIE[static::CSRF_KEY]);
-    }
-
-}

src/Pecee/Exceptions/InvalidArgumentException.php

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

src/Pecee/Handlers/CallbackExceptionHandler.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Pecee\Handlers;
+
+use Pecee\Http\Request;
+
+/**
+ * Class CallbackExceptionHandler
+ *
+ * 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
+ */
+class CallbackExceptionHandler implements IExceptionHandler
+{
+
+    protected $callback;
+
+    public function __construct(\Closure $callback)
+    {
+        $this->callback = $callback;
+    }
+
+    /**
+     * @param Request $request
+     * @param \Exception $error
+     */
+    public function handleError(Request $request, \Exception $error): void
+    {
+        /* Fire exceptions */
+        \call_user_func($this->callback,
+            $request,
+            $error
+        );
+    }
+}

src/Pecee/Handlers/IExceptionHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Handlers;
 
 use Pecee\Http\Request;
@@ -8,8 +9,7 @@ interface IExceptionHandler
     /**
      * @param Request $request
      * @param \Exception $error
-     * @return Request|null
      */
-    public function handleError(Request $request, \Exception $error);
+    public function handleError(Request $request, \Exception $error): void;
 
 }

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

@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http\Input;
 
+use Pecee\Exceptions\InvalidArgumentException;
+
 class InputFile implements IInputItem
 {
     public $index;
@@ -8,42 +11,44 @@ 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('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
     }
 
     /**
      * Create from array
      *
      * @param array $values
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      * @return static
      */
-    public static function createFromArray(array $values)
+    public static function createFromArray(array $values): self
     {
-        if (!isset($values['index'])) {
-            throw new \InvalidArgumentException('Index key is required');
+        if (isset($values['index']) === false) {
+            throw new InvalidArgumentException('Index key is required');
         }
 
         /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */
 
-        $values = array_merge([
+        $values += [
             'tmp_name' => null,
             'type'     => null,
             'size'     => null,
             'name'     => null,
             'error'    => null,
-        ], $values);
+        ];
 
         return (new static($values['index']))
-            ->setSize($values['size'])
+            ->setSize((int)$values['size'])
             ->setError($values['error'])
             ->setType($values['type'])
             ->setTmpName($values['tmp_name'])
@@ -54,7 +59,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getIndex()
+    public function getIndex(): string
     {
         return $this->index;
     }
@@ -62,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;
 
@@ -74,7 +79,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getSize()
+    public function getSize(): string
     {
         return $this->size;
     }
@@ -82,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;
 
@@ -95,7 +100,7 @@ class InputFile implements IInputItem
      * Get mime-type of file
      * @return string
      */
-    public function getMime()
+    public function getMime(): string
     {
         return $this->getType();
     }
@@ -103,7 +108,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -111,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;
 
@@ -125,7 +130,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getExtension()
+    public function getExtension(): string
     {
         return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
     }
@@ -135,7 +140,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -145,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;
 
@@ -158,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;
 
@@ -172,7 +177,7 @@ class InputFile implements IInputItem
      *
      * @return string mixed
      */
-    public function getFilename()
+    public function getFilename(): string
     {
         return $this->filename;
     }
@@ -183,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);
     }
@@ -193,7 +198,7 @@ class InputFile implements IInputItem
      *
      * @return string
      */
-    public function getContents()
+    public function getContents(): string
     {
         return file_get_contents($this->tmpName);
     }
@@ -203,7 +208,7 @@ class InputFile implements IInputItem
      *
      * @return bool
      */
-    public function hasError()
+    public function hasError(): bool
     {
         return ($this->getError() !== 0);
     }
@@ -213,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;
     }
@@ -234,7 +239,7 @@ class InputFile implements IInputItem
     /**
      * @return string
      */
-    public function getTmpName()
+    public function getTmpName(): string
     {
         return $this->tmpName;
     }
@@ -242,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;
 
@@ -256,19 +261,31 @@ 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->filename,
-            'error'    => $this->error,
+            'name'     => $this->name,
+            'error'    => $this->errors,
+            'filename' => $this->filename,
         ];
     }
 

src/Pecee/Http/Input/InputHandler.php

@@ -1,9 +1,11 @@
 <?php
+
 namespace Pecee\Http\Input;
 
+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Http\Request;
 
-class Input
+class InputHandler
 {
     /**
      * @var array
@@ -25,6 +27,10 @@ class Input
      */
     protected $request;
 
+    /**
+     * Input constructor.
+     * @param Request $request
+     */
     public function __construct(Request $request)
     {
         $this->request = $request;
@@ -32,48 +38,59 @@ 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(array_merge($value, $values));
+                try {
+                    $list[$key] = InputFile::createFromArray($values + $value);
+                } catch (InvalidArgumentException $e) {
+
+                }
                 continue;
             }
 
-            $keys = [];
+            $keys = [$key];
 
             $files = $this->rearrangeFiles($value['name'], $keys, $value);
 
-            if (isset($list[$key])) {
+            if (isset($list[$key]) === true) {
                 $list[$key][] = $files;
             } else {
                 $list[$key] = $files;
@@ -84,51 +101,47 @@ class Input
         return $list;
     }
 
-    protected function rearrangeFiles(array $values, &$index, $original)
+    protected function rearrangeFiles(array $values, &$index, $original): array
     {
 
+        $originalIndex = $index[0];
+        array_shift($index);
+
         $output = [];
 
-        $getItem = function ($key, $property = 'name') use ($original, $index) {
-
-            $path = $original[$property];
-
-            $fileValues = array_values($index);
-
-            foreach ($fileValues as $i) {
-                $path = $path[$i];
-            }
-
-            return $path[$key];
-        };
-
         foreach ($values as $key => $value) {
 
-            if (is_array($getItem($key)) === false) {
+            if (\is_array($original['name'][$key]) === false) {
 
-                $file = InputFile::createFromArray([
-                    'index'    => $key,
-                    'error'    => $getItem($key, 'error'),
-                    'tmp_name' => $getItem($key, 'tmp_name'),
-                    'type'     => $getItem($key, 'type'),
-                    'size'     => $getItem($key, 'size'),
-                    'filename' => $getItem($key, 'name'),
-                ]);
+                try {
+
+                    $file = InputFile::createFromArray([
+                        'index'    => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
+                        'name'     => $original['name'][$key],
+                        'error'    => $original['error'][$key],
+                        'tmp_name' => $original['tmp_name'][$key],
+                        'type'     => $original['type'][$key],
+                        'size'     => $original['size'][$key],
+                    ]);
+
+                    if (isset($output[$key]) === true) {
+                        $output[$key][] = $file;
+                        continue;
+                    }
 
-                if (isset($output[$key])) {
-                    $output[$key][] = $file;
-                } else {
                     $output[$key] = $file;
-                }
+                    continue;
 
-                continue;
+                } catch (InvalidArgumentException $e) {
+
+                }
             }
 
             $index[] = $key;
 
             $files = $this->rearrangeFiles($value, $index, $original);
 
-            if (isset($output[$key])) {
+            if (isset($output[$key]) === true) {
                 $output[$key][] = $files;
             } else {
                 $output[$key] = $files;
@@ -139,20 +152,14 @@ class Input
         return $output;
     }
 
-    protected function handleGetPost(array $array)
+    protected function handleGetPost(array $array): array
     {
         $list = [];
 
-        $max = count($array) - 1;
-        $keys = array_keys($array);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $value = $array[$key];
+        foreach ($array as $key => $value) {
 
             // Handle array input
-            if (is_array($value) === false) {
+            if (\is_array($value) === false) {
                 $list[$key] = new InputItem($key, $value);
                 continue;
             }
@@ -172,9 +179,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;
     }
 
     /**
@@ -184,9 +191,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;
     }
 
     /**
@@ -196,9 +203,9 @@ 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;
     }
 
     /**
@@ -209,27 +216,27 @@ class Input
      * @param array|string|null $methods
      * @return IInputItem|string
      */
-    public function getObject($index, $defaultValue = null, $methods = null)
+    public function getObject(string $index, ?string $defaultValue = null, $methods = null)
     {
-        if ($methods !== null && is_string($methods) === true) {
+        if ($methods !== null && \is_string($methods) === true) {
             $methods = [$methods];
         }
 
         $element = null;
 
-        if ($methods === null || in_array('get', $methods)) {
+        if ($methods === null || \in_array('get', $methods, true) === true) {
             $element = $this->findGet($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
+        if (($element === null && $methods === null) || ($methods !== null && \in_array('post', $methods, true) === true)) {
             $element = $this->findPost($index);
         }
 
-        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
+        if (($element === null && $methods === null) || ($methods !== null && \in_array('file', $methods, true) === true)) {
             $element = $this->findFile($index);
         }
 
-        return ($element !== null) ? $element : $defaultValue;
+        return $element ?? $defaultValue;
     }
 
     /**
@@ -240,7 +247,7 @@ class Input
      * @param array|string|null $methods
      * @return InputItem|string
      */
-    public function get($index, $defaultValue = null, $methods = null)
+    public function get(string $index, ?string $defaultValue = null, $methods = null)
     {
         $input = $this->getObject($index, $defaultValue, $methods);
 
@@ -257,7 +264,7 @@ class Input
      * @param string $index
      * @return bool
      */
-    public function exists($index)
+    public function exists(string $index): bool
     {
         return ($this->getObject($index) !== null);
     }
@@ -267,31 +274,23 @@ 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 + $_POST;
 
         if ($this->request->getMethod() === 'post') {
 
             $contents = file_get_contents('php://input');
 
             if (strpos(trim($contents), '{') === 0) {
-                $output = json_decode($contents, true);
-                if ($output === false) {
-                    $output = [];
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output += $post;
                 }
             }
         }
 
-        $output = array_merge($_GET, $output);
-
-        if ($filter !== null) {
-            $output = array_filter($output, function ($key) use ($filter) {
-                return (in_array($key, $filter) === true);
-            }, ARRAY_FILTER_USE_KEY);
-        }
-
-        return $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,24 +8,24 @@ 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;
 
         // Make the name human friendly, by replace _ with space
-        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
     }
 
     /**
      * @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

@@ -1,25 +1,27 @@
 <?php
+
 namespace Pecee\Http\Middleware;
 
-use Pecee\CsrfToken;
 use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
+use Pecee\Http\Security\CookieTokenProvider;
+use Pecee\Http\Security\ITokenProvider;
 
 class BaseCsrfVerifier implements IMiddleware
 {
-    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 $csrfToken;
-    protected $token;
+    protected $tokenProvider;
 
+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
     public function __construct()
     {
-        $this->csrfToken = new CsrfToken();
-
-        // Generate or get the CSRF-Token from Cookie.
-        $this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
+        $this->tokenProvider = new CookieTokenProvider();
     }
 
     /**
@@ -27,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 || is_array($this->except) === false) {
+        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(), $url) === 0);
+                $skip = $request->getUrl()->contains($url);
             } else {
-                $skip = ($url === rtrim($request->getUri(), '/'));
+                $skip = ($url === $request->getUrl()->getOriginalUrl());
             }
 
             if ($skip === true) {
@@ -54,46 +56,47 @@ 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()->get(static::POST_KEY, null, '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->csrfToken->validate($token) === false) {
-                throw new TokenMismatchException('Invalid csrf-token.');
+            if ($this->tokenProvider->validate($token) === false) {
+                throw new TokenMismatchException('Invalid CSRF-token.');
             }
 
         }
 
+        // Refresh existing token
+        $this->tokenProvider->refresh();
+
     }
 
-    public function generateToken()
+    public function getTokenProvider(): ITokenProvider
     {
-        $token = CsrfToken::generateToken();
-        $this->csrfToken->setToken($token);
-
-        return $token;
+        return $this->tokenProvider;
     }
 
-    public function hasToken()
+    /**
+     * Set token provider
+     * @param ITokenProvider $provider
+     */
+    public function setTokenProvider(ITokenProvider $provider): void
     {
-        if ($this->token !== null) {
-            return true;
-        }
-
-        return $this->csrfToken->hasToken();
-    }
-
-    public function getToken()
-    {
-        return $this->token;
+        $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

@@ -1,19 +1,22 @@
 <?php
+
 namespace Pecee\Http;
 
-use Pecee\Http\Input\Input;
+use Pecee\Http\Input\InputHandler;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
 use Pecee\SimpleRouter\SimpleRouter;
 
 class Request
 {
-    protected $data = [];
-    protected $headers;
+    private $data = [];
+    protected $headers = [];
     protected $host;
-    protected $uri;
+    protected $url;
     protected $method;
-    protected $input;
+    protected $inputHandler;
+
+    protected $hasRewrite = false;
 
     /**
      * @var ILoadableRoute|null
@@ -22,61 +25,55 @@ class Request
     protected $rewriteUrl;
 
     /**
-     * @var ILoadableRoute|null
+     * @var array
      */
-    protected $loadedRoute;
+    protected $loadedRoutes = [];
 
+    /**
+     * Request constructor.
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
     public function __construct()
     {
-        $this->parseHeaders();
-        $this->host = $this->getHeader('http-host');
-        $this->uri = $this->getHeader('request-uri');
-        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
-    }
-
-    protected function parseHeaders()
-    {
-        $this->headers = [];
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-            $key = $keys[$i];
-            $value = $_SERVER[$key];
-
+        foreach ($_SERVER as $key => $value) {
             $this->headers[strtolower($key)] = $value;
             $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
         }
 
+        $this->setHost($this->getHeader('http-host'));
+
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUrl($this->getHeader('unencoded-url', $this->getHeader('request-uri')));
+
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->get('_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 string
+     * @return Url
      */
-    public function getUri()
+    public function getUrl(): Url
     {
-        return $this->uri;
+        return $this->url;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getHost()
+    public function getHost(): ?string
     {
         return $this->host;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getMethod()
+    public function getMethod(): ?string
     {
         return $this->method;
     }
@@ -85,7 +82,7 @@ class Request
      * Get http basic auth user
      * @return string|null
      */
-    public function getUser()
+    public function getUser(): ?string
     {
         return $this->getHeader('php-auth-user');
     }
@@ -94,7 +91,7 @@ class Request
      * Get http basic auth password
      * @return string|null
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->getHeader('php-auth-pw');
     }
@@ -103,16 +100,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');
@@ -129,27 +126,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');
     }
@@ -162,35 +159,18 @@ class Request
      *
      * @return string|null
      */
-    public function getHeader($name, $defaultValue = null)
+    public function getHeader($name, $defaultValue = null): ?string
     {
-        if (isset($this->headers[strtolower($name)])) {
-            return $this->headers[strtolower($name)];
-        }
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $name = $_SERVER[$key];
-
-            if ($key === $name) {
-                return $name;
-            }
-        }
-
-        return $defaultValue;
+        return $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;
     }
 
     /**
@@ -200,32 +180,43 @@ 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 string $uri
+     * @param string|Url $url
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public function setUri($uri)
+    public function setUrl($url): void
     {
-        $this->uri = $uri;
+        $this->url = ($url instanceof Url) ? $url : new Url($url);
     }
 
     /**
-     * @param string $host
+     * @param string|null $host
      */
-    public function setHost($host)
+    public function setHost(?string $host): void
     {
         $this->host = $host;
     }
@@ -233,7 +224,7 @@ class Request
     /**
      * @param string $method
      */
-    public function setMethod($method)
+    public function setMethod(string $method): void
     {
         $this->method = $method;
     }
@@ -244,28 +235,10 @@ class Request
      * @param ILoadableRoute $route
      * @return static
      */
-    public function setRewriteRoute(ILoadableRoute $route)
+    public function setRewriteRoute(ILoadableRoute $route): self
     {
-        $this->rewriteRoute = $route;
-
-        $callback = $route->getCallback();
-
-        /* Only add default namespace on relative callbacks */
-        if ($callback === null || $callback[0] !== '\\') {
-
-            $namespace = SimpleRouter::getDefaultNamespace();
-
-            if ($namespace !== null) {
-
-                if ($this->rewriteRoute->getNamespace() !== null) {
-                    $namespace .= '\\' . $this->rewriteRoute->getNamespace();
-                }
-
-                $this->rewriteRoute->setDefaultNamespace($namespace);
-
-            }
-
-        }
+        $this->hasRewrite = true;
+        $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
 
         return $this;
     }
@@ -275,7 +248,7 @@ class Request
      *
      * @return ILoadableRoute|null
      */
-    public function getRewriteRoute()
+    public function getRewriteRoute(): ?ILoadableRoute
     {
         return $this->rewriteRoute;
     }
@@ -283,9 +256,9 @@ class Request
     /**
      * Get rewrite url
      *
-     * @return string
+     * @return string|null
      */
-    public function getRewriteUrl()
+    public function getRewriteUrl(): ?string
     {
         return $this->rewriteUrl;
     }
@@ -296,48 +269,97 @@ class Request
      * @param string $rewriteUrl
      * @return static
      */
-    public function setRewriteUrl($rewriteUrl)
+    public function setRewriteUrl(string $rewriteUrl): self
     {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasRewrite = 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->hasRewrite = 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 hasRewrite(): bool
+    {
+        return $this->hasRewrite;
+    }
+
+    /**
+     * Defines if the current request contains a rewrite.
+     *
+     * @param bool $boolean
+     * @return Request
+     */
+    public function setHasRewrite(bool $boolean): self
+    {
+        $this->hasRewrite = $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)
@@ -347,7 +369,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

@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http;
 
+use Pecee\Exceptions\InvalidArgumentException;
+
 class Response
 {
     protected $request;
@@ -16,7 +19,7 @@ class Response
      * @param int $code
      * @return static
      */
-    public function httpCode($code)
+    public function httpCode(int $code): self
     {
         http_response_code($code);
 
@@ -29,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());
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
     }
 
     /**
@@ -49,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 . '"',
@@ -59,37 +62,43 @@ 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;
     }
 
     /**
-     * Json encode array
-     * @param array $value
+     * Json encode
+     * @param array|\JsonSerializable $value
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws InvalidArgumentException
      */
-    public function json(array $value)
+    public function json($value, ?int $options = null, int $dept = 512): void
     {
-        $this->header('Content-Type: application/json');
-        echo json_encode($value);
-        die();
+        if (($value instanceof \JsonSerializable) === false && \is_array($value) === false) {
+            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
+        }
+
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
+        exit(0);
     }
 
     /**
@@ -97,7 +106,7 @@ class Response
      * @param string $value
      * @return static
      */
-    public function header($value)
+    public function header(string $value): self
     {
         header($value);
 
@@ -109,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

@@ -0,0 +1,118 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+use Pecee\Http\Security\Exceptions\SecurityException;
+
+class CookieTokenProvider implements ITokenProvider
+{
+    public const CSRF_KEY = 'CSRF-TOKEN';
+
+    protected $token;
+    protected $cookieTimeoutMinutes = 120;
+
+    /**
+     * CookieTokenProvider constructor.
+     * @throws SecurityException
+     */
+    public function __construct()
+    {
+        $this->token = $this->getToken();
+
+        if ($this->token === null) {
+            $this->token = $this->generateToken();
+        }
+    }
+
+    /**
+     * Generate random identifier for CSRF token
+     *
+     * @return string
+     * @throws SecurityException
+     */
+    public function generateToken(): string
+    {
+        try {
+            return bin2hex(random_bytes(32));
+        } catch (\Exception $e) {
+            throw new SecurityException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+        }
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        if ($this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
+
+        return false;
+    }
+
+    /**
+     * Set csrf token cookie
+     * Overwrite this method to save the token to another storage like session etc.
+     *
+     * @param string $token
+     */
+    public function setToken(string $token): void
+    {
+        $this->token = $token;
+        setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
+    }
+
+    /**
+     * Get csrf token
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string
+    {
+        $this->token = ($this->hasToken() === true) ? $_COOKIE[static::CSRF_KEY] : null;
+
+        return $this->token ?? $defaultValue;
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void
+    {
+        if ($this->token !== null) {
+            $this->setToken($this->token);
+        }
+    }
+
+    /**
+     * Returns whether the csrf token has been defined
+     * @return bool
+     */
+    public function hasToken(): bool
+    {
+        return isset($_COOKIE[static::CSRF_KEY]);
+    }
+
+    /**
+     * Get timeout for cookie in minutes
+     * @return int
+     */
+    public function getCookieTimeoutMinutes(): int
+    {
+        return $this->cookieTimeoutMinutes;
+    }
+
+    /**
+     * Set cookie timeout in minutes
+     * @param int $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

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+interface ITokenProvider
+{
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void;
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    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/Url.php

@@ -0,0 +1,201 @@
+<?php
+
+namespace Pecee\Http;
+
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url
+{
+    private $originalUrl;
+    private $data = [
+        'scheme'   => null,
+        'host'     => null,
+        'port'     => null,
+        'user'     => null,
+        'pass'     => null,
+        'path'     => null,
+        'query'    => null,
+        'fragment' => null,
+    ];
+
+    /**
+     * Url constructor.
+     * @param string $url
+     * @throws MalformedUrlException
+     */
+    public function __construct(?string $url)
+    {
+        $this->originalUrl = $url;
+        if ($url !== null) {
+            $this->data = $this->parseUrl($url) + $this->data;
+
+            if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
+                $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+            }
+        }
+    }
+
+    /**
+     * 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->data['scheme'];
+    }
+
+    /**
+     * Get url host
+     * @return string|null
+     */
+    public function getHost(): ?string
+    {
+        return $this->data['host'];
+    }
+
+    /**
+     * Get url port
+     * @return int|null
+     */
+    public function getPort(): ?int
+    {
+        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
+    }
+
+    /**
+     * Parse username from url
+     * @return string|null
+     */
+    public function getUserName(): ?string
+    {
+        return $this->data['user'];
+    }
+
+    /**
+     * Parse password from url
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        return $this->data['pass'];
+    }
+
+    /**
+     * Get path from url
+     * @return string
+     */
+    public function getPath(): ?string
+    {
+        return $this->data['path'] ?? '/';
+    }
+
+    /**
+     * Get querystring from url
+     * @return string|null
+     */
+    public function getQueryString(): ?string
+    {
+        return $this->data['query'];
+    }
+
+    /**
+     * Get fragment from url (everything after #)
+     * @return string|null
+     */
+    public function getFragment(): ?string
+    {
+        return $this->data['fragment'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl(): string
+    {
+        return $this->originalUrl;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @throws MalformedUrlException
+     * @return array
+     */
+    public function parseUrl(string $url, int $component = -1): array
+    {
+        $encodedUrl = preg_replace_callback(
+            '/[^:\/@?&=#]+/u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new MalformedUrlException('Malformed URL: ' . $url);
+        }
+
+        return array_map('urldecode', $parts);
+    }
+
+    /**
+     * Get position of value.
+     * Returns -1 on failure.
+     *
+     * @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);
+    }
+
+    /**
+     * Returns data array with information about the url
+     * @return array
+     */
+    public function getData(): array
+    {
+        return $this->data;
+    }
+
+    public function __toString()
+    {
+        return $this->getOriginalUrl();
+    }
+
+}

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/IRouterBootManager.php

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

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

@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
+use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 
 interface IGroupRoute extends IRoute
@@ -11,13 +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
+     */
+    public function addExceptionHandler($handler): self;
 
     /**
      * Set exception-handlers for group
      *
      * @param array $handlers
-     * @return static $this
+     * @return static
      */
     public function setExceptionHandlers(array $handlers);
 
@@ -26,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
 {
@@ -14,25 +16,35 @@ interface ILoadableRoute extends IRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null);
+    public function findUrl($method = null, $parameters = null, $name = null): string;
 
     /**
-     * Loads and renders middlewares-classes
+     * 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/IPartialGroupRoute.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+interface IPartialGroupRoute
+{
+
+}

src/Pecee/SimpleRouter/Route/IRoute.php

@@ -1,7 +1,9 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
 
 interface IRoute
 {
@@ -12,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 void
+     * @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.
@@ -31,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
@@ -82,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.
@@ -127,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
@@ -173,14 +196,14 @@ interface IRoute
      * @param string $middleware
      * @return static
      */
-    public function setMiddleware($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

@@ -1,9 +1,11 @@
 <?php
+
 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
 {
@@ -23,30 +25,32 @@ 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) {
-
-            for ($i = 0; $i < $max; $i++) {
-
-                $middleware = $this->getMiddlewares()[$i];
+        foreach ($this->getMiddlewares() as $middleware) {
 
+            if (\is_object($middleware) === false) {
                 $middleware = $this->loadClass($middleware);
-
-                if (($middleware instanceof IMiddleware) === false) {
-                    throw new HttpException($middleware . ' must be instance of Middleware');
-                }
-
-                $middleware->handle($request);
             }
+
+            if (($middleware instanceof IMiddleware) === false) {
+                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+            }
+
+            $router->debug('Loading middleware "%s"', \get_class($middleware));
+            $middleware->handle($request);
+            $router->debug('Finished loading middleware');
         }
+
+        $router->debug('Finished loading middlewares');
     }
 
-    public function matchRegex(Request $request, $url)
+    public function matchRegex(Request $request, $url): ?bool
     {
         /* Match on custom defined regular expression */
 
@@ -54,17 +58,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             return null;
         }
 
-        $parameters = [];
-
-        if (preg_match($this->regex, $request->getHost() . $url, $parameters) > 0) {
-
-            /* Remove global match */
-            $this->parameters = array_slice($parameters, 1);
-
-            return true;
-        }
-
-        return false;
+        return ((bool)preg_match($this->regex, $request->getHost() . $url) !== false);
     }
 
     /**
@@ -73,15 +67,15 @@ 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, '/') . '/';
 
         if (strpos($this->url, $this->paramModifiers[0]) !== false) {
 
-            $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
                 $this->parameters = array_fill_keys($matches[1], null);
             }
         }
@@ -89,7 +83,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         return $this;
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return $this->url;
     }
@@ -99,16 +93,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * Used when calling the url() helper.
      *
      * @param string|null $method
-     * @param array|null $parameters
+     * @param string|array|null $parameters
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         $url = $this->getUrl();
 
-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
+        $group = $this->getGroup();
+
+        if ($group !== null && \count($group->getDomains()) !== 0) {
+            $url = '//' . $group->getDomains()[0] . $url;
         }
 
         /* Contains parameters that aren't recognized and will be appended at the end of the url */
@@ -123,16 +119,19 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
         /* Replace any {parameter} in the url with the correct value */
 
         $params = $this->getParameters();
-        $max = count($params) - 1;
-        $keys = array_keys($params);
 
-        for ($i = $max; $i >= 0; $i--) {
-            $param = $keys[$i];
-            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
+        foreach (array_keys($params) as $param) {
 
-            /* If parameter is specifically set to null - use the original-defined value */
-            if ($value === null && isset($this->originalParameters[$param])) {
-                $value = $this->originalParameters[$param];
+            if ($parameters === '' || (\is_array($parameters) === true && \count($parameters) === 0)) {
+                $value = '';
+            } else {
+                $p = (array)$parameters;
+                $value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
+
+                /* If parameter is specifically set to null - use the original-defined value */
+                if ($value === null && isset($this->originalParameters[$param])) {
+                    $value = $this->originalParameters[$param];
+                }
             }
 
             if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
@@ -143,7 +142,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             }
         }
 
-        $url .= join('/', $unknownParams);
+        $url = '/' . ltrim($url, '/') . implode('/', $unknownParams);
 
         return rtrim($url, '/') . '/';
     }
@@ -153,7 +152,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -164,9 +163,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);
     }
 
     /**
@@ -175,7 +174,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;
 
@@ -187,7 +186,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      *
      * @return string
      */
-    public function getMatch()
+    public function getMatch(): string
     {
         return $this->regex;
     }
@@ -200,7 +199,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);
     }
@@ -209,9 +208,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;
 
@@ -225,17 +224,20 @@ 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'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
             if ($this->name !== null && $merge !== false) {
-                $this->setName($values['as'] . '.' . $this->name);
-            } else {
-                $this->setName($values['as']);
+                $name .= '.' . $this->name;
             }
+
+            $this->setName($name);
         }
 
-        if (isset($values['prefix'])) {
+        if (isset($values['prefix']) === true) {
             $this->setUrl($values['prefix'] . $this->getUrl());
         }
 

src/Pecee/SimpleRouter/Route/Route.php

@@ -1,19 +1,23 @@
 <?php
+
 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_MATCH = '%s([\w]+)(\%s?)%s';
+    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,
@@ -30,9 +34,16 @@ abstract class Route implements IRoute
      *
      * @var bool
      */
-    protected $filterEmptyParams = false;
+    protected $filterEmptyParams = true;
+
+    /**
+     * Default regular expression used for parsing parameters.
+     * @var string|null
+     */
+    protected $defaultParameterRegex;
     protected $paramModifiers = '{}';
     protected $paramOptionalSymbol = '?';
+    protected $urlRegex = '/^%s\/?$/u';
     protected $group;
     protected $parent;
     protected $callback;
@@ -46,101 +57,140 @@ abstract class Route implements IRoute
     protected $originalParameters = [];
     protected $middlewares = [];
 
-    protected function loadClass($name)
+    /**
+     * Load class by name
+     * @param string $name
+     * @return object
+     * @throws NotFoundHttpException
+     */
+    protected function loadClass($name): object
     {
         if (class_exists($name) === false) {
-            throw new NotFoundHttpException(sprintf('Class %s does not exist', $name), 404);
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
         }
 
         return new $name();
     }
 
-    public function renderRoute(Request $request)
+    /**
+     * Render route
+     *
+     * @param Request $request
+     * @param Router $router
+     * @return string|null
+     * @throws NotFoundHttpException
+     */
+    public function renderRoute(Request $request, Router $router): ?string
     {
+        $router->debug('Starting rendering route');
+
         $callback = $this->getCallback();
 
-        if ($callback !== null && is_callable($callback)) {
+        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) {
+            $router->debug('Executing callback');
 
             /* When the callback is a function */
-            call_user_func_array($callback, $this->getParameters());
 
-        } else {
-
-            /* When the callback is a method */
-            $controller = explode('@', $callback);
-
-            $namespace = $this->getNamespace();
-
-            $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
-
-            $class = $this->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();
-
-            /* Filter parameters with null-value */
-
-            if ($this->filterEmptyParams === true) {
-                $parameters = array_filter($parameters, function ($var) {
-                    return ($var !== null);
-                });
-            }
-
-            call_user_func_array([$class, $method], $parameters);
+            return \call_user_func_array($callback, $parameters);
         }
+
+        /* When the callback is a class + method */
+        $controller = explode('@', $callback);
+
+        $namespace = $this->getNamespace();
+
+        $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
+
+        $router->debug('Loading class %s', $className);
+        $class = $this->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);
+        }
+
+        $router->debug('Executing callback');
+
+        return \call_user_func_array([$class, $method], $parameters);
     }
 
-    protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
+    protected function parseParameters($route, $url, $parameterRegex = null)
     {
-        $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+        $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
         $parameters = [];
 
-        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+        // Ensures that hostnames/domains will work with parameters
+        $url = '/' . ltrim($url, '/');
 
-            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
+        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+            $urlRegex = preg_quote($route, '/');
+        } else {
+
+            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', $route);
 
             foreach ($urlParts as $key => $t) {
 
                 $regex = '';
 
-                if ($key < count($parameters[1])) {
+                if ($key < \count($parameters[1])) {
 
                     $name = $parameters[1][$key];
-                    $regex = isset($this->where[$name]) ? $this->where[$name] : $parameterRegex;
-                    $regex = sprintf('\-?\/?(?P<%s>%s)', $name, $regex) . $parameters[2][$key];
 
+                    /* If custom regex is defined, use that */
+                    if (isset($this->where[$name]) === true) {
+                        $regex = $this->where[$name];
+                    } else {
+
+                        /* If method specific regex is defined use that, otherwise use the default parameter regex */
+                        if ($parameterRegex !== null) {
+                            $regex = $parameterRegex;
+                        } else {
+                            $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('/^' . $urlRegex . '(\/?)$/', $url, $matches) > 0) {
+        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+            return null;
+        }
 
-            $values = [];
+        $values = [];
 
-            if (isset($parameters[1])) {
+        if (isset($parameters[1]) === true) {
 
-                /* Only take matched parameters with name */
-                foreach ($parameters[1] as $name) {
-                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
-                }
+            /* Only take matched parameters with name */
+            foreach ((array)$parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
             }
-
-            return $values;
         }
 
-        return null;
+        return $values;
     }
 
     /**
@@ -150,9 +200,9 @@ abstract class Route implements IRoute
      *
      * @return string
      */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
-        if (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             return $this->callback;
         }
 
@@ -163,9 +213,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;
 
@@ -177,7 +227,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getRequestMethods()
+    public function getRequestMethods(): array
     {
         return $this->requestMethods;
     }
@@ -185,7 +235,7 @@ abstract class Route implements IRoute
     /**
      * @return IRoute|null
      */
-    public function getParent()
+    public function getParent(): ?IRoute
     {
         return $this->parent;
     }
@@ -195,7 +245,7 @@ abstract class Route implements IRoute
      *
      * @return IGroupRoute|null
      */
-    public function getGroup()
+    public function getGroup(): ?IGroupRoute
     {
         return $this->group;
     }
@@ -204,12 +254,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;
     }
 
@@ -217,9 +270,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;
 
@@ -232,7 +285,7 @@ abstract class Route implements IRoute
      * @param string $callback
      * @return static
      */
-    public function setCallback($callback)
+    public function setCallback($callback): IRoute
     {
         $this->callback = $callback;
 
@@ -240,16 +293,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 (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             $tmp = explode('@', $this->callback);
 
             return $tmp[1];
@@ -258,9 +311,9 @@ abstract class Route implements IRoute
         return null;
     }
 
-    public function getClass()
+    public function getClass(): ?string
     {
-        if (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
             $tmp = explode('@', $this->callback);
 
             return $tmp[0];
@@ -269,14 +322,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());
 
@@ -285,9 +338,9 @@ abstract class Route implements IRoute
 
     /**
      * @param string $namespace
-     * @return static $this
+     * @return static
      */
-    public function setNamespace($namespace)
+    public function setNamespace(string $namespace): IRoute
     {
         $this->namespace = $namespace;
 
@@ -296,26 +349,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;
     }
 
     /**
@@ -323,7 +376,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -331,18 +384,22 @@ 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;
         }
 
+        if ($this->defaultParameterRegex !== null) {
+            $values['defaultParameterRegex'] = $this->defaultParameterRegex;
+        }
+
         return $values;
     }
 
@@ -351,31 +408,35 @@ 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'])) {
+        if ($this->namespace === null && isset($values['namespace']) === true) {
             $this->setNamespace($values['namespace']);
         }
 
-        if (isset($values['method'])) {
+        if (isset($values['method']) === true) {
             $this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
         }
 
-        if (isset($values['where'])) {
+        if (isset($values['where']) === true) {
             $this->setWhere(array_merge($this->where, (array)$values['where']));
         }
 
-        if (isset($values['parameters'])) {
+        if (isset($values['parameters']) === true) {
             $this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
         }
 
         // Push middleware if multiple
-        if (isset($values['middleware'])) {
+        if (isset($values['middleware']) === true) {
             $this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
         }
 
+        if (isset($values['defaultParameterRegex']) === true) {
+            $this->setDefaultParameterRegex($values['defaultParameterRegex']);
+        }
+
         return $this;
     }
 
@@ -384,7 +445,7 @@ abstract class Route implements IRoute
      *
      * @return array
      */
-    public function getWhere()
+    public function getWhere(): array
     {
         return $this->where;
     }
@@ -395,7 +456,7 @@ abstract class Route implements IRoute
      * @param array $options
      * @return static
      */
-    public function setWhere(array $options)
+    public function setWhere(array $options): IRoute
     {
         $this->where = $options;
 
@@ -420,12 +481,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;
         }
 
@@ -436,15 +497,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;
         }
 
@@ -454,9 +515,10 @@ abstract class Route implements IRoute
     }
 
     /**
-     * Set middleware class-name
+     * Add middleware class-name
      *
-     * @param string $middleware
+     * @deprecated This method is deprecated and will be removed in the near future.
+     * @param IMiddleware|string $middleware
      * @return static
      */
     public function setMiddleware($middleware)
@@ -466,13 +528,26 @@ abstract class Route implements IRoute
         return $this;
     }
 
+    /**
+     * Add middleware class-name
+     *
+     * @param IMiddleware|string $middleware
+     * @return static
+     */
+    public function addMiddleware($middleware): IRoute
+    {
+        $this->middlewares[] = $middleware;
+
+        return $this;
+    }
+
     /**
      * Set middlewares array
      *
      * @param array $middlewares
-     * @return $this
+     * @return static
      */
-    public function setMiddlewares(array $middlewares)
+    public function setMiddlewares(array $middlewares): IRoute
     {
         $this->middlewares = $middlewares;
 
@@ -480,11 +555,35 @@ abstract class Route implements IRoute
     }
 
     /**
-     * @return string|array
+     * @return array
      */
-    public function getMiddlewares()
+    public function getMiddlewares(): array
     {
         return $this->middlewares;
     }
 
+    /**
+     * Set default regular expression used when matching parameters.
+     * This is used when no custom parameter regex is found.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setDefaultParameterRegex($regex)
+    {
+        $this->defaultParameterRegex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get default regular expression used when matching parameters.
+     *
+     * @return string
+     */
+    public function getDefaultParameterRegex(): string
+    {
+        return $this->defaultParameterRegex;
+    }
+
 }

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
@@ -23,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;
@@ -34,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;
             }
         }
@@ -48,12 +49,12 @@ class RouteController extends LoadableRoute implements IControllerRoute
      * @param string|null $name
      * @return string
      */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         if (strpos($name, '.') !== false) {
             $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
             if ($found !== false) {
-                $method = $found;
+                $method = (string)$found;
             }
         }
 
@@ -66,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;
                 }
             }
@@ -74,19 +75,22 @@ class RouteController extends LoadableRoute implements IControllerRoute
             $method .= '/';
         }
 
-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+        $group = $this->getGroup();
+
+        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
     {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
 
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
@@ -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,9 +171,9 @@ 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'])) {
+        if (isset($values['names']) === true) {
             $this->names = $values['names'];
         }
 

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
+use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
 
 class RouteGroup extends Route implements IGroupRoute
@@ -16,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 (count($this->domains) === 0) {
+        if ($this->domains === null || \count($this->domains) === 0) {
             return true;
         }
 
@@ -26,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;
 
@@ -44,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;
@@ -54,13 +60,26 @@ class RouteGroup extends Route implements IGroupRoute
         return $this->matchDomain($request);
     }
 
+    /**
+     * Add exception handler
+     *
+     * @param IExceptionHandler|string $handler
+     * @return static
+     */
+    public function addExceptionHandler($handler): IGroupRoute
+    {
+        $this->exceptionHandlers[] = $handler;
+
+        return $this;
+    }
+
     /**
      * 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;
 
@@ -72,7 +91,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getExceptionHandlers()
+    public function getExceptionHandlers(): array
     {
         return $this->exceptionHandlers;
     }
@@ -82,7 +101,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function getDomains()
+    public function getDomains(): array
     {
         return $this->domains;
     }
@@ -91,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;
 
@@ -104,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, '/');
 
@@ -114,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;
     }
@@ -128,27 +147,30 @@ 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'])) {
+        if (isset($values['prefix']) === true) {
             $this->setPrefix($values['prefix'] . $this->prefix);
         }
 
-        if (isset($values['exceptionHandler'])) {
+        if ($merge === false && isset($values['exceptionHandler']) === true) {
             $this->setExceptionHandlers((array)$values['exceptionHandler']);
         }
 
-        if (isset($values['domain'])) {
+        if ($merge === false && isset($values['domain']) === true) {
             $this->setDomains((array)$values['domain']);
         }
 
-        if (isset($values['as'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
             if ($this->name !== null && $merge !== false) {
-                $this->name = $values['as'] . '.' . $this->name;
-            } else {
-                $this->name = $values['as'];
+                $name .= '.' . $this->name;
             }
+
+            $this->name = $name;
         }
 
         parent::setSettings($values, $merge);
@@ -161,7 +183,7 @@ class RouteGroup extends Route implements IGroupRoute
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $values = [];
 
@@ -173,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

@@ -0,0 +1,40 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+
+class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
+{
+    protected $urlRegex = '/^%s\/?/u';
+
+    /**
+     * Method called to check if route matches
+     *
+     * @param string $url
+     * @param Request $request
+     * @return bool
+     */
+    public function matchRoute($url, Request $request): 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);
+
+            /* If no custom regular expression or parameters was found on this route, we stop */
+            if ($parameters === null) {
+                return false;
+            }
+
+            /* Set the parameters */
+            $this->setParameters((array)$parameters);
+        }
+
+        return $this->matchDomain($request);
+    }
+
+}

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
@@ -41,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;
@@ -59,7 +60,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return (strtolower($this->name) === strtolower($name));
     }
 
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl($method = null, $parameters = null, $name = null): string
     {
         $url = array_search($name, $this->names, false);
         if ($url !== false) {
@@ -76,10 +77,11 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         return true;
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
 
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
@@ -90,8 +92,11 @@ class RouteResource extends LoadableRoute implements IControllerRoute
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
 
+        /* Parse parameters from current route */
         $this->parameters = $this->parseParameters($route, $url);
-        if ($this->parameters === null) {
+
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $this->parameters === null) {
             return false;
         }
 
@@ -109,7 +114,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         }
 
         // Update
-        if ($id !== null && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false) === true) {
+        if ($id !== null && \in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], true) === true) {
             return $this->call($this->methodNames['update']);
         }
 
@@ -140,7 +145,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     /**
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
@@ -149,14 +154,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;
 
@@ -189,9 +194,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     /**
      * Get method names
      *
-     * @return array $this
+     * @return array
      */
-    public function getMethodNames()
+    public function getMethodNames(): array
     {
         return $this->methodNames;
     }
@@ -203,13 +208,13 @@ 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'])) {
+        if (isset($values['names']) === true) {
             $this->names = $values['names'];
         }
 
-        if (isset($values['methods'])) {
+        if (isset($values['methods']) === true) {
             $this->methodNames = $values['methods'];
         }
 

src/Pecee/SimpleRouter/Route/RouteUrl.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;
 
 use Pecee\Http\Request;
@@ -11,24 +12,29 @@ class RouteUrl extends LoadableRoute
         $this->setCallback($callback);
     }
 
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
     {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
 
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
+
         if ($regexMatch === false) {
             return false;
         }
 
-        /* Make regular expression based on route */
+        /* Parse parameters from current route */
         $parameters = $this->parseParameters($this->url, $url);
-        if ($parameters === null) {
+
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $parameters === null) {
             return false;
         }
 
-        $this->setParameters($parameters);
+        /* Set the parameters */
+        $this->setParameters((array)$parameters);
 
         return true;
     }

src/Pecee/SimpleRouter/Router.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exceptions\InvalidArgumentException;
 use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
@@ -9,17 +11,12 @@ use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
 use Pecee\SimpleRouter\Route\IControllerRoute;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
 
 class Router
 {
 
-    /**
-     * The instance of this class
-     * @var static
-     */
-    protected static $instance;
-
     /**
      * Current request
      * @var Request
@@ -69,12 +66,45 @@ class Router
      */
     protected $exceptionHandlers;
 
+    /**
+     * List of loaded exception that has been loaded.
+     * Used to ensure that exception-handlers aren't loaded twice when rewriting route.
+     *
+     * @var array
+     */
+    protected $loadedExceptionHandlers;
+
+    /**
+     * Enable or disabled debugging
+     * @var bool
+     */
+    protected $debugEnabled = false;
+
+    /**
+     * The start time used when debugging is enabled
+     * @var float
+     */
+    protected $debugStartTime;
+
+    /**
+     * List containing all debug messages
+     * @var array
+     */
+    protected $debugList = [];
+
+    /**
+     * Router constructor.
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
     public function __construct()
     {
         $this->reset();
     }
 
-    public function reset()
+    /**
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
+    public function reset(): void
     {
         $this->processingRoute = false;
         $this->request = new Request();
@@ -83,6 +113,7 @@ class Router
         $this->routeStack = [];
         $this->processedRoutes = [];
         $this->exceptionHandlers = [];
+        $this->loadedExceptionHandlers = [];
     }
 
     /**
@@ -90,100 +121,113 @@ class Router
      * @param IRoute $route
      * @return IRoute
      */
-    public function addRoute(IRoute $route)
+    public function addRoute(IRoute $route): IRoute
     {
         /*
-         * If a route is currently being processed, that means that the
-         * route being added are rendered from the parent routes callback,
-         * so we add them to the stack instead.
+         * If a route is currently being processed, that means that the route being added are rendered from the parent
+         * routes callback, so we add them to the stack instead.
          */
         if ($this->processingRoute === true) {
             $this->routeStack[] = $route;
-        } else {
-            $this->routes[] = $route;
+
+            return $route;
         }
 
+        $this->routes[] = $route;
+
         return $route;
     }
 
+    /**
+     * Render and process any new routes added.
+     *
+     * @param IRoute $route
+     * @throws NotFoundHttpException
+     */
+    protected function renderAndProcess(IRoute $route): void
+    {
+
+        $this->processingRoute = true;
+        $route->renderRoute($this->request, $this);
+        $this->processingRoute = false;
+
+        if (\count($this->routeStack) !== 0) {
+
+            /* Pop and grab the routes added when executing group callback earlier */
+            $stack = $this->routeStack;
+            $this->routeStack = [];
+
+            /* Route any routes added to the stack */
+            $this->processRoutes($stack, $route);
+        }
+    }
+
     /**
      * Process added routes.
      *
      * @param array $routes
      * @param IGroupRoute|null $group
-     * @param IRoute|null $parent
      * @throws NotFoundHttpException
      */
-    protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
+    protected function processRoutes(array $routes, ?IGroupRoute $group = null): void
     {
-        // Loop through each route-request
-        $max = count($routes) - 1;
+        $this->debug('Processing routes');
 
+        // Loop through each route-request
         $exceptionHandlers = [];
 
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+        // Stop processing routes if no valid route is found.
+        if ($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+            $this->debug('Halted route-processing as no valid route was found');
+
+            return;
+        }
+
+        $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
 
         /* @var $route IRoute */
-        for ($i = $max; $i >= 0; $i--) {
+        foreach ($routes as $route) {
 
-            $route = $routes[$i];
-
-            /* @var $route IGroupRoute */
-            if ($route instanceof IGroupRoute) {
-
-                $group = $route;
-
-                if ($route->getCallback() !== null && is_callable($route->getCallback())) {
-
-                    $this->processingRoute = true;
-                    $route->renderRoute($this->request);
-                    $this->processingRoute = false;
-
-                    if ($route->matchRoute($url, $this->request) === true) {
-
-                        /* Add exception handlers */
-                        if (count($route->getExceptionHandlers()) > 0) {
-                            $exceptionHandlers += $route->getExceptionHandlers();
-                        }
-
-                    }
-                }
-            }
+            $this->debug('Processing route "%s"', \get_class($route));
 
             if ($group !== null) {
-
                 /* Add the parent group */
                 $route->setGroup($group);
             }
 
-            if ($parent !== null) {
+            /* @var $route IGroupRoute */
+            if ($route instanceof IGroupRoute) {
 
-                /* Add the parent route */
-                $route->setParent($parent);
+                if ($route->matchRoute($url, $this->request) === true) {
 
-                /* Add/merge parent settings with child */
-                $route->setSettings($parent->toArray(), true);
+                    /* Add exception handlers */
+                    if (\count($route->getExceptionHandlers()) !== 0) {
+                        /** @noinspection AdditionOperationOnArraysInspection */
+                        $exceptionHandlers += $route->getExceptionHandlers();
+                    }
 
+                    /* Only render partial group if it matches */
+                    if ($route instanceof IPartialGroupRoute === true) {
+                        $this->renderAndProcess($route);
+                    }
+
+                }
+
+                if ($route instanceof IPartialGroupRoute === false) {
+                    $this->renderAndProcess($route);
+                }
+
+                continue;
             }
 
-            if ($route instanceof ILoadableRoute) {
+            if ($route instanceof ILoadableRoute === true) {
 
                 /* Add the route to the map, so we can find the active one when all routes has been loaded */
                 $this->processedRoutes[] = $route;
             }
-
-            if (count($this->routeStack) > 0) {
-
-                /* Pop and grab the routes added when executing group callback earlier */
-                $stack = $this->routeStack;
-                $this->routeStack = [];
-
-                /* Route any routes added to the stack */
-                $this->processRoutes($stack, $route, $group);
-            }
         }
 
-        $this->exceptionHandlers = array_unique(array_merge($exceptionHandlers, $this->exceptionHandlers));
+        $this->exceptionHandlers = array_merge($exceptionHandlers, $this->exceptionHandlers);
     }
 
     /**
@@ -191,27 +235,37 @@ class Router
      * @throws NotFoundHttpException
      * @return void
      */
-    public function loadRoutes()
+    public function loadRoutes(): void
     {
+        $this->debug('Loading routes');
+
         /* Initialize boot-managers */
-        if (count($this->bootManagers) > 0) {
-
-            $max = count($this->bootManagers) - 1;
-
-            /* @var $manager IRouterBootManager */
-            for ($i = $max; $i >= 0; $i--) {
-                $manager = $this->bootManagers[$i];
-                $manager->boot($this->request);
-            }
+        /* @var $manager IRouterBootManager */
+        foreach ($this->bootManagers as $manager) {
+            $this->debug('Rendering bootmanager %s', \get_class($manager));
+            $manager->boot($this->request);
+            $this->debug('Finished rendering bootmanager');
         }
 
         /* Loop through each route-request */
         $this->processRoutes($this->routes);
+
+        $this->debug('Finished loading routes');
     }
 
-    public function routeRequest($rewrite = false)
+    /**
+     * Routes the request
+     *
+     * @param bool $rewrite
+     * @return string|null
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public function routeRequest(bool $rewrite = false): ?string
     {
-        $routeNotAllowed = false;
+        $this->debug('Started routing request (rewrite: %s)', $rewrite === true ? 'yes' : 'no');
+
+        $methodNotAllowed = false;
 
         try {
 
@@ -225,52 +279,45 @@ class Router
                 }
             }
 
-            $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
-
-            $max = count($this->processedRoutes) - 1;
+            $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
 
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
+            foreach ($this->processedRoutes as $key => $route) {
 
-                $route = $this->processedRoutes[$i];
+                $this->debug('Matching route "%s"', \get_class($route));
 
                 /* If the route matches */
                 if ($route->matchRoute($url, $this->request) === true) {
 
                     /* Check if request method matches */
-                    if (count($route->getRequestMethods()) > 0 && in_array($this->request->getMethod(), $route->getRequestMethods(), false) === false) {
-                        $routeNotAllowed = true;
+                    if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
+                        $this->debug('Method "%s" not allowed', $this->request->getMethod());
+                        $methodNotAllowed = true;
                         continue;
                     }
 
-                    $route->loadMiddleware($this->request);
+                    $route->loadMiddleware($this->request, $this);
 
-                    $rewriteRoute = $this->request->getRewriteRoute();
-
-                    if ($rewriteRoute !== null) {
-                        $rewriteRoute->loadMiddleware($this->request);
-                        $rewriteRoute->renderRoute($this->request);
-
-                        return;
-                    }
-
-                    /* If the request has changed */
-                    $rewriteUrl = $this->request->getRewriteUrl();
-
-                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                        unset($this->processedRoutes[$i]);
-                        $this->processedRoutes = array_values($this->processedRoutes);
-                        $this->routeRequest(true);
-
-                        return;
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
                     }
 
                     /* Render route */
-                    $routeNotAllowed = false;
-                    $this->request->setLoadedRoute($route);
-                    $route->renderRoute($this->request);
+                    $methodNotAllowed = false;
 
-                    break;
+                    $this->request->addLoadedRoute($route);
+
+                    $output = $route->renderRoute($this->request, $this);
+
+                    if ($output !== null) {
+                        return $output;
+                    }
+
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
+                    }
                 }
             }
 
@@ -278,61 +325,113 @@ class Router
             $this->handleException($e);
         }
 
-        if ($routeNotAllowed === true) {
-            $this->handleException(new HttpException('Route or method not allowed', 403));
+        if ($methodNotAllowed === true) {
+            $message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod());
+            $this->handleException(new HttpException($message, 403));
         }
 
-        if ($this->request->getLoadedRoute() === null) {
-            $this->handleException(new NotFoundHttpException('Route not found: ' . $this->request->getUri(), 404));
+        if (\count($this->request->getLoadedRoutes()) === 0) {
+
+            $rewriteUrl = $this->request->getRewriteUrl();
+
+            if ($rewriteUrl !== null) {
+                $message = sprintf('Route not found: "%s" (rewrite from: "%s")', $rewriteUrl, $this->request->getUrl()->getPath());
+            } else {
+                $message = sprintf('Route not found: "%s"', $this->request->getUrl()->getPath());
+            }
+
+            $this->debug($message);
+
+            return $this->handleException(new NotFoundHttpException($message, 404));
         }
+
+        return null;
     }
 
-    protected function handleException(\Exception $e)
+    /**
+     * Handle route-rewrite
+     *
+     * @param string $key
+     * @param string $url
+     * @return string|null
+     * @throws HttpException
+     * @throws \Exception
+     */
+    protected function handleRouteRewrite($key, string $url): ?string
     {
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
+        /* If the request has changed */
+        if ($this->request->hasRewrite() === false) {
+            return null;
+        }
 
-        $max = count($this->exceptionHandlers);
+        $route = $this->request->getRewriteRoute();
+
+        if ($route !== null) {
+            /* Add rewrite route */
+            $this->processedRoutes[] = $route;
+        }
+
+        if ($this->request->getRewriteUrl() !== $url) {
+            unset($this->processedRoutes[$key]);
+            $this->request->setHasRewrite(false);
+
+            return $this->routeRequest(true);
+        }
+
+        return null;
+    }
+
+    /**
+     * @param \Exception $e
+     * @throws HttpException
+     * @throws \Exception
+     * @return string|null
+     */
+    protected function handleException(\Exception $e): ?string
+    {
+        $this->debug('Starting exception handling for "%s"', \get_class($e));
 
         /* @var $handler IExceptionHandler */
-        for ($i = 0; $i < $max; $i++) {
+        foreach ($this->exceptionHandlers as $key => $handler) {
 
-            $handler = $this->exceptionHandlers[$i];
-            $handler = new $handler();
+            if (\is_object($handler) === false) {
+                $handler = new $handler();
+            }
+
+            $this->debug('Processing exception-handler "%s"', \get_class($handler));
 
             if (($handler instanceof IExceptionHandler) === false) {
                 throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
             }
 
-            if ($handler->handleError($this->request, $e) !== null) {
+            try {
 
-                $rewriteRoute = $this->request->getRewriteRoute();
+                $this->debug('Start rendering exception handler');
+                $handler->handleError($this->request, $e);
+                $this->debug('Finished rendering exception-handler');
 
-                if ($rewriteRoute !== null) {
-                    $rewriteRoute->loadMiddleware($this->request);
-                    $rewriteRoute->renderRoute($this->request);
+                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasRewrite() === true) {
+                    $this->loadedExceptionHandlers[$key] = $handler;
 
-                    return;
+                    $this->debug('Exception handler contains rewrite, reloading routes');
+
+                    return $this->routeRequest(true);
                 }
 
-                $rewriteUrl = $this->request->getRewriteUrl();
+            } catch (\Exception $e) {
 
-                /* If the request has changed */
-                if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                    unset($this->exceptionHandlers[$i]);
-                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
-                    $this->routeRequest(true);
-
-                    return;
-                }
             }
+
+            $this->debug('Finished processing');
         }
 
+        $this->debug('Finished exception handling - exception not handled, throwing');
         throw $e;
     }
 
-    public function arrayToParams(array $getParams = [], $includeEmpty = true)
+    public function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
     {
-        if (count($getParams) > 0) {
+        if (\count($getParams) !== 0) {
 
             if ($includeEmpty === false) {
                 $getParams = array_filter($getParams, function ($item) {
@@ -352,49 +451,60 @@ class Router
      * @param string $name
      * @return ILoadableRoute|null
      */
-    public function findRoute($name)
+    public function findRoute(string $name): ?ILoadableRoute
     {
-        $max = count($this->processedRoutes) - 1;
+
+        $this->debug('Finding route by name "%s"', $name);
 
         /* @var $route ILoadableRoute */
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $this->processedRoutes[$i];
+        foreach ($this->processedRoutes as $route) {
 
             /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
-            if ($route->hasName($name)) {
+            if ($route->hasName($name) === true) {
+                $this->debug('Found route "%s" by name "%s"', $route->getUrl(), $name);
+
                 return $route;
             }
 
             /* Direct match to controller */
             if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($name)) {
+                $this->debug('Found route "%s" by controller "%s"', $route->getUrl(), $name);
+
                 return $route;
             }
 
             /* Using @ is most definitely a controller@method or alias@method */
-            if (strpos($name, '@') !== false) {
-                list($controller, $method) = array_map('strtolower', explode('@', $name));
+            if (\is_string($name) === true && strpos($name, '@') !== false) {
+                [$controller, $method] = array_map('strtolower', explode('@', $name));
 
                 if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
+                    $this->debug('Found route "%s" by controller "%s" and method "%s"', $route->getUrl(), $controller, $method);
+
                     return $route;
                 }
             }
 
             /* Check if callback matches (if it's not a function) */
-            if (strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && !is_callable($route->getCallback())) {
+            if (\is_string($name) === true && \is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && \is_callable($route->getCallback()) === false) {
 
                 /* Check if the entire callback is matching */
                 if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
+                    $this->debug('Found route "%s" by callback "%s"', $route->getUrl(), $name);
+
                     return $route;
                 }
 
                 /* Check if the class part of the callback matches (class@method) */
                 if (strtolower($name) === strtolower($route->getClass())) {
+                    $this->debug('Found route "%s" by class "%s"', $route->getUrl(), $name);
+
                     return $route;
                 }
             }
         }
 
+        $this->debug('Route not found');
+
         return null;
     }
 
@@ -413,13 +523,19 @@ class Router
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      * @return string
      */
-    public function getUrl($name = null, $parameters = null, $getParams = null)
+    public function getUrl(?string $name = null, $parameters = null, $getParams = null): string
     {
-        if ($getParams !== null && is_array($getParams) === false) {
-            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
+        $this->debug('Finding url', \func_get_args());
+
+        if ($getParams !== null && \is_array($getParams) === false) {
+            throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
+        }
+
+        if ($name === '' && $parameters === '') {
+            return '/';
         }
 
         /* Only merge $_GET when all parameters are null */
@@ -431,9 +547,7 @@ class Router
 
         /* Return current route if no options has been specified */
         if ($name === null && $parameters === null) {
-            $url = rtrim(parse_url($this->request->getUri(), PHP_URL_PATH), '/');
-
-            return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
+            return $this->request->getUrl()->getPath() . $this->arrayToParams($getParams);
         }
 
         $loadedRoute = $this->request->getLoadedRoute();
@@ -451,20 +565,16 @@ class Router
         }
 
         /* Using @ is most definitely a controller@method or alias@method */
-        if (strpos($name, '@') !== false) {
-            list($controller, $method) = explode('@', $name);
+        if (\is_string($name) === true && strpos($name, '@') !== false) {
+            [$controller, $method] = explode('@', $name);
 
             /* Loop through all the routes to see if we can find a match */
 
-            $max = count($this->processedRoutes) - 1;
-
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $route) {
 
                 /* Check if the route contains the name/alias */
-                if ($route->hasName($controller)) {
+                if ($route->hasName($controller) === true) {
                     return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
                 }
 
@@ -477,52 +587,75 @@ class Router
         }
 
         /* No result so we assume that someone is using a hardcoded url and join everything together. */
-        $url = trim(join('/', array_merge((array)$name, (array)$parameters)), '/');
+        $url = trim(implode('/', array_merge((array)$name, (array)$parameters)), '/');
 
         return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
     }
 
     /**
-     * Get bootmanagers
+     * Get BootManagers
      * @return array
      */
-    public function getBootManagers()
+    public function getBootManagers(): array
     {
         return $this->bootManagers;
     }
 
     /**
-     * Set bootmanagers
+     * Set BootManagers
      * @param array $bootManagers
      */
-    public function setBootManagers(array $bootManagers)
+    public function setBootManagers(array $bootManagers): void
     {
         $this->bootManagers = $bootManagers;
     }
 
     /**
-     * Add bootmanager
+     * Add BootManager
      * @param IRouterBootManager $bootManager
      */
-    public function addBootManager(IRouterBootManager $bootManager)
+    public function addBootManager(IRouterBootManager $bootManager): void
     {
         $this->bootManagers[] = $bootManager;
     }
 
     /**
+     * Get routes that has been processed.
+     *
      * @return array
      */
-    public function getRoutes()
+    public function getProcessedRoutes(): array
+    {
+        return $this->processedRoutes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRoutes(): array
     {
         return $this->routes;
     }
 
+    /**
+     * Set routes
+     *
+     * @param array $routes
+     * @return static
+     */
+    public function setRoutes(array $routes): self
+    {
+        $this->routes = $routes;
+
+        return $this;
+    }
+
     /**
      * Get current request
      *
      * @return Request
      */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
@@ -531,7 +664,7 @@ class Router
      * Get csrf verifier class
      * @return BaseCsrfVerifier
      */
-    public function getCsrfVerifier()
+    public function getCsrfVerifier(): ?BaseCsrfVerifier
     {
         return $this->csrfVerifier;
     }
@@ -549,4 +682,47 @@ class Router
         return $this;
     }
 
+    /**
+     * Add new debug message
+     * @param string $message
+     * @param array $args
+     */
+    public function debug(string $message, ...$args): void
+    {
+        if ($this->debugEnabled === false) {
+            return;
+        }
+
+        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+        $this->debugList[] = [
+            'message' => vsprintf($message, $args),
+            'time'    => number_format(microtime(true) - $this->debugStartTime, 10),
+            'trace'   => end($trace),
+        ];
+    }
+
+    /**
+     * Enable or disables debugging
+     *
+     * @param bool $boolean
+     */
+    public function setDebugEnabled(bool $boolean): void
+    {
+        if ($boolean === true) {
+            $this->debugStartTime = microtime(true);
+        }
+
+        $this->debugEnabled = $boolean;
+    }
+
+    /**
+     * Get the list containing all debug messages.
+     *
+     * @return array
+     */
+    public function getDebugLog(): array
+    {
+        return $this->debugList;
+    }
+
 }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -7,15 +7,21 @@
  * This class is added so calls can be made statically like Router::get() making the code look pretty.
  * It also adds some extra functionality like default-namespace.
  */
+
 namespace Pecee\SimpleRouter;
 
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Handlers\CallbackExceptionHandler;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
 use Pecee\Http\Response;
 use Pecee\SimpleRouter\Exceptions\HttpException;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Route\IGroupRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
 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;
 
@@ -23,7 +29,7 @@ class SimpleRouter
 {
     /**
      * Default namespace added to all routes
-     * @var string
+     * @var string|null
      */
     protected static $defaultNamespace;
 
@@ -40,14 +46,68 @@ class SimpleRouter
     protected static $router;
 
     /**
-     * Start/route request
+     * Start routing
      *
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      * @throws HttpException
-     * @throws NotFoundHttpException
+     * @throws \Exception
      */
-    public static function start()
+    public static function start(): void
     {
-        static::router()->routeRequest();
+        echo static::router()->routeRequest();
+    }
+
+    /**
+     * Start the routing an return array with debugging-information
+     *
+     * @return array
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
+    public static function startDebug(): array
+    {
+        $routerOutput = null;
+
+        try {
+            ob_start();
+            static::router()->setDebugEnabled(true);
+            static::start();
+            $routerOutput = ob_get_contents();
+            ob_end_clean();
+        } catch (\Exception $e) {
+
+        }
+
+        // Try to parse library version
+        $composerFile = \dirname(__DIR__, 3) . '/composer.lock';
+        $version = false;
+
+        if (is_file($composerFile) === true) {
+            $composerInfo = json_decode(file_get_contents($composerFile), true);
+
+            if (isset($composerInfo['packages']) === true && \is_array($composerInfo['packages']) === true) {
+                foreach ($composerInfo['packages'] as $package) {
+                    if (isset($package['name']) === true && strtolower($package['name']) === 'pecee/simple-router') {
+                        $version = $package['version'];
+                        break;
+                    }
+                }
+            }
+        }
+
+        return [
+            'url'             => static::request()->getUrl(),
+            'method'          => static::request()->getMethod(),
+            'host'            => static::request()->getHost(),
+            'loaded_routes'   => static::request()->getLoadedRoutes(),
+            'all_routes'      => static::router()->getRoutes(),
+            'boot_managers'   => static::router()->getBootManagers(),
+            'csrf_verifier'   => static::router()->getCsrfVerifier(),
+            'log'             => static::router()->getDebugLog(),
+            'router_output'   => $routerOutput,
+            'library_version' => $version,
+            'php_version'     => PHP_VERSION,
+            'server_params'   => static::request()->getHeaders(),
+        ];
     }
 
     /**
@@ -55,7 +115,7 @@ class SimpleRouter
      *
      * @param string $defaultNamespace
      */
-    public static function setDefaultNamespace($defaultNamespace)
+    public static function setDefaultNamespace(string $defaultNamespace): void
     {
         static::$defaultNamespace = $defaultNamespace;
     }
@@ -64,8 +124,9 @@ class SimpleRouter
      * Base CSRF verifier
      *
      * @param BaseCsrfVerifier $baseCsrfVerifier
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
     {
         static::router()->setCsrfVerifier($baseCsrfVerifier);
     }
@@ -75,8 +136,9 @@ class SimpleRouter
      * Perfect if you want to load pretty-urls from a file or database.
      *
      * @param IRouterBootManager $bootManager
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function addBootManager(IRouterBootManager $bootManager)
+    public static function addBootManager(IRouterBootManager $bootManager): void
     {
         static::router()->addBootManager($bootManager);
     }
@@ -87,9 +149,11 @@ class SimpleRouter
      * @param string $url
      * @param string|\Closure $callback
      * @param array|null $settings
+     *
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function get($url, $callback, array $settings = null)
+    public static function get(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get'], $url, $callback, $settings);
     }
@@ -101,8 +165,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function post($url, $callback, array $settings = null)
+    public static function post(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['post'], $url, $callback, $settings);
     }
@@ -114,8 +179,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function put($url, $callback, array $settings = null)
+    public static function put(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['put'], $url, $callback, $settings);
     }
@@ -127,8 +193,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function patch($url, $callback, array $settings = null)
+    public static function patch(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['patch'], $url, $callback, $settings);
     }
@@ -140,8 +207,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function options($url, $callback, array $settings = null)
+    public static function options(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['options'], $url, $callback, $settings);
     }
@@ -153,8 +221,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function delete($url, $callback, array $settings = null)
+    public static function delete(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['delete'], $url, $callback, $settings);
     }
@@ -164,19 +233,48 @@ class SimpleRouter
      *
      * @param array $settings
      * @param \Closure $callback
-     * @throws \InvalidArgumentException
      * @return RouteGroup
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws InvalidArgumentException
      */
-    public static function group(array $settings = [], \Closure $callback)
+    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');
+        }
+
         $group = new RouteGroup();
         $group->setCallback($callback);
         $group->setSettings($settings);
 
-        if (is_callable($callback) === false) {
-            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        static::router()->addRoute($group);
+
+        return $group;
+    }
+
+    /**
+     * Special group that has the same benefits as group but supports
+     * parameters and which are only rendered when the url matches.
+     *
+     * @param string $url
+     * @param \Closure $callback
+     * @param array $settings
+     * @return RoutePartialGroup
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws InvalidArgumentException
+     */
+    public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
+    {
+        if (\is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
         }
 
+        $settings['prefix'] = $url;
+
+        $group = new RoutePartialGroup();
+        $group->setSettings($settings);
+        $group->setCallback($callback);
+
         static::router()->addRoute($group);
 
         return $group;
@@ -190,8 +288,9 @@ class SimpleRouter
      * @param array|null $settings
      * @see SimpleRouter::form
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function basic($url, $callback, array $settings = null)
+    public static function basic(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get', 'post'], $url, $callback, $settings);
     }
@@ -205,8 +304,9 @@ class SimpleRouter
      * @param array|null $settings
      * @see SimpleRouter::form
      * @return RouteUrl
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function form($url, $callback, array $settings = null)
+    public static function form(string $url, $callback, array $settings = null): IRoute
     {
         return static::match(['get', 'post'], $url, $callback, $settings);
     }
@@ -219,8 +319,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function match(array $requestMethods, $url, $callback, array $settings = null)
+    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
     {
         $route = new RouteUrl($url, $callback);
         $route->setRequestMethods($requestMethods);
@@ -242,8 +343,9 @@ class SimpleRouter
      * @param string|\Closure $callback
      * @param array|null $settings
      * @return RouteUrl|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function all($url, $callback, array $settings = null)
+    public static function all(string $url, $callback, array $settings = null)
     {
         $route = new RouteUrl($url, $callback);
         $route = static::addDefaultNamespace($route);
@@ -264,8 +366,9 @@ class SimpleRouter
      * @param string $controller
      * @param array|null $settings
      * @return RouteController|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function controller($url, $controller, array $settings = null)
+    public static function controller(string $url, $controller, array $settings = null)
     {
         $route = new RouteController($url, $controller);
         $route = static::addDefaultNamespace($route);
@@ -286,8 +389,9 @@ class SimpleRouter
      * @param string $controller
      * @param array|null $settings
      * @return RouteResource|IRoute
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function resource($url, $controller, array $settings = null)
+    public static function resource(string $url, $controller, array $settings = null)
     {
         $route = new RouteResource($url, $controller);
         $route = static::addDefaultNamespace($route);
@@ -301,6 +405,29 @@ class SimpleRouter
         return $route;
     }
 
+    /**
+     * Add exception callback handler.
+     *
+     * @param \Closure $callback
+     * @return CallbackExceptionHandler $callbackHandler
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
+    public static function error(\Closure $callback): CallbackExceptionHandler
+    {
+        $routes = static::router()->getRoutes();
+
+        $callbackHandler = new CallbackExceptionHandler($callback);
+
+        $group = new RouteGroup();
+        $group->addExceptionHandler($callbackHandler);
+
+        array_unshift($routes, $group);
+
+        static::router()->setRoutes($routes);
+
+        return $callbackHandler;
+    }
+
     /**
      * Get url for a route by using either name/alias, class or method name.
      *
@@ -316,10 +443,11 @@ class SimpleRouter
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \Exception
+     * @throws \Pecee\Exceptions\InvalidArgumentException
      * @return string
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function getUrl($name = null, $parameters = null, $getParams = null)
+    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): string
     {
         return static::router()->getUrl($name, $parameters, $getParams);
     }
@@ -328,8 +456,9 @@ class SimpleRouter
      * Get the request
      *
      * @return \Pecee\Http\Request
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function request()
+    public static function request(): Request
     {
         return static::router()->getRequest();
     }
@@ -338,8 +467,9 @@ class SimpleRouter
      * Get the response object
      *
      * @return Response
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function response()
+    public static function response(): Response
     {
         if (static::$response === null) {
             static::$response = new Response(static::request());
@@ -352,10 +482,11 @@ class SimpleRouter
      * Returns the router instance
      *
      * @return Router
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
      */
-    public static function router()
+    public static function router(): Router
     {
-        if(static::$router === null) {
+        if (static::$router === null) {
             static::$router = new Router();
         }
 
@@ -368,14 +499,14 @@ class SimpleRouter
      * @param IRoute $route
      * @return IRoute
      */
-    protected static function addDefaultNamespace(IRoute $route)
+    public static function addDefaultNamespace(IRoute $route): IRoute
     {
         if (static::$defaultNamespace !== null) {
 
             $callback = $route->getCallback();
 
             /* Only add default namespace on relative callbacks */
-            if ($callback === null || $callback[0] !== '\\') {
+            if ($callback === null || (\is_string($callback) === true && $callback[0] !== '\\')) {
 
                 $namespace = static::$defaultNamespace;
 
@@ -395,9 +526,9 @@ class SimpleRouter
 
     /**
      * Get default namespace
-     * @return string
+     * @return string|null
      */
-    public static function getDefaultNamespace()
+    public static function getDefaultNamespace(): ?string
     {
         return static::$defaultNamespace;
     }

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

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

@@ -2,7 +2,7 @@
 
 class ExceptionHandler implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error)  : void
 	{
 	    echo $error->getMessage();
 	}

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

@@ -2,13 +2,12 @@
 
 class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
 	    global $stack;
 	    $stack[] = static::class;
 
-		$request->setUri('/');
-		return $request;
+		$request->setUrl('/');
 	}
 
 }

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

@@ -2,13 +2,12 @@
 
 class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
         global $stack;
         $stack[] = static::class;
 
-        $request->setUri('/');
-        return $request;
+        $request->setUrl('/');
 	}
 
 }

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

@@ -2,7 +2,7 @@
 
 class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
         global $stack;
         $stack[] = static::class;

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/GroupTest.php

@@ -2,9 +2,8 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Helpers/TestRouter.php';
 
-class GroupTest extends PHPUnit_Framework_TestCase
+class GroupTest extends \PHPUnit\Framework\TestCase
 {
     protected $result;
 
@@ -37,6 +36,7 @@ class GroupTest extends PHPUnit_Framework_TestCase
 
         TestRouter::debug('/api/v1/test', 'get');
 
+        $this->assertTrue(true);
     }
 
     public function testMultipleRoutes()
@@ -61,6 +61,8 @@ class GroupTest extends PHPUnit_Framework_TestCase
         });
 
         TestRouter::debug('/my/match', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testUrls()

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

@@ -0,0 +1,28 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
+
+class RouterCallbackExceptionHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testCallbackExceptionHandler()
+    {
+        $this->expectException(ExceptionHandlerException::class);
+
+        // Match normal route on alias
+        TestRouter::get('/my-new-url', 'DummyController@method2');
+        TestRouter::get('/my-url', 'DummyController@method1');
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $exception) {
+            throw new ExceptionHandlerException();
+        });
+
+        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

@@ -0,0 +1,28 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterPartialGroupTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testParameters()
+    {
+        $result1 = null;
+        $result2 = null;
+
+        TestRouter::partialGroup('{param1}/{param2}', function ($param1 = null, $param2 = null) use (&$result1, &$result2) {
+            $result1 = $param1;
+            $result2 = $param2;
+
+            TestRouter::get('/', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/param1/param2', 'get');
+
+        $this->assertEquals('param1', $result1);
+        $this->assertEquals('param2', $result2);
+    }
+
+}

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,10 +2,9 @@
 
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
 
-class RouterRouteTest extends PHPUnit_Framework_TestCase
+class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
     protected $result = false;
 
@@ -27,7 +26,7 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
 
     public function testNotFound()
     {
-        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        $this->expectException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
         TestRouter::get('/non-existing-path', 'DummyController@method1');
         TestRouter::debug('/test-param1-param2', 'post');
     }
@@ -36,24 +35,32 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
     {
         TestRouter::get('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'get');
+
+        $this->assertTrue(true);
     }
 
     public function testPost()
     {
         TestRouter::post('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'post');
+
+        $this->assertTrue(true);
     }
 
     public function testPut()
     {
         TestRouter::put('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'put');
+
+        $this->assertTrue(true);
     }
 
     public function testDelete()
     {
         TestRouter::delete('/my/test/url', 'DummyController@method1');
         TestRouter::debug('/my/test/url', 'delete');
+
+        $this->assertTrue(true);
     }
 
     public function testMethodNotAllowed()
@@ -123,6 +130,41 @@ 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()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }
+
+    public function testDefaultParameterRegexGroup()
+    {
+        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function() {
+            TestRouter::get('/my/{path}', 'DummyController@param');
+        });
+
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
     }
 
 }

tests/Pecee/SimpleRouter/RouterUrlTest.php

@@ -3,12 +3,79 @@
 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 testSimularUrls()
+    public function testIssue253()
+    {
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
+
+        TestRouter::debugNoReset('/page/22', 'get');
+        $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/', 'get');
+        $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUnicodeCharacters()
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::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::router()->reset();
+    }
+
+    public function testOptionalParameters()
+    {
+        TestRouter::get('/aviso/legal', 'DummyController@method1');
+        TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
+        TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
+        TestRouter::get('/{pagina?}', 'DummyController@method1');
+
+        TestRouter::debugNoReset('/aviso/optional', 'get');
+        $this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/pagina/optional', 'get');
+        $this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/optional', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::router()->reset();
+    }
+
+    public function testSimilarUrls()
     {
         // Match normal route on alias
         TestRouter::resource('/url11', 'DummyController@method1');

tests/TestRouter.php

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

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;