Merge pull request #393 from skipperbent/v4-development

Bugfixes

.codeclimate.yml

@@ -0,0 +1,22 @@
+engines:
+  phpmd:
+    enabled: true
+    checks:
+      Design/TooManyPublicMethods:
+        enabled: true
+      Naming/ShortVariable:
+        enabled: true
+      CleanCode/StaticAccess:
+        enabled: true
+      Controversial/CamelCaseMethodName:
+        enabled: true
+  fixme:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - php:
+ratings:
+  paths:
+  - src/**

.gitignore

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

.scrutinizer.yml

@@ -0,0 +1,13 @@
+build:
+    tests:
+        override:
+            -
+                command: './vendor/bin/phpunit --coverage-clover=coverage.clover'
+                coverage:
+                    file: 'coverage.clover'
+                    format: 'clover'
+checks:
+    php:
+        code_rating: true
+        duplication: true
+

.travis.yml

@@ -0,0 +1,13 @@
+sudo: false
+
+language: php
+
+php:
+  - 7.1
+
+before_script:
+  - curl -sS http://getcomposer.org/installer | php
+  - php composer.phar install --prefer-source --no-interaction
+
+script:
+  - ./vendor/bin/phpunit

composer.json

@@ -1,26 +1,42 @@
 {
- 	"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", "routing", "laravel", "pecee" ],
-	"license": "MIT",
-	"support": {
-			"source": "https://github.com/skipperbent/simple-php-router/issues"
-    },
-	"authors": [
-    	{
-        	 "name": "Simon Sessingø",
-           	 "email": "simon.sessingoe@gmail.com"
-        }
-	],
-	"require": {
-
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.7.7"
-    },
-    "autoload": {
-        "psr-4": {
-            "Pecee\\": "src/Pecee/"
-        }
+  "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",
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
+  ],
+  "license": "MIT",
+  "support": {
+    "source": "https://github.com/skipperbent/simple-php-router/issues"
+  },
+  "authors": [
+    {
+      "name": "Simon Sessingø",
+      "email": "simon.sessingoe@gmail.com"
     }
-}
+  ],
+  "require": {
+    "php": ">=7.1",
+    "php-di/php-di": "^6.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
+  },
+  "autoload": {
+    "psr-4": {
+      "Pecee\\": "src/Pecee/"
+    }
+  }
+}

helpers.php

@@ -0,0 +1,88 @@
+<?php
+
+use Pecee\SimpleRouter\SimpleRouter as Router;
+use Pecee\Http\Url;
+use Pecee\Http\Response;
+use Pecee\Http\Request;
+
+/**
+ * Get url for a route by using either name/alias, class or method name.
+ *
+ * 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 \Pecee\Http\Url
+ * @throws \InvalidArgumentException
+ */
+function url(?string $name = null, $parameters = null, ?array $getParams = null): Url
+{
+    return Router::getUrl($name, $parameters, $getParams);
+}
+
+/**
+ * @return \Pecee\Http\Response
+ */
+function response(): Response
+{
+    return Router::response();
+}
+
+/**
+ * @return \Pecee\Http\Request
+ */
+function request(): Request
+{
+    return Router::request();
+}
+
+/**
+ * Get input class
+ * @param string|null $index Parameter index name
+ * @param string|null $defaultValue Default return value
+ * @param array ...$methods Default methods
+ * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
+ */
+function input($index = null, $defaultValue = null, ...$methods)
+{
+    if ($index !== null) {
+        return request()->getInputHandler()->getValue($index, $defaultValue, ...$methods);
+    }
+
+    return request()->getInputHandler();
+}
+
+/**
+ * @param string $url
+ * @param int|null $code
+ */
+function redirect(string $url, ?int $code = null): void
+{
+    if ($code !== null) {
+        response()->httpCode($code);
+    }
+
+    response()->redirect($url);
+}
+
+/**
+ * Get current csrf-token
+ * @return string|null
+ */
+function csrf_token(): ?string
+{
+    $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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Pecee\Controllers;
+
+interface IResourceController
+{
+
+    /**
+     * @return string|null
+     */
+    public function index(): ?string;
+
+    /**
+     * @param mixed $id
+     * @return string|null
+     */
+    public function show($id): ?string;
+
+    /**
+     * @return string|null
+     */
+    public function store(): ?string;
+
+    /**
+     * @return string|null
+     */
+    public function create(): ?string;
+
+    /**
+     * View
+     * @param mixed $id
+     * @return string|null
+     */
+    public function edit($id): ?string;
+
+    /**
+     * @param mixed $id
+     * @return string|null
+     */
+    public function update($id): ?string;
+
+    /**
+     * @param mixed $id
+     * @return string|null
+     */
+    public function destroy($id): ?string;
+
+}

src/Pecee/CsrfToken.php

@@ -1,60 +0,0 @@
-<?php
-namespace Pecee;
-
-class CsrfToken {
-
-    const CSRF_KEY = 'XSRF-TOKEN';
-
-    protected $token;
-
-    public function __construct() {
-        if($this->getToken() === null) {
-            $this->setToken($this->generateToken());
-        }
-    }
-
-    /**
-     * Generate random identifier for CSRF token
-     * @return string
-     */
-    public static function generateToken() {
-        if (function_exists('mcrypt_create_iv')) {
-            return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
-        }
-        return bin2hex(openssl_random_pseudo_bytes(32));
-    }
-
-    /**
-     * 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(self::CSRF_KEY, $token, time() + 60 * 120, '/');
-    }
-
-    /**
-     * Get csrf token
-     * @return string|null
-     */
-    public function getToken(){
-        if(isset($_COOKIE[self::CSRF_KEY])) {
-            return $_COOKIE[self::CSRF_KEY];
-        }
-        return null;
-    }
-
-}

src/Pecee/Exception/TokenMismatchException.php

@@ -1,4 +0,0 @@
-<?php
-namespace Pecee\Exception;
-
-class TokenMismatchException extends \Exception {}

src/Pecee/Exceptions/InvalidArgumentException.php

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

src/Pecee/Http/Exceptions/MalformedUrlException.php

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

src/Pecee/Http/Input/IInputItem.php

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

src/Pecee/Http/Input/InputFile.php

@@ -0,0 +1,292 @@
+<?php
+
+namespace Pecee\Http\Input;
+
+use Pecee\Exceptions\InvalidArgumentException;
+
+class InputFile implements IInputItem
+{
+    public $index;
+    public $name;
+    public $filename;
+    public $size;
+    public $type;
+    public $errors;
+    public $tmpName;
+
+    public function __construct(string $index)
+    {
+        $this->index = $index;
+
+        $this->errors = 0;
+
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
+    }
+
+    /**
+     * Create from array
+     *
+     * @param array $values
+     * @throws InvalidArgumentException
+     * @return static
+     */
+    public static function createFromArray(array $values): self
+    {
+        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 += [
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ];
+
+        return (new static($values['index']))
+            ->setSize((int)$values['size'])
+            ->setError($values['error'])
+            ->setType($values['type'])
+            ->setTmpName($values['tmp_name'])
+            ->setFilename($values['name']);
+
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex(): string
+    {
+        return $this->index;
+    }
+
+    /**
+     * Set input index
+     * @param string $index
+     * @return static
+     */
+    public function setIndex(string $index): IInputItem
+    {
+        $this->index = $index;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSize(): string
+    {
+        return $this->size;
+    }
+
+    /**
+     * Set file size
+     * @param int $size
+     * @return static
+     */
+    public function setSize(int $size): IInputItem
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Get mime-type of file
+     * @return string
+     */
+    public function getMime(): string
+    {
+        return $this->getType();
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set type
+     * @param string $type
+     * @return static
+     */
+    public function setType(string $type): IInputItem
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Returns extension without "."
+     *
+     * @return string
+     */
+    public function getExtension(): string
+    {
+        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
+    }
+
+    /**
+     * Get human friendly name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set human friendly name.
+     * Useful for adding validation etc.
+     *
+     * @param string $name
+     * @return static
+     */
+    public function setName(string $name): IInputItem
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Set filename
+     *
+     * @param string $name
+     * @return static
+     */
+    public function setFilename($name): IInputItem
+    {
+        $this->filename = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get filename
+     *
+     * @return string mixed
+     */
+    public function getFilename(): string
+    {
+        return $this->filename;
+    }
+
+    /**
+     * Move the uploaded temporary file to it's new home
+     *
+     * @param string $destination
+     * @return bool
+     */
+    public function move($destination): bool
+    {
+        return move_uploaded_file($this->tmpName, $destination);
+    }
+
+    /**
+     * Get file contents
+     *
+     * @return string
+     */
+    public function getContents(): string
+    {
+        return file_get_contents($this->tmpName);
+    }
+
+    /**
+     * Return true if an upload error occurred.
+     *
+     * @return bool
+     */
+    public function hasError(): bool
+    {
+        return ($this->getError() !== 0);
+    }
+
+    /**
+     * Get upload-error code.
+     *
+     * @return string
+     */
+    public function getError(): string
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Set error
+     *
+     * @param int $error
+     * @return static
+     */
+    public function setError($error): IInputItem
+    {
+        $this->errors = (int)$error;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTmpName(): string
+    {
+        return $this->tmpName;
+    }
+
+    /**
+     * Set file temp. name
+     * @param string $name
+     * @return static
+     */
+    public function setTmpName($name): IInputItem
+    {
+        $this->tmpName = $name;
+
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return $this->getTmpName();
+    }
+
+    public function getValue(): string
+    {
+        return $this->getFilename();
+    }
+
+    /**
+     * @param string $value
+     * @return static
+     */
+    public function setValue(string $value): IInputItem
+    {
+        $this->filename = $value;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'tmp_name' => $this->tmpName,
+            'type'     => $this->type,
+            'size'     => $this->size,
+            'name'     => $this->name,
+            'error'    => $this->errors,
+            'filename' => $this->filename,
+        ];
+    }
+
+}

src/Pecee/Http/Input/InputHandler.php

@@ -0,0 +1,290 @@
+<?php
+
+namespace Pecee\Http\Input;
+
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Request;
+
+class InputHandler
+{
+    /**
+     * @var array
+     */
+    public $get = [];
+
+    /**
+     * @var array
+     */
+    public $post = [];
+
+    /**
+     * @var array
+     */
+    public $file = [];
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Input constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+
+        $this->parseInputs();
+    }
+
+    /**
+     * Parse input values
+     *
+     */
+    public function parseInputs(): void
+    {
+        /* Parse get requests */
+        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) {
+            parse_str(file_get_contents('php://input'), $postVars);
+        }
+
+        if (\count($postVars) !== 0) {
+            $this->post = $this->handleGetPost($postVars);
+        }
+
+        /* Parse get requests */
+        if (\count($_FILES) !== 0) {
+            $this->file = $this->parseFiles();
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function parseFiles(): array
+    {
+        $list = [];
+
+        foreach ((array)$_FILES as $key => $value) {
+
+            // Handle array input
+            if (\is_array($value['name']) === false) {
+                $values['index'] = $key;
+                try {
+                    $list[$key] = InputFile::createFromArray($values + $value);
+                } catch (InvalidArgumentException $e) {
+
+                }
+                continue;
+            }
+
+            $keys = [$key];
+            $files = $this->rearrangeFiles($value['name'], $keys, $value);
+
+            if (isset($list[$key]) === true) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
+
+        }
+
+        return $list;
+    }
+
+    protected function rearrangeFiles(array $values, &$index, $original): array
+    {
+
+        $originalIndex = $index[0];
+        array_shift($index);
+
+        $output = [];
+
+        foreach ($values as $key => $value) {
+
+            if (\is_array($original['name'][$key]) === false) {
+
+                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;
+                    }
+
+                    $output[$key] = $file;
+                    continue;
+
+                } catch (InvalidArgumentException $e) {
+
+                }
+            }
+
+            $index[] = $key;
+
+            $files = $this->rearrangeFiles($value, $index, $original);
+
+            if (isset($output[$key]) === true) {
+                $output[$key][] = $files;
+            } else {
+                $output[$key] = $files;
+            }
+
+        }
+
+        return $output;
+    }
+
+    protected function handleGetPost(array $array): array
+    {
+        $list = [];
+
+        foreach ($array as $key => $value) {
+
+            // Handle array input
+            if (\is_array($value) === false) {
+                $list[$key] = new InputItem($key, $value);
+                continue;
+            }
+
+            $output = $this->handleGetPost($value);
+
+            $list[$key] = $output;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Find post-value by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findPost(string $index, ?string $defaultValue = null)
+    {
+        return $this->post[$index] ?? $defaultValue;
+    }
+
+    /**
+     * Find file by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputFile|string
+     */
+    public function findFile(string $index, ?string $defaultValue = null)
+    {
+        return $this->file[$index] ?? $defaultValue;
+    }
+
+    /**
+     * Find parameter/query-string by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|string
+     */
+    public function findGet(string $index, ?string $defaultValue = null)
+    {
+        return $this->get[$index] ?? $defaultValue;
+    }
+
+    /**
+     * Get input object
+     *
+     * @param string $index
+     * @param array ...$methods
+     * @return IInputItem|null
+     */
+    public function get(string $index, ...$methods): ?IInputItem
+    {
+        $element = null;
+
+        if (\count($methods) === 0 || \in_array('get', $methods, true) === true) {
+            $element = $this->findGet($index);
+        }
+
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('post', $methods, true) === true)) {
+            $element = $this->findPost($index);
+        }
+
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('file', $methods, true) === true)) {
+            $element = $this->findFile($index);
+        }
+
+        return $element;
+    }
+
+    /**
+     * Get input element value matching index
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array ...$methods
+     * @return string
+     */
+    public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
+    {
+        $input = $this->get($index, ...$methods);
+        return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
+    }
+
+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @param array ...$method
+     * @return bool
+     */
+    public function exists(string $index, ...$method): bool
+    {
+        return $this->get($index, $method) !== null;
+    }
+
+    /**
+     * Get all get/post items
+     * @param array|null $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = null): array
+    {
+        $output = $_GET;
+
+        if ($this->request->getMethod() === 'post') {
+
+            // Append POST data
+            $output += $_POST;
+
+            $contents = file_get_contents('php://input');
+
+            // Append any PHP-input json
+            if (strpos(trim($contents), '{') === 0) {
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output += $post;
+                }
+            }
+        }
+
+        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
+    }
+
+}

src/Pecee/Http/Input/InputItem.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Pecee\Http\Input;
+
+class InputItem implements IInputItem
+{
+    public $index;
+    public $name;
+    public $value;
+
+    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('_', ' ', strtolower($this->index)));
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex(): string
+    {
+        return $this->index;
+    }
+
+    public function setIndex(string $index): IInputItem
+    {
+        $this->index = $index;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set input name
+     * @param string $name
+     * @return static
+     */
+    public function setName(string $name): IInputItem
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set input value
+     * @param string $value
+     * @return static
+     */
+    public function setValue(string $value): IInputItem
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
+
+}

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -1,21 +1,27 @@
 <?php
+
 namespace Pecee\Http\Middleware;
 
-use Pecee\CsrfToken;
-use Pecee\Exception\TokenMismatchException;
+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';
+class BaseCsrfVerifier implements IMiddleware
+{
+    public const POST_KEY = 'csrf-token';
+    public const HEADER_KEY = 'X-CSRF-TOKEN';
 
     protected $except;
-    protected $csrfToken;
+    protected $tokenProvider;
 
-
-    public function __construct() {
-        $this->csrfToken = new CsrfToken();
+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
+    public function __construct()
+    {
+        $this->tokenProvider = new CookieTokenProvider();
     }
 
     /**
@@ -23,22 +29,26 @@ class BaseCsrfVerifier implements IMiddleware {
      * @param Request $request
      * @return bool
      */
-    protected function skip(Request $request) {
-
-        if($this->except === null || !is_array($this->except)) {
+    protected function skip(Request $request): bool
+    {
+        if ($this->except === null || \count($this->except) === 0) {
             return false;
         }
 
-        foreach($this->except as $url) {
+        $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) {
+            if ($skip === true) {
                 return true;
             }
         }
@@ -46,23 +56,46 @@ 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($request->getMethod() != 'get' && !$this->skip($request)) {
+        if ($this->skip($request) === false && \in_array($request->getMethod(), ['post', 'put', 'delete'], true) === true) {
 
-            $token = (isset($_POST[self::POST_KEY])) ? $_POST[self::POST_KEY] : null;
+            $token = $request->getInputHandler()->getValue(
+                static::POST_KEY,
+                $request->getHeader(static::HEADER_KEY),
+                'post'
+            );
 
-            // If the token is not posted, check headers for valid x-csrf-token
-            if($token === null) {
-                $token = $request->getHeader(self::HEADER_KEY);
-            }
-
-            if( !$this->csrfToken->validate( $token ) ) {
-                throw new TokenMismatchException('Invalid csrf-token.');
+            if ($this->tokenProvider->validate((string)$token) === false) {
+                throw new TokenMismatchException('Invalid CSRF-token.');
             }
 
         }
 
+        // Refresh existing token
+        $this->tokenProvider->refresh();
+
+    }
+
+    public function getTokenProvider(): ITokenProvider
+    {
+        return $this->tokenProvider;
+    }
+
+    /**
+     * Set token provider
+     * @param ITokenProvider $provider
+     */
+    public function setTokenProvider(ITokenProvider $provider): void
+    {
+        $this->tokenProvider = $provider;
     }
 
 }

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

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

src/Pecee/Http/Middleware/IMiddleware.php

@@ -1,8 +1,14 @@
 <?php
+
 namespace Pecee\Http\Middleware;
 
 use Pecee\Http\Request;
 
-interface IMiddleware {
-    public function handle(Request $request);
+interface IMiddleware
+{
+    /**
+     * @param Request $request
+     */
+    public function handle(Request $request): void;
+
 }

src/Pecee/Http/Request.php

@@ -1,57 +1,130 @@
 <?php
+
 namespace Pecee\Http;
 
-class Request {
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Input\InputHandler;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;
 
-    protected static $instance;
+class Request
+{
+    /**
+     * Additional data
+     *
+     * @var array
+     */
+    private $data = [];
 
-    protected $data;
-    protected $uri;
+    /**
+     * Server headers
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Request host
+     * @var string
+     */
     protected $host;
+
+    /**
+     * Current request url
+     * @var Url
+     */
+    protected $url;
+
+    /**
+     * Request method
+     * @var string
+     */
     protected $method;
-    protected $headers;
 
     /**
-     * Return new instance
-     * @return static
+     * Input handler
+     * @var InputHandler
      */
-    public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
+    protected $inputHandler;
+
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;
+
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;
+
+    /**
+     * Rewrite url
+     * @var string|null
+     */
+    protected $rewriteUrl;
+
+    /**
+     * @var array
+     */
+    protected $loadedRoutes = [];
+
+    /**
+     * Request constructor.
+     * @throws MalformedUrlException
+     */
+    public function __construct()
+    {
+        foreach ($_SERVER as $key => $value) {
+            $this->headers[strtolower($key)] = $value;
+            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
         }
-        return self::$instance;
+
+        $this->setHost($this->getHeader('http-host'));
+
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
+
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->getValue('_method', $this->getHeader('request-method')));
     }
 
-    public function __construct() {
-        $this->data = array();
-        $this->host = $_SERVER['HTTP_HOST'];
-        $this->uri = $_SERVER['REQUEST_URI'];
-        $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
-        $this->headers = array_change_key_case(getallheaders(), CASE_LOWER);
-    }
-
-    public function getIsSecure() {
-        return isset($_SERVER['HTTPS']) ? true : (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] === 443);
+    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() {
-        return $this->uri;
+    public function getUrl(): Url
+    {
+        return $this->url;
     }
 
     /**
-     * @return string
+     * Copy url object
+     *
+     * @return Url
      */
-    public function getHost() {
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getHost(): ?string
+    {
         return $this->host;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getMethod() {
+    public function getMethod(): ?string
+    {
         return $this->method;
     }
 
@@ -59,75 +132,297 @@ class Request {
      * Get http basic auth user
      * @return string|null
      */
-    public function getUser() {
-        return (isset($_SERVER['PHP_AUTH_USER'])) ? $_SERVER['PHP_AUTH_USER']: null;
+    public function getUser(): ?string
+    {
+        return $this->getHeader('php-auth-user');
     }
 
     /**
      * Get http basic auth password
      * @return string|null
      */
-    public function getPassword() {
-        return (isset($_SERVER['PHP_AUTH_PW'])) ? $_SERVER['PHP_AUTH_PW']: null;
+    public function getPassword(): ?string
+    {
+        return $this->getHeader('php-auth-pw');
     }
 
     /**
-     * Get headers
+     * 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() {
-        return isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
+    public function getIp(): ?string
+    {
+        if ($this->getHeader('http-cf-connecting-ip') !== null) {
+            return $this->getHeader('http-cf-connecting-ip');
+        }
+
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
+            return $this->getHeader('http-x-forwarded_for');
+        }
+
+        return $this->getHeader('remote-addr');
+    }
+
+    /**
+     * Get remote address/ip
+     *
+     * @alias static::getIp
+     * @return string|null
+     */
+    public function getRemoteAddr(): ?string
+    {
+        return $this->getIp();
     }
 
     /**
      * Get referer
-     * @return string
+     * @return string|null
      */
-    public function getReferer() {
-        return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+    public function getReferer(): ?string
+    {
+        return $this->getHeader('http-referer');
     }
 
     /**
      * Get user agent
-     * @return string
+     * @return string|null
      */
-    public function getUserAgent() {
-        return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
+    public function getUserAgent(): ?string
+    {
+        return $this->getHeader('http-user-agent');
     }
 
     /**
      * Get header value by name
+     *
      * @param string $name
+     * @param string|null $defaultValue
+     *
      * @return string|null
      */
-    public function getHeader($name) {
-        return (isset($this->headers[strtolower($name)])) ? $this->headers[strtolower($name)] : null;
+    public function getHeader($name, $defaultValue = null): ?string
+    {
+        return $this->headers[strtolower($name)] ?? $defaultValue;
     }
 
     /**
-     * Get request input or default value
-     * @param string $name
-     * @param string $defaultValue
-     * @return mixed
+     * Get input class
+     * @return InputHandler
      */
-    public function getInput($name, $defaultValue) {
-        return (isset($_REQUEST[$name]) ? $_REQUEST[$name] : $defaultValue);
+    public function getInputHandler(): InputHandler
+    {
+        return $this->inputHandler;
     }
 
-    public function __set($name, $value = null) {
+    /**
+     * Is format accepted
+     *
+     * @param string $format
+     *
+     * @return bool
+     */
+    public function isFormatAccepted($format): bool
+    {
+        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(): array
+    {
+        return explode(',', $this->getHeader('http-accept'));
+    }
+
+    /**
+     * @param Url $url
+     */
+    public function setUrl(Url $url): void
+    {
+        $this->url = $url;
+
+        if ($this->url->getHost() === null) {
+            $this->url->setHost((string)$this->getHost());
+        }
+    }
+
+    /**
+     * @param string|null $host
+     */
+    public function setHost(?string $host): void
+    {
+        $this->host = $host;
+    }
+
+    /**
+     * @param string $method
+     */
+    public function setMethod(string $method): void
+    {
+        $this->method = $method;
+    }
+
+    /**
+     * Set rewrite route
+     *
+     * @param ILoadableRoute $route
+     * @return static
+     */
+    public function setRewriteRoute(ILoadableRoute $route): self
+    {
+        $this->hasPendingRewrite = true;
+        $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
+
+        return $this;
+    }
+
+    /**
+     * Get rewrite route
+     *
+     * @return ILoadableRoute|null
+     */
+    public function getRewriteRoute(): ?ILoadableRoute
+    {
+        return $this->rewriteRoute;
+    }
+
+    /**
+     * Get rewrite url
+     *
+     * @return string|null
+     */
+    public function getRewriteUrl(): ?string
+    {
+        return $this->rewriteUrl;
+    }
+
+    /**
+     * Set rewrite url
+     *
+     * @param string $rewriteUrl
+     * @return static
+     */
+    public function setRewriteUrl(string $rewriteUrl): self
+    {
+        $this->hasPendingRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';
+
+        return $this;
+    }
+
+    /**
+     * Set rewrite callback
+     * @param string|\Closure $callback
+     * @return static
+     */
+    public function setRewriteCallback($callback): self
+    {
+        $this->hasPendingRewrite = true;
+
+        return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
+    }
+
+    /**
+     * Get loaded route
+     * @return ILoadableRoute|null
+     */
+    public function getLoadedRoute(): ?ILoadableRoute
+    {
+        return (\count($this->loadedRoutes) > 0) ? end($this->loadedRoutes) : null;
+    }
+
+    /**
+     * 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 addLoadedRoute(ILoadableRoute $route): self
+    {
+        $this->loadedRoutes[] = $route;
+
+        return $this;
+    }
+
+    /**
+     * Returns true if the request contains a rewrite
+     *
+     * @return bool
+     */
+    public function hasPendingRewrite(): bool
+    {
+        return $this->hasPendingRewrite;
+    }
+
+    /**
+     * Defines if the current request contains a rewrite.
+     *
+     * @param bool $boolean
+     * @return Request
+     */
+    public function setHasPendingRewrite(bool $boolean): self
+    {
+        $this->hasPendingRewrite = $boolean;
+
+        return $this;
+    }
+
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->data) === true;
+    }
+
+    public function __set($name, $value = null)
+    {
         $this->data[$name] = $value;
     }
 
-    public function __get($name) {
-        return isset($this->data[$name]) ? $this->data[$name] : null;
+    public function __get($name)
+    {
+        return $this->data[$name] ?? null;
     }
 
 }

src/Pecee/Http/Response.php

@@ -2,16 +2,27 @@
 
 namespace Pecee\Http;
 
-class Response {
+use Pecee\Exceptions\InvalidArgumentException;
+
+class Response
+{
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
 
     /**
      * Set the http status code
      *
      * @param int $code
-     * @return self $this
+     * @return static
      */
-    public function httpCode($code) {
+    public function httpCode(int $code): self
+    {
         http_response_code($code);
+
         return $this;
     }
 
@@ -19,79 +30,100 @@ class Response {
      * Redirect the response
      *
      * @param string $url
+     * @param int $httpCode
      */
-    public function redirect($url) {
-        $this->header('Location: ' . $url);
-        die();
+    public function redirect(string $url, ?int $httpCode = null): void
+    {
+        if ($httpCode !== null) {
+            $this->httpCode($httpCode);
+        }
+
+        $this->header('location: ' . $url);
+        exit(0);
     }
 
-    public function refresh() {
-        $this->redirect(Request::getInstance()->getUri());
+    public function refresh(): void
+    {
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
     }
 
     /**
      * Add http authorisation
      * @param string $name
-     * @return self $this
+     * @return static
      */
-    public function auth($name = '') {
+    public function auth(string $name = ''): self
+    {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
-            'HTTP/1.0 401 Unauthorized'
+            'HTTP/1.0 401 Unauthorized',
         ]);
+
         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),
         ]);
 
-        if(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $lastModified ||
-            isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $eTag) {
+        $httpModified = $this->request->getHeader('http-if-modified-since');
+        $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');
 
-            $this->headers([
-                'HTTP/1.1 304 Not Modified'
-            ]);
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModifiedTime)) {
 
-            exit();
+            $this->header('HTTP/1.1 304 Not Modified');
+            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) {
-        $this->header('Content-type: application/json');
-        echo json_encode($value);
-        die();
+    public function json($value, ?int $options = null, int $dept = 512): void
+    {
+        if (($value instanceof \JsonSerializable) === false && \is_array($value) === false) {
+            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
+        }
+
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
+        exit(0);
     }
 
     /**
      * Add header to response
      * @param string $value
-     * @return self $this
+     * @return static
      */
-    public function header($value) {
+    public function header(string $value): self
+    {
         header($value);
+
         return $this;
     }
 
     /**
      * Add multiple headers to response
      * @param array $headers
-     * @return self $this
+     * @return static
      */
-    public function headers(array $headers) {
-        foreach($headers as $header) {
-            header($header);
+    public function headers(array $headers): self
+    {
+        foreach ($headers as $header) {
+            $this->header($header);
         }
+
         return $this;
     }
 

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, (int)((time() + 60) * $this->cookieTimeoutMinutes), '/', ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
+    }
+
+    /**
+     * 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,449 @@
+<?php
+
+namespace Pecee\Http;
+
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url
+{
+    private $originalUrl;
+
+    private $scheme;
+    private $host;
+    private $port;
+    private $username;
+    private $password;
+    private $path;
+    private $params;
+    private $fragment;
+
+    /**
+     * Url constructor.
+     *
+     * @param string $url
+     * @throws MalformedUrlException
+     */
+    public function __construct(?string $url)
+    {
+        $this->originalUrl = $url;
+
+        if ($url !== null && $url !== '/') {
+            $data = $this->parseUrl($url);
+
+            $this->scheme = $data['scheme'] ?? null;
+            $this->host = $data['host'] ?? null;
+            $this->port = $data['port'] ?? null;
+            $this->username = $data['user'] ?? null;
+            $this->password = $data['pass'] ?? null;
+
+            if (isset($data['path']) === true) {
+                $this->setPath($data['path']);
+            }
+
+            $this->fragment = $data['fragment'] ?? null;
+
+            if (isset($data['query']) === true) {
+                $params = [];
+                parse_str($data['query'], $params);
+                $this->setParams($params);
+            }
+        }
+    }
+
+    /**
+     * Check if url is using a secure protocol like https
+     *
+     * @return bool
+     */
+    public function isSecure(): bool
+    {
+        return (strtolower($this->getScheme()) === 'https');
+    }
+
+    /**
+     * Checks if url is relative
+     *
+     * @return bool
+     */
+    public function isRelative(): bool
+    {
+        return ($this->getHost() === null);
+    }
+
+    /**
+     * Get url scheme
+     *
+     * @return string|null
+     */
+    public function getScheme(): ?string
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Set the scheme of the url
+     *
+     * @param string $scheme
+     * @return static
+     */
+    public function setScheme(string $scheme): self
+    {
+        $this->scheme = $scheme;
+
+        return $this;
+    }
+
+    /**
+     * Get url host
+     *
+     * @return string|null
+     */
+    public function getHost(): ?string
+    {
+        return $this->host;
+    }
+
+    /**
+     * Set the host of the url
+     *
+     * @param string $host
+     * @return static
+     */
+    public function setHost(string $host): self
+    {
+        $this->host = $host;
+
+        return $this;
+    }
+
+    /**
+     * Get url port
+     *
+     * @return int|null
+     */
+    public function getPort(): ?int
+    {
+        return ($this->port !== null) ? (int)$this->port : null;
+    }
+
+    /**
+     * Set the port of the url
+     *
+     * @param int $port
+     * @return static
+     */
+    public function setPort(int $port): self
+    {
+        $this->port = $port;
+
+        return $this;
+    }
+
+    /**
+     * Parse username from url
+     *
+     * @return string|null
+     */
+    public function getUsername(): ?string
+    {
+        return $this->username;
+    }
+
+    /**
+     * Set the username of the url
+     *
+     * @param string $username
+     * @return static
+     */
+    public function setUsername(string $username): self
+    {
+        $this->username = $username;
+
+        return $this;
+    }
+
+    /**
+     * Parse password from url
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set the url password
+     *
+     * @param string $password
+     * @return static
+     */
+    public function setPassword(string $password): self
+    {
+        $this->password = $password;
+
+        return $this;
+    }
+
+    /**
+     * Get path from url
+     * @return string
+     */
+    public function getPath(): ?string
+    {
+        return $this->path ?? '/';
+    }
+
+    /**
+     * Set the url path
+     *
+     * @param string $path
+     * @return static
+     */
+    public function setPath(string $path): self
+    {
+        $this->path = rtrim($path, '/') . '/';
+
+        return $this;
+    }
+
+    /**
+     * Get query-string from url
+     *
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->params;
+    }
+
+    /**
+     * Merge parameters array
+     *
+     * @param array $params
+     * @return static
+     */
+    public function mergeParams(array $params): self
+    {
+        return $this->setParams(array_merge($this->getParams(), $params));
+    }
+
+    /**
+     * Set the url params
+     *
+     * @param array $params
+     * @return static
+     */
+    public function setParams(array $params): self
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * Get query-string params as string
+     *
+     * @return string
+     */
+    public function getQueryString(): string
+    {
+        return static::arrayToParams($this->getParams());
+    }
+
+    /**
+     * Get fragment from url (everything after #)
+     *
+     * @return string|null
+     */
+    public function getFragment(): ?string
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * Set url fragment
+     *
+     * @param string $fragment
+     * @return static
+     */
+    public function setFragment(string $fragment): self
+    {
+        $this->fragment = $fragment;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOriginalUrl(): string
+    {
+        return $this->originalUrl;
+    }
+
+    /**
+     * Get position of value.
+     * Returns -1 on failure.
+     *
+     * @param string $value
+     * @return int
+     */
+    public function indexOf(string $value): int
+    {
+        $index = stripos($this->getOriginalUrl(), $value);
+
+        return ($index === false) ? -1 : $index;
+    }
+
+    /**
+     * Check if url contains value.
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function contains(string $value): bool
+    {
+        return (stripos($this->getOriginalUrl(), $value) !== false);
+    }
+
+    /**
+     * Check if url contains parameter/query string.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasParam(string $name): bool
+    {
+        return \in_array($name, $this->getParams(), true);
+    }
+
+    /**
+     * Removes parameter from query-string
+     *
+     * @param string $name
+     */
+    public function removeParam(string $name): void
+    {
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                unset($params[$key]);
+                $this->setParams($params);
+            }
+        }
+    }
+
+    /**
+     * Get parameter by name.
+     * Returns parameter value or default value.
+     *
+     * @param string $name
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getParam(string $name, ?string $defaultValue = null): ?string
+    {
+        $output = null;
+
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                $output = $params[$key];
+            }
+        }
+
+        return $output ?? $defaultValue;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @return array
+     * @throws MalformedUrlException
+     */
+    public function parseUrl(string $url, int $component = -1): array
+    {
+        $encodedUrl = preg_replace_callback(
+            '/[^:\/@?&=#]+/u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new MalformedUrlException(sprintf('Failed to parse url: "%s"', $url));
+        }
+
+        return array_map('urldecode', $parts);
+    }
+
+    /**
+     * Convert array to query-string params
+     *
+     * @param array $getParams
+     * @param bool $includeEmpty
+     * @return string
+     */
+    public static function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
+    {
+        if (\count($getParams) !== 0) {
+
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    return (trim($item) !== '');
+                });
+            }
+
+            return http_build_query($getParams);
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the relative url
+     *
+     * @return string
+     */
+    public function getRelativeUrl(): string
+    {
+        $params = $this->getQueryString();
+
+        $path = $this->path ?? '';
+        $query = $params !== '' ? '?' . $params : '';
+        $fragment = $this->fragment !== null ? '#' . $this->fragment : '';
+
+        return $path . $query . $fragment;
+    }
+
+    /**
+     * Returns the absolute url
+     *
+     * @return string
+     */
+    public function getAbsoluteUrl(): string
+    {
+        $scheme = $this->scheme !== null ? $this->scheme . '://' : '';
+        $host = $this->host ?? '';
+        $port = $this->port !== null ? ':' . $this->port : '';
+        $user = $this->username ?? '';
+        $pass = $this->password !== null ? ':' . $this->password : '';
+        $pass = ($user || $pass) ? $pass . '@' : '';
+
+        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
+    }
+
+    public function __toString()
+    {
+        return $this->getRelativeUrl();
+    }
+
+}

src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace Pecee\SimpleRouter\ClassLoader;
+
+use DI\Container;
+use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+
+class ClassLoader implements IClassLoader
+{
+    /**
+     * Dependency injection enabled
+     * @var bool
+     */
+    protected $useDependencyInjection = false;
+
+    /**
+     * @var Container|null
+     */
+    protected $container;
+
+    /**
+     * Load class
+     *
+     * @param string $class
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function loadClass(string $class)
+    {
+        if (class_exists($class) === false) {
+            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404);
+        }
+
+        if ($this->useDependencyInjection === true) {
+            $container = $this->getContainer();
+            if ($container !== null) {
+                try {
+                    return $container->get($class);
+                } catch (\Exception $e) {
+                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+                }
+            }
+        }
+
+        return new $class();
+    }
+
+    /**
+     * Load closure
+     *
+     * @param \Closure $closure
+     * @param array $parameters
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function loadClosure(\Closure $closure, array $parameters)
+    {
+        if ($this->useDependencyInjection === true) {
+            $container = $this->getContainer();
+            if ($container !== null) {
+                try {
+                    return $container->call($closure, $parameters);
+                } catch (\Exception $e) {
+                    throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+                }
+            }
+        }
+
+        return \call_user_func_array($closure, $parameters);
+    }
+
+    /**
+     * Get dependency injector container.
+     *
+     * @return Container|null
+     */
+    public function getContainer(): ?Container
+    {
+        return $this->container;
+    }
+
+    /**
+     * Set the dependency-injector container.
+     *
+     * @param Container $container
+     * @return ClassLoader
+     */
+    public function setContainer(Container $container): self
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * Enable or disable dependency injection.
+     *
+     * @param bool $enabled
+     * @return static
+     */
+    public function useDependencyInjection(bool $enabled): self
+    {
+        $this->useDependencyInjection = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Return true if dependency injection is enabled.
+     *
+     * @return bool
+     */
+    public function isDependencyInjectionEnabled(): bool
+    {
+        return $this->useDependencyInjection;
+    }
+
+}

src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Pecee\SimpleRouter\ClassLoader;
+
+interface IClassLoader
+{
+
+    public function loadClass(string $class);
+
+    public function loadClosure(\Closure $closure, array $parameters);
+
+}

src/Pecee/SimpleRouter/Event/EventArgument.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace Pecee\SimpleRouter\Event;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+class EventArgument implements IEventArgument
+{
+    /**
+     * Event name
+     * @var string
+     */
+    protected $eventName;
+
+    /**
+     * @var Router
+     */
+    protected $router;
+
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    public function __construct($eventName, $router, array $arguments = [])
+    {
+        $this->eventName = $eventName;
+        $this->router = $router;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Get event name
+     *
+     * @return string
+     */
+    public function getEventName(): string
+    {
+        return $this->eventName;
+    }
+
+    /**
+     * Set the event name
+     *
+     * @param string $name
+     */
+    public function setEventName(string $name): void
+    {
+        $this->eventName = $name;
+    }
+
+    /**
+     * Get the router instance
+     *
+     * @return Router
+     */
+    public function getRouter(): Router
+    {
+        return $this->router;
+    }
+
+    /**
+     * Get the request instance
+     *
+     * @return Request
+     */
+    public function getRequest(): Request
+    {
+        return $this->getRouter()->getRequest();
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->arguments[$name] ?? null;
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        return array_key_exists($name, $this->arguments);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @throws \InvalidArgumentException
+     */
+    public function __set($name, $value)
+    {
+        throw new \InvalidArgumentException('Not supported');
+    }
+
+    /**
+     * Get arguments
+     *
+     * @return array
+     */
+    public function getArguments(): array
+    {
+        return $this->arguments;
+    }
+
+}

src/Pecee/SimpleRouter/Event/IEventArgument.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Pecee\SimpleRouter\Event;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+interface IEventArgument
+{
+
+    /**
+     * Get event name
+     *
+     * @return string
+     */
+    public function getEventName(): string;
+
+    /**
+     * Set event name
+     *
+     * @param string $name
+     */
+    public function setEventName(string $name): void;
+
+    /**
+     * Get router instance
+     *
+     * @return Router
+     */
+    public function getRouter(): Router;
+
+    /**
+     * Get request instance
+     *
+     * @return Request
+     */
+    public function getRequest(): Request;
+
+    /**
+     * Get all event arguments
+     *
+     * @return array
+     */
+    public function getArguments(): array;
+
+}

src/Pecee/SimpleRouter/Exceptions/HttpException.php

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

src/Pecee/SimpleRouter/Exceptions/NotFoundHttpException.php

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

src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Pecee\SimpleRouter\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\SimpleRouter\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/SimpleRouter/Handlers/DebugEventHandler.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class DebugEventHandler implements IEventHandler
+{
+
+    /**
+     * Debug callback
+     * @var \Closure
+     */
+    protected $callback;
+
+    public function __construct()
+    {
+        $this->callback = function (EventArgument $argument) {
+            // todo: log in database
+        };
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array
+    {
+        return [
+            $name => [
+                $this->callback,
+            ],
+        ];
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
+    {
+        $callback = $this->callback;
+        $callback(new EventArgument($router, $eventArgs));
+    }
+
+    /**
+     * Set debug callback
+     *
+     * @param \Closure $event
+     */
+    public function setCallback(\Closure $event): void
+    {
+        $this->callback = $event;
+    }
+
+}

src/Pecee/SimpleRouter/Handlers/EventHandler.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class EventHandler implements IEventHandler
+{
+    /**
+     * Fires when a event is triggered.
+     */
+    public const EVENT_ALL = '*';
+
+    /**
+     * Fires when router is initializing and before routes are loaded.
+     */
+    public const EVENT_INIT = 'onInit';
+
+    /**
+     * Fires when all routes has been loaded and rendered, just before the output is returned.
+     */
+    public const EVENT_LOAD = 'onLoad';
+
+    /**
+     * Fires when a url-rewrite is and just before the routes are re-initialized.
+     */
+    public const EVENT_REWRITE = 'onRewrite';
+
+    /**
+     * Fires when the router is booting.
+     * This happens just before boot-managers are rendered and before any routes has been loaded.
+     */
+    public const EVENT_BOOT = 'onBoot';
+
+    /**
+     * Fires before a boot-manager is rendered.
+     */
+    public const EVENT_RENDER_BOOTMANAGER = 'onRenderBootManager';
+
+    /**
+     * Fires when the router is about to load all routes.
+     */
+    public const EVENT_LOAD_ROUTES = 'onLoadRoutes';
+
+    /**
+     * Fires whenever the `findRoute` method is called within the `Router`.
+     * This usually happens when the router tries to find routes that
+     * contains a certain url, usually after the EventHandler::EVENT_GET_URL event.
+     */
+    public const EVENT_FIND_ROUTE = 'onFindRoute';
+
+    /**
+     * Fires whenever the `Router::getUrl` method or `url`-helper function
+     * is called and the router tries to find the route.
+     */
+    public const EVENT_GET_URL = 'onGetUrl';
+
+    /**
+     * Fires when a route is matched and valid (correct request-type etc).
+     * and before the route is rendered.
+     */
+    public const EVENT_MATCH_ROUTE = 'onMatchRoute';
+
+    /**
+     * Fires before a route is rendered.
+     */
+    public const EVENT_RENDER_ROUTE = 'onRenderRoute';
+
+    /**
+     * Fires when the router is loading exception-handlers.
+     */
+    public const EVENT_LOAD_EXCEPTIONS = 'onLoadExceptions';
+
+    /**
+     * Fires before the router is rendering a exception-handler.
+     */
+    public const EVENT_RENDER_EXCEPTION = 'onRenderException';
+
+    /**
+     * Fires before a middleware is rendered.
+     */
+    public const EVENT_RENDER_MIDDLEWARES = 'onRenderMiddlewares';
+
+    /**
+     * Fires before the CSRF-verifier is rendered.
+     */
+    public const EVENT_RENDER_CSRF = 'onRenderCsrfVerifier';
+
+    /**
+     * All available events
+     * @var array
+     */
+    public static $events = [
+        self::EVENT_ALL,
+        self::EVENT_INIT,
+        self::EVENT_LOAD,
+        self::EVENT_REWRITE,
+        self::EVENT_BOOT,
+        self::EVENT_RENDER_BOOTMANAGER,
+        self::EVENT_LOAD_ROUTES,
+        self::EVENT_FIND_ROUTE,
+        self::EVENT_GET_URL,
+        self::EVENT_MATCH_ROUTE,
+        self::EVENT_RENDER_ROUTE,
+        self::EVENT_LOAD_EXCEPTIONS,
+        self::EVENT_RENDER_EXCEPTION,
+        self::EVENT_RENDER_MIDDLEWARES,
+        self::EVENT_RENDER_CSRF,
+    ];
+
+    /**
+     * List of all registered events
+     * @var array
+     */
+    private $registeredEvents = [];
+
+    /**
+     * Register new event
+     *
+     * @param string $name
+     * @param \Closure $callback
+     * @return static
+     */
+    public function register(string $name, \Closure $callback): IEventHandler
+    {
+        if (isset($this->registeredEvents[$name]) === true) {
+            $this->registeredEvents[$name][] = $callback;
+        } else {
+            $this->registeredEvents[$name] = [$callback];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @param array ...$names Add multiple names...
+     * @return array
+     */
+    public function getEvents(?string $name, ...$names): array
+    {
+        if ($name === null) {
+            return $this->registeredEvents;
+        }
+
+        $names[] = $name;
+        $events = [];
+
+        foreach ($names as $eventName) {
+            if (isset($this->registeredEvents[$eventName]) === true) {
+                $events += $this->registeredEvents[$eventName];
+            }
+        }
+
+        return $events;
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
+    {
+        $events = $this->getEvents(static::EVENT_ALL, $name);
+
+        /* @var $event \Closure */
+        foreach ($events as $event) {
+            $event(new EventArgument($name, $router, $eventArgs));
+        }
+    }
+
+}

src/Pecee/SimpleRouter/Handlers/IEventHandler.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Router;
+
+interface IEventHandler
+{
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array;
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void;
+
+}

src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\Http\Request;
+
+interface IExceptionHandler
+{
+    /**
+     * @param Request $request
+     * @param \Exception $error
+     */
+    public function handleError(Request $request, \Exception $error): void;
+
+}

src/Pecee/SimpleRouter/IRouteEntry.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Pecee\SimpleRouter;
-
-interface IRouteEntry {
-
-}

src/Pecee/SimpleRouter/IRouterBootManager.php

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

src/Pecee/SimpleRouter/Route/IControllerRoute.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+interface IControllerRoute extends IRoute
+{
+    /**
+     * Get controller class-name
+     *
+     * @return string
+     */
+    public function getController(): string;
+
+    /**
+     * Set controller class-name
+     *
+     * @param string $controller
+     * @return static
+     */
+    public function setController(string $controller): self;
+
+}

src/Pecee/SimpleRouter/Route/IGroupRoute.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
+
+interface IGroupRoute extends IRoute
+{
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    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
+     */
+    public function setExceptionHandlers(array $handlers);
+
+    /**
+     * Get exception-handlers for group
+     *
+     * @return array
+     */
+    public function getExceptionHandlers(): array;
+
+    /**
+     * Get domains for domain.
+     *
+     * @return array
+     */
+    public function getDomains(): array;
+
+    /**
+     * Set allowed domains for group.
+     *
+     * @param array $domains
+     * @return static
+     */
+    public function setDomains(array $domains): self;
+
+    /**
+     * Set prefix that child-routes will inherit.
+     *
+     * @param string $prefix
+     * @return static
+     */
+    public function setPrefix($prefix): self;
+
+    /**
+     * Get prefix.
+     *
+     * @return string|null
+     */
+    public function getPrefix(): ?string;
+}

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+interface ILoadableRoute extends IRoute
+{
+    /**
+     * Find url that matches method, parameters or name.
+     * Used when calling the url() helper.
+     *
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string;
+
+    /**
+     * Loads and renders middleware-classes
+     *
+     * @param Request $request
+     * @param Router $router
+     */
+    public function loadMiddleware(Request $request, Router $router): void;
+
+    /**
+     * Get url
+     * @return string
+     */
+    public function getUrl(): string;
+
+    /**
+     * Set url
+     * @param string $url
+     * @return static
+     */
+    public function setUrl(string $url): self;
+
+    /**
+     * Returns the provided name for the router.
+     *
+     * @return string|null
+     */
+    public function getName(): ?string;
+
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName(string $name): bool;
+
+    /**
+     * Sets the router name, which makes it easier to obtain the url or router at a later point.
+     *
+     * @param string $name
+     * @return static
+     */
+    public function setName(string $name): self;
+
+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch(): ?string;
+
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    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

@@ -0,0 +1,209 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;
+
+interface IRoute
+{
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param string $route
+     * @param Request $request
+     * @return bool
+     */
+    public function matchRoute($route, Request $request): bool;
+
+    /**
+     * Called when route is matched.
+     * Returns class to be rendered.
+     *
+     * @param Request $request
+     * @param Router $router
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @return string
+     */
+    public function renderRoute(Request $request, Router $router): ?string;
+
+    /**
+     * Returns callback name/identifier for the current route based on the callback.
+     * Useful if you need to get a unique identifier for the loaded route, for instance
+     * when using translations etc.
+     *
+     * @return string
+     */
+    public function getIdentifier(): string;
+
+    /**
+     * Set allowed request methods
+     *
+     * @param array $methods
+     * @return static
+     */
+    public function setRequestMethods(array $methods): self;
+
+    /**
+     * Get allowed request methods
+     *
+     * @return array
+     */
+    public function getRequestMethods(): array;
+
+    /**
+     * @return IRoute|null
+     */
+    public function getParent(): ?IRoute;
+
+    /**
+     * Get the group for the route.
+     *
+     * @return IGroupRoute|null
+     */
+    public function getGroup(): ?IGroupRoute;
+
+    /**
+     * Set group
+     *
+     * @param IGroupRoute $group
+     * @return static
+     */
+    public function setGroup(IGroupRoute $group): self;
+
+    /**
+     * Set parent route
+     *
+     * @param IRoute $parent
+     * @return static
+     */
+    public function setParent(IRoute $parent): self;
+
+    /**
+     * Set callback
+     *
+     * @param string $callback
+     * @return static
+     */
+    public function setCallback($callback): self;
+
+    /**
+     * @return string|callable
+     */
+    public function getCallback();
+
+    /**
+     * Return active method
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string;
+
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod(string $method): self;
+
+    /**
+     * Get class
+     *
+     * @return string|null
+     */
+    public function getClass(): ?string;
+
+    /**
+     * @param string $namespace
+     * @return static
+     */
+    public function setNamespace(string $namespace): self;
+
+    /**
+     * @return string|null
+     */
+    public function getNamespace(): ?string;
+
+    /**
+     * @param string $namespace
+     * @return static
+     */
+    public function setDefaultNamespace($namespace): IRoute;
+
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public function getDefaultNamespace(): ?string;
+
+    /**
+     * Get parameter names.
+     *
+     * @return array
+     */
+    public function getWhere(): array;
+
+    /**
+     * Set parameter names.
+     *
+     * @param array $options
+     * @return static
+     */
+    public function setWhere(array $options): self;
+
+    /**
+     * Get parameters
+     *
+     * @return array
+     */
+    public function getParameters(): array;
+
+    /**
+     * Get parameters
+     *
+     * @param array $parameters
+     * @return static
+     */
+    public function setParameters(array $parameters): self;
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $settings
+     * @param bool $merge
+     * @return static
+     */
+    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(): array;
+
+    /**
+     * Get middlewares array
+     *
+     * @return array
+     */
+    public function getMiddlewares(): array;
+
+    /**
+     * Set middleware class-name
+     *
+     * @param string $middleware
+     * @return static
+     */
+    public function addMiddleware($middleware): self;
+
+    /**
+     * Set middlewares array
+     *
+     * @param array $middlewares
+     * @return static
+     */
+    public function setMiddlewares(array $middlewares): self;
+
+}

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -0,0 +1,251 @@
+<?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
+{
+    /**
+     * @var string
+     */
+    protected $url;
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    protected $regex;
+
+    /**
+     * Loads and renders middlewares-classes
+     *
+     * @param Request $request
+     * @param Router $router
+     * @throws HttpException
+     */
+    public function loadMiddleware(Request $request, Router $router): void
+    {
+        $router->debug('Loading middlewares');
+
+        foreach ($this->getMiddlewares() as $middleware) {
+
+            if (\is_object($middleware) === false) {
+                $middleware = $router->getClassLoader()->loadClass($middleware);
+            }
+
+            if (($middleware instanceof IMiddleware) === false) {
+                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+            }
+
+            $className = \get_class($middleware);
+
+            $router->debug('Loading middleware "%s"', $className);
+            $middleware->handle($request);
+            $router->debug('Finished loading middleware "%s"', $className);
+        }
+
+        $router->debug('Finished loading middlewares');
+    }
+
+    public function matchRegex(Request $request, $url): ?bool
+    {
+        /* Match on custom defined regular expression */
+
+        if ($this->regex === null) {
+            return null;
+        }
+
+        return ((bool)preg_match($this->regex, $request->getHost() . $url) !== false);
+    }
+
+    /**
+     * Set url
+     *
+     * @param string $url
+     * @return static
+     */
+    public function setUrl(string $url): ILoadableRoute
+    {
+        $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
+
+        if (strpos($this->url, $this->paramModifiers[0]) !== false) {
+
+            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
+                $this->parameters = array_fill_keys($matches[1], null);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    /**
+     * Find url that matches method, parameters or name.
+     * Used when calling the url() helper.
+     *
+     * @param string|null $method
+     * @param string|array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
+    {
+        $url = $this->getUrl();
+
+        $group = $this->getGroup();
+
+        if ($group !== null && \count($group->getDomains()) !== 0) {
+            $url = '//' . $group->getDomains()[0] . $url;
+        }
+
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
+        $unknownParams = [];
+
+        /* Create the param string - {parameter} */
+        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
+
+        /* Create the param string with the optional symbol - {parameter?} */
+        $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
+
+        /* Replace any {parameter} in the url with the correct value */
+
+        $params = $this->getParameters();
+
+        foreach (array_keys($params) as $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) {
+                /* Add parameter to the correct position */
+                $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
+            } else {
+                $unknownParams[$param] = $value;
+            }
+        }
+
+        $url = '/' . ltrim($url, '/') . implode('/', $unknownParams);
+
+        return rtrim($url, '/') . '/';
+    }
+
+    /**
+     * Returns the provided name for the router.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName(string $name): bool
+    {
+        return strtolower($this->name) === strtolower($name);
+    }
+
+    /**
+     * Add regular expression match for the entire route.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setMatch($regex): ILoadableRoute
+    {
+        $this->regex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get regular expression match used for matching route (if defined).
+     *
+     * @return string
+     */
+    public function getMatch(): string
+    {
+        return $this->regex;
+    }
+
+    /**
+     * Sets the router name, which makes it easier to obtain the url or router at a later point.
+     * Alias for LoadableRoute::setName().
+     *
+     * @see LoadableRoute::setName()
+     * @param string|array $name
+     * @return static
+     */
+    public function name($name): ILoadableRoute
+    {
+        return $this->setName($name);
+    }
+
+    /**
+     * Sets the router name, which makes it easier to obtain the url or router at a later point.
+     *
+     * @param string $name
+     * @return static
+     */
+    public function setName(string $name): ILoadableRoute
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, bool $merge = false): IRoute
+    {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
+            if ($this->name !== null && $merge !== false) {
+                $name .= '.' . $this->name;
+            }
+
+            $this->setName($name);
+        }
+
+        if (isset($values['prefix']) === true) {
+            $this->setUrl($values['prefix'] . $this->getUrl());
+        }
+
+        parent::setSettings($values, $merge);
+
+        return $this;
+    }
+
+}

src/Pecee/SimpleRouter/Route/Route.php

@@ -0,0 +1,575 @@
+<?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
+{
+    protected const PARAMETERS_REGEX_FORMAT = '%s([\w]+)(\%s?)%s';
+    protected const PARAMETERS_DEFAULT_REGEX = '[\w]+';
+
+    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,
+        self::REQUEST_TYPE_POST,
+        self::REQUEST_TYPE_PUT,
+        self::REQUEST_TYPE_PATCH,
+        self::REQUEST_TYPE_OPTIONS,
+        self::REQUEST_TYPE_DELETE,
+    ];
+
+    /**
+     * If enabled parameters containing null-value
+     * will not be passed along to the callback.
+     *
+     * @var bool
+     */
+    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;
+    protected $defaultNamespace;
+
+    /* Default options */
+    protected $namespace;
+    protected $requestMethods = [];
+    protected $where = [];
+    protected $parameters = [];
+    protected $originalParameters = [];
+    protected $middlewares = [];
+
+    /**
+     * 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 "%s"', \get_class($this));
+
+        $callback = $this->getCallback();
+
+        if ($callback === null) {
+            return null;
+        }
+
+        $router->debug('Parsing parameters');
+        $parameters = $this->getParameters();
+        $router->debug('Finished parsing parameters');
+
+        /* Filter parameters with null-value */
+        if ($this->filterEmptyParams === true) {
+            $parameters = array_filter($parameters, function ($var) {
+                return ($var !== null);
+            });
+        }
+
+        /* Render callback function */
+        if (\is_callable($callback) === true) {
+            $router->debug('Executing callback');
+
+            /* When the callback is a function */
+
+            return $router->getClassLoader()->loadClosure($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 = $router->getClassLoader()->loadClass($className);
+
+        $method = $controller[1];
+
+        if (method_exists($class, $method) === false) {
+            throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
+        }
+
+        $router->debug('Executing callback');
+
+        return \call_user_func_array([$class, $method], $parameters);
+    }
+
+    protected function parseParameters($route, $url, $parameterRegex = null)
+    {
+        $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+
+        $parameters = [];
+
+        // Ensures that host names/domains will work with parameters
+        $url = '/' . ltrim($url, '/');
+
+        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])) {
+
+                    $name = $parameters[1][$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 = implode('', $urlParts);
+
+        }
+
+        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+            return null;
+        }
+
+        $values = [];
+
+        if (isset($parameters[1]) === true) {
+
+            /* Only take matched parameters with name */
+            foreach ((array)$parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * Returns callback name/identifier for the current route based on the callback.
+     * Useful if you need to get a unique identifier for the loaded route, for instance
+     * when using translations etc.
+     *
+     * @return string
+     */
+    public function getIdentifier(): string
+    {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+            return $this->callback;
+        }
+
+        return 'function_' . md5($this->callback);
+    }
+
+    /**
+     * Set allowed request methods
+     *
+     * @param array $methods
+     * @return static
+     */
+    public function setRequestMethods(array $methods): IRoute
+    {
+        $this->requestMethods = $methods;
+
+        return $this;
+    }
+
+    /**
+     * Get allowed request methods
+     *
+     * @return array
+     */
+    public function getRequestMethods(): array
+    {
+        return $this->requestMethods;
+    }
+
+    /**
+     * @return IRoute|null
+     */
+    public function getParent(): ?IRoute
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get the group for the route.
+     *
+     * @return IGroupRoute|null
+     */
+    public function getGroup(): ?IGroupRoute
+    {
+        return $this->group;
+    }
+
+    /**
+     * Set group
+     *
+     * @param IGroupRoute $group
+     * @return static
+     */
+    public function setGroup(IGroupRoute $group): IRoute
+    {
+        $this->group = $group;
+
+        /* Add/merge parent settings with child */
+        $this->setSettings($group->toArray(), true);
+
+        return $this;
+    }
+
+    /**
+     * Set parent route
+     *
+     * @param IRoute $parent
+     * @return static
+     */
+    public function setParent(IRoute $parent): IRoute
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Set callback
+     *
+     * @param string $callback
+     * @return static
+     */
+    public function setCallback($callback): IRoute
+    {
+        $this->callback = $callback;
+
+        return $this;
+    }
+
+    /**
+     * @return string|callable
+     */
+    public function getCallback()
+    {
+        return $this->callback;
+    }
+
+    public function getMethod(): ?string
+    {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+
+            return $tmp[1];
+        }
+
+        return null;
+    }
+
+    public function getClass(): ?string
+    {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
+            $tmp = explode('@', $this->callback);
+
+            return $tmp[0];
+        }
+
+        return null;
+    }
+
+    public function setMethod(string $method): IRoute
+    {
+        $this->callback = sprintf('%s@%s', $this->getClass(), $method);
+
+        return $this;
+    }
+
+    public function setClass(string $class): IRoute
+    {
+        $this->callback = sprintf('%s@%s', $class, $this->getMethod());
+
+        return $this;
+    }
+
+    /**
+     * @param string $namespace
+     * @return static
+     */
+    public function setNamespace(string $namespace): IRoute
+    {
+        $this->namespace = $namespace;
+
+        return $this;
+    }
+
+    /**
+     * @param string $namespace
+     * @return static
+     */
+    public function setDefaultNamespace($namespace): IRoute
+    {
+        $this->defaultNamespace = $namespace;
+
+        return $this;
+    }
+
+    public function getDefaultNamespace(): ?string
+    {
+        return $this->defaultNamespace;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getNamespace(): ?string
+    {
+        return $this->namespace ?? $this->defaultNamespace;
+    }
+
+    /**
+     * Export route settings to array so they can be merged with another route.
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $values = [];
+
+        if ($this->namespace !== null) {
+            $values['namespace'] = $this->namespace;
+        }
+
+        if (\count($this->requestMethods) !== 0) {
+            $values['method'] = $this->requestMethods;
+        }
+
+        if (\count($this->where) !== 0) {
+            $values['where'] = $this->where;
+        }
+
+        if (\count($this->middlewares) !== 0) {
+            $values['middleware'] = $this->middlewares;
+        }
+
+        if ($this->defaultParameterRegex !== null) {
+            $values['defaultParameterRegex'] = $this->defaultParameterRegex;
+        }
+
+        return $values;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, bool $merge = false): IRoute
+    {
+        if ($this->namespace === null && isset($values['namespace']) === true) {
+            $this->setNamespace($values['namespace']);
+        }
+
+        if (isset($values['method']) === true) {
+            $this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
+        }
+
+        if (isset($values['where']) === true) {
+            $this->setWhere(array_merge($this->where, (array)$values['where']));
+        }
+
+        if (isset($values['parameters']) === true) {
+            $this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
+        }
+
+        // Push middleware if multiple
+        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;
+    }
+
+    /**
+     * Get parameter names.
+     *
+     * @return array
+     */
+    public function getWhere(): array
+    {
+        return $this->where;
+    }
+
+    /**
+     * Set parameter names.
+     *
+     * @param array $options
+     * @return static
+     */
+    public function setWhere(array $options): IRoute
+    {
+        $this->where = $options;
+
+        return $this;
+    }
+
+    /**
+     * Add regular expression parameter match.
+     * Alias for LoadableRoute::where()
+     *
+     * @see LoadableRoute::where()
+     * @param array $options
+     * @return static
+     */
+    public function where(array $options)
+    {
+        return $this->setWhere($options);
+    }
+
+    /**
+     * Get parameters
+     *
+     * @return array
+     */
+    public function getParameters(): array
+    {
+        /* Sort the parameters after the user-defined param order, if any */
+        $parameters = [];
+
+        if (\count($this->originalParameters) !== 0) {
+            $parameters = $this->originalParameters;
+        }
+
+        return array_merge($parameters, $this->parameters);
+    }
+
+    /**
+     * Get parameters
+     *
+     * @param array $parameters
+     * @return static
+     */
+    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) {
+            $this->originalParameters = $parameters;
+        }
+
+        $this->parameters = array_merge($this->parameters, $parameters);
+
+        return $this;
+    }
+
+    /**
+     * Add middleware class-name
+     *
+     * @deprecated This method is deprecated and will be removed in the near future.
+     * @param IMiddleware|string $middleware
+     * @return static
+     */
+    public function setMiddleware($middleware)
+    {
+        $this->middlewares[] = $middleware;
+
+        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 static
+     */
+    public function setMiddlewares(array $middlewares): IRoute
+    {
+        $this->middlewares = $middlewares;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    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

@@ -0,0 +1,185 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+
+class RouteController extends LoadableRoute implements IControllerRoute
+{
+    protected $defaultMethod = 'index';
+    protected $controller;
+    protected $method;
+    protected $names = [];
+
+    public function __construct($url, $controller)
+    {
+        $this->setUrl($url);
+        $this->setName(trim(str_replace('/', '.', $url), '/'));
+        $this->controller = $controller;
+    }
+
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName(string $name): bool
+    {
+        if ($this->name === null) {
+            return false;
+        }
+
+        /* Remove method/type */
+        if (strpos($name, '.') !== false) {
+            $method = substr($name, strrpos($name, '.') + 1);
+            $newName = substr($name, 0, strrpos($name, '.'));
+
+            if (\in_array($method, $this->names, true) === true && strtolower($this->name) === strtolower($newName)) {
+                return true;
+            }
+        }
+
+        return parent::hasName($name);
+    }
+
+    /**
+     * @param string|null $method
+     * @param string|array|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
+    {
+        if (strpos($name, '.') !== false) {
+            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
+            if ($found !== false) {
+                $method = (string)$found;
+            }
+        }
+
+        $url = '';
+        $parameters = (array)$parameters;
+
+        if ($method !== null) {
+
+            /* Remove requestType from method-name, if it exists */
+            foreach (static::$requestTypes as $requestType) {
+
+                if (stripos($method, $requestType) === 0) {
+                    $method = (string)substr($method, \strlen($requestType));
+                    break;
+                }
+            }
+
+            $method .= '/';
+        }
+
+        $group = $this->getGroup();
+
+        if ($group !== null && \count($group->getDomains()) !== 0) {
+            $url .= '//' . $group->getDomains()[0];
+        }
+
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . implode('/', $parameters);
+
+        return '/' . trim($url, '/') . '/';
+    }
+
+    public function matchRoute($url, Request $request): bool
+    {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
+        /* Match global regular-expression for route */
+        $regexMatch = $this->matchRegex($request, $url);
+
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
+        }
+
+        $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
+        $path = explode('/', $strippedUrl);
+
+        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);
+
+            // Set callback
+            $this->setCallback($this->controller . '@' . $this->method);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get controller class-name.
+     *
+     * @return string
+     */
+    public function getController(): string
+    {
+        return $this->controller;
+    }
+
+    /**
+     * Get controller class-name.
+     *
+     * @param string $controller
+     * @return static
+     */
+    public function setController(string $controller): IControllerRoute
+    {
+        $this->controller = $controller;
+
+        return $this;
+    }
+
+    /**
+     * Return active method
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string
+    {
+        return $this->method;
+    }
+
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod(string $method): IRoute
+    {
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, bool $merge = false): IRoute
+    {
+        if (isset($values['names']) === true) {
+            $this->names = $values['names'];
+        }
+
+        parent::setSettings($values, $merge);
+
+        return $this;
+    }
+
+}

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -0,0 +1,205 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
+
+class RouteGroup extends Route implements IGroupRoute
+{
+    protected $prefix;
+    protected $name;
+    protected $domains = [];
+    protected $exceptionHandlers = [];
+
+    /**
+     * Method called to check if a domain matches
+     *
+     * @param Request $request
+     * @return bool
+     */
+    public function matchDomain(Request $request): bool
+    {
+        if ($this->domains === null || \count($this->domains) === 0) {
+            return true;
+        }
+
+        foreach ($this->domains as $domain) {
+
+            $parameters = $this->parseParameters($domain, $request->getHost(), '.*');
+
+            if ($parameters !== null && \count($parameters) !== 0) {
+
+                $this->parameters = $parameters;
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 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;
+        }
+
+        /* Skip if prefix doesn't match */
+        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
+            return false;
+        }
+
+        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
+     */
+    public function setExceptionHandlers(array $handlers): IGroupRoute
+    {
+        $this->exceptionHandlers = $handlers;
+
+        return $this;
+    }
+
+    /**
+     * Get exception-handlers for group
+     *
+     * @return array
+     */
+    public function getExceptionHandlers(): array
+    {
+        return $this->exceptionHandlers;
+    }
+
+    /**
+     * Get allowed domains for domain.
+     *
+     * @return array
+     */
+    public function getDomains(): array
+    {
+        return $this->domains;
+    }
+
+    /**
+     * Set allowed domains for group.
+     *
+     * @param array $domains
+     * @return static
+     */
+    public function setDomains(array $domains): IGroupRoute
+    {
+        $this->domains = $domains;
+
+        return $this;
+    }
+
+    /**
+     * @param string $prefix
+     * @return static
+     */
+    public function setPrefix($prefix): IGroupRoute
+    {
+        $this->prefix = '/' . trim($prefix, '/');
+
+        return $this;
+    }
+
+    /**
+     * Set prefix that child-routes will inherit.
+     *
+     * @return string|null
+     */
+    public function getPrefix(): ?string
+    {
+        return $this->prefix;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, bool $merge = false): IRoute
+    {
+
+        if (isset($values['prefix']) === true) {
+            $this->setPrefix($values['prefix'] . $this->prefix);
+        }
+
+        if ($merge === false && isset($values['exceptionHandler']) === true) {
+            $this->setExceptionHandlers((array)$values['exceptionHandler']);
+        }
+
+        if ($merge === false && isset($values['domain']) === true) {
+            $this->setDomains((array)$values['domain']);
+        }
+
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
+            if ($this->name !== null && $merge !== false) {
+                $name .= '.' . $this->name;
+            }
+
+            $this->name = $name;
+        }
+
+        parent::setSettings($values, $merge);
+
+        return $this;
+    }
+
+    /**
+     * Export route settings to array so they can be merged with another route.
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        $values = [];
+
+        if ($this->prefix !== null) {
+            $values['prefix'] = $this->getPrefix();
+        }
+
+        if ($this->name !== null) {
+            $values['as'] = $this->name;
+        }
+
+        if (\count($this->parameters) !== 0) {
+            $values['parameters'] = $this->parameters;
+        }
+
+        return array_merge($values, parent::toArray());
+    }
+
+}

src/Pecee/SimpleRouter/Route/RoutePartialGroup.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+
+class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
+{
+
+    /**
+     * RoutePartialGroup constructor.
+     */
+    public function __construct()
+    {
+        $this->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

@@ -0,0 +1,232 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+use Pecee\Http\Request;
+
+class RouteResource extends LoadableRoute implements IControllerRoute
+{
+    protected $urls = [
+        'index'   => '',
+        'create'  => 'create',
+        'store'   => '',
+        'show'    => '',
+        'edit'    => 'edit',
+        'update'  => '',
+        'destroy' => '',
+    ];
+
+    protected $methodNames = [
+        'index'   => 'index',
+        'create'  => 'create',
+        'store'   => 'store',
+        'show'    => 'show',
+        'edit'    => 'edit',
+        'update'  => 'update',
+        'destroy' => 'destroy',
+    ];
+
+    protected $names = [];
+    protected $controller;
+
+    public function __construct($url, $controller)
+    {
+        $this->setUrl($url);
+        $this->controller = $controller;
+        $this->setName(trim(str_replace('/', '.', $url), '/'));
+    }
+
+    /**
+     * Check if route has given name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasName(string $name): bool
+    {
+        if ($this->name === null) {
+            return false;
+        }
+
+        if (strtolower($this->name) === strtolower($name)) {
+            return true;
+        }
+
+        /* Remove method/type */
+        if (strpos($name, '.') !== false) {
+            $name = (string)substr($name, 0, strrpos($name, '.'));
+        }
+
+        return (strtolower($this->name) === strtolower($name));
+    }
+
+    /**
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
+    {
+        $url = array_search($name, $this->names, false);
+        if ($url !== false) {
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
+        }
+
+        return $this->url;
+    }
+
+    protected function call($method)
+    {
+        $this->setCallback($this->controller . '@' . $method);
+
+        return true;
+    }
+
+    public function matchRoute($url, Request $request): bool
+    {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
+        /* Match global regular-expression for route */
+        $regexMatch = $this->matchRegex($request, $url);
+
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+            return false;
+        }
+
+        $route = rtrim($this->url, '/') . '/{id?}/{action?}';
+
+        /* Parse parameters from current route */
+        $this->parameters = $this->parseParameters($route, $url);
+
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $this->parameters === null) {
+            return false;
+        }
+
+        $action = strtolower(trim($this->parameters['action']));
+        $id = $this->parameters['id'];
+
+        // Remove action parameter
+        unset($this->parameters['action']);
+
+        $method = $request->getMethod();
+
+        // Delete
+        if ($method === static::REQUEST_TYPE_DELETE && $id !== null) {
+            return $this->call($this->methodNames['destroy']);
+        }
+
+        // Update
+        if ($id !== null && \in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], true) === true) {
+            return $this->call($this->methodNames['update']);
+        }
+
+        // Edit
+        if ($method === static::REQUEST_TYPE_GET && $id !== null && $action === 'edit') {
+            return $this->call($this->methodNames['edit']);
+        }
+
+        // Create
+        if ($method === static::REQUEST_TYPE_GET && $id === 'create') {
+            return $this->call($this->methodNames['create']);
+        }
+
+        // Save
+        if ($method === static::REQUEST_TYPE_POST) {
+            return $this->call($this->methodNames['store']);
+        }
+
+        // Show
+        if ($method === static::REQUEST_TYPE_GET && $id !== null) {
+            return $this->call($this->methodNames['show']);
+        }
+
+        // Index
+        return $this->call($this->methodNames['index']);
+    }
+
+    /**
+     * @return string
+     */
+    public function getController(): string
+    {
+        return $this->controller;
+    }
+
+    /**
+     * @param string $controller
+     * @return static
+     */
+    public function setController(string $controller): IControllerRoute
+    {
+        $this->controller = $controller;
+
+        return $this;
+    }
+
+    public function setName(string $name): ILoadableRoute
+    {
+        $this->name = $name;
+
+        $this->names = [
+            'index'   => $this->name . '.index',
+            'create'  => $this->name . '.create',
+            'store'   => $this->name . '.store',
+            'show'    => $this->name . '.show',
+            'edit'    => $this->name . '.edit',
+            'update'  => $this->name . '.update',
+            'destroy' => $this->name . '.destroy',
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Define custom method name for resource controller
+     *
+     * @param array $names
+     * @return static $this
+     */
+    public function setMethodNames(array $names)
+    {
+        $this->methodNames = $names;
+
+        return $this;
+    }
+
+    /**
+     * Get method names
+     *
+     * @return array
+     */
+    public function getMethodNames(): array
+    {
+        return $this->methodNames;
+    }
+
+    /**
+     * Merge with information from another route.
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return static
+     */
+    public function setSettings(array $values, bool $merge = false): IRoute
+    {
+        if (isset($values['names']) === true) {
+            $this->names = $values['names'];
+        }
+
+        if (isset($values['methods']) === true) {
+            $this->methodNames = $values['methods'];
+        }
+
+        parent::setSettings($values, $merge);
+
+        return $this;
+    }
+
+}

src/Pecee/SimpleRouter/Route/RouteUrl.php

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

src/Pecee/SimpleRouter/Router.php

@@ -0,0 +1,921 @@
+<?php
+
+namespace Pecee\SimpleRouter;
+
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\ClassLoader;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
+use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Handlers\EventHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
+use Pecee\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
+{
+
+    /**
+     * Current request
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Defines if a route is currently being processed.
+     * @var bool
+     */
+    protected $isProcessingRoute;
+
+    /**
+     * All added routes
+     * @var array
+     */
+    protected $routes = [];
+
+    /**
+     * List of processed routes
+     * @var array
+     */
+    protected $processedRoutes = [];
+
+    /**
+     * Stack of routes used to keep track of sub-routes added
+     * when a route is being processed.
+     * @var array
+     */
+    protected $routeStack = [];
+
+    /**
+     * List of added bootmanagers
+     * @var array
+     */
+    protected $bootManagers = [];
+
+    /**
+     * Csrf verifier class
+     * @var BaseCsrfVerifier
+     */
+    protected $csrfVerifier;
+
+    /**
+     * Get exception handlers
+     * @var array
+     */
+    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 = [];
+
+    /**
+     * Contains any registered event-handler.
+     * @var array
+     */
+    protected $eventHandlers = [];
+
+    /**
+     * Class loader instance
+     * @var ClassLoader
+     */
+    protected $classLoader;
+
+    /**
+     * Router constructor.
+     */
+    public function __construct()
+    {
+        $this->reset();
+    }
+
+    /**
+     * Resets the router by reloading request and clearing all routes and data.
+     */
+    public function reset(): void
+    {
+        $this->debugStartTime = microtime(true);
+        $this->isProcessingRoute = false;
+
+        try {
+            $this->request = new Request();
+        } catch (MalformedUrlException $e) {
+            $this->debug(sprintf('Invalid request-uri url: %s', $e->getMessage()));
+        }
+
+        $this->routes = [];
+        $this->bootManagers = [];
+        $this->routeStack = [];
+        $this->processedRoutes = [];
+        $this->exceptionHandlers = [];
+        $this->loadedExceptionHandlers = [];
+        $this->eventHandlers = [];
+        $this->debugList = [];
+        $this->csrfVerifier = null;
+        $this->classLoader = new ClassLoader();
+    }
+
+    /**
+     * Add route
+     * @param IRoute $route
+     * @return IRoute
+     */
+    public function addRoute(IRoute $route): IRoute
+    {
+        /*
+         * If a route is currently being processed, that means that the route being added are rendered from the parent
+         * routes callback, so we add them to the stack instead.
+         */
+        if ($this->isProcessingRoute === true) {
+            $this->routeStack[] = $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->isProcessingRoute = true;
+        $route->renderRoute($this->request, $this);
+        $this->isProcessingRoute = 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
+     * @throws NotFoundHttpException
+     */
+    protected function processRoutes(array $routes, ?IGroupRoute $group = null): void
+    {
+        $this->debug('Processing routes');
+
+        // Loop through each route-request
+        $exceptionHandlers = [];
+
+        // Stop processing routes if no valid route is found.
+        if ($this->request->getRewriteRoute() === null && $this->request->getUrl() === null) {
+            $this->debug('Halted route-processing as no valid route was found');
+
+            return;
+        }
+
+        $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
+
+        /* @var $route IRoute */
+        foreach ($routes as $route) {
+
+            $this->debug('Processing route "%s"', \get_class($route));
+
+            if ($group !== null) {
+                /* Add the parent group */
+                $route->setGroup($group);
+            }
+
+            /* @var $route IGroupRoute */
+            if ($route instanceof IGroupRoute) {
+
+                if ($route->matchRoute($url, $this->request) === true) {
+
+                    /* Add exception handlers */
+                    if (\count($route->getExceptionHandlers()) !== 0) {
+                        /** @noinspection AdditionOperationOnArraysInspection */
+                        $exceptionHandlers += $route->getExceptionHandlers();
+                    }
+
+                    /* Only render partial group if it matches */
+                    if ($route instanceof IPartialGroupRoute === true) {
+                        $this->renderAndProcess($route);
+                    }
+
+                }
+
+                if ($route instanceof IPartialGroupRoute === false) {
+                    $this->renderAndProcess($route);
+                }
+
+                continue;
+            }
+
+            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;
+            }
+        }
+
+        $this->exceptionHandlers = array_merge($exceptionHandlers, $this->exceptionHandlers);
+    }
+
+    /**
+     * Load routes
+     * @throws NotFoundHttpException
+     * @return void
+     */
+    public function loadRoutes(): void
+    {
+        $this->debug('Loading routes');
+
+        $this->fireEvents(EventHandler::EVENT_BOOT, [
+            'bootmanagers' => $this->bootManagers,
+        ]);
+
+        /* Initialize boot-managers */
+
+        /* @var $manager IRouterBootManager */
+        foreach ($this->bootManagers as $manager) {
+
+            $className = \get_class($manager);
+            $this->debug('Rendering bootmanager "%s"', $className);
+            $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, [
+                'bootmanagers' => $this->bootManagers,
+                'bootmanager'  => $manager,
+            ]);
+
+            /* Render bootmanager */
+            $manager->boot($this, $this->request);
+
+            $this->debug('Finished rendering bootmanager "%s"', $className);
+        }
+
+        $this->fireEvents(EventHandler::EVENT_LOAD_ROUTES, [
+            'routes' => $this->routes,
+        ]);
+
+        /* Loop through each route-request */
+        $this->processRoutes($this->routes);
+
+        $this->debug('Finished loading routes');
+    }
+
+    /**
+     * Start the routing
+     *
+     * @return string|null
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public function start(): ?string
+    {
+        $this->debug('Router starting');
+
+        $this->fireEvents(EventHandler::EVENT_INIT);
+
+        $this->loadRoutes();
+
+        if ($this->csrfVerifier !== null) {
+
+            $this->fireEvents(EventHandler::EVENT_RENDER_CSRF, [
+                'csrfVerifier' => $this->csrfVerifier,
+            ]);
+
+            /* Verify csrf token for request */
+            $this->csrfVerifier->handle($this->request);
+        }
+
+        $output = $this->routeRequest();
+
+        $this->fireEvents(EventHandler::EVENT_LOAD, [
+            'loadedRoutes' => $this->getRequest()->getLoadedRoutes(),
+        ]);
+
+        $this->debug('Routing complete');
+
+        return $output;
+    }
+
+    /**
+     * Routes the request
+     *
+     * @return string|null
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public function routeRequest(): ?string
+    {
+        $this->debug('Routing request');
+
+        $methodNotAllowed = false;
+
+        try {
+            $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();
+
+            /* @var $route ILoadableRoute */
+            foreach ($this->processedRoutes as $key => $route) {
+
+                $this->debug('Matching route "%s"', \get_class($route));
+
+                /* If the route matches */
+                if ($route->matchRoute($url, $this->request) === true) {
+
+                    $this->fireEvents(EventHandler::EVENT_MATCH_ROUTE, [
+                        'route' => $route,
+                    ]);
+
+                    /* Check if request method matches */
+                    if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
+                        $this->debug('Method "%s" not allowed', $this->request->getMethod());
+                        $methodNotAllowed = true;
+                        continue;
+                    }
+
+                    $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARES, [
+                        'route'       => $route,
+                        'middlewares' => $route->getMiddlewares(),
+                    ]);
+
+                    $route->loadMiddleware($this->request, $this);
+
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
+                    }
+
+                    $methodNotAllowed = false;
+
+                    $this->request->addLoadedRoute($route);
+
+                    $this->fireEvents(EventHandler::EVENT_RENDER_ROUTE, [
+                        'route' => $route,
+                    ]);
+
+                    $output = $route->renderRoute($this->request, $this);
+                    if ($output !== null) {
+                        return $output;
+                    }
+
+                    $output = $this->handleRouteRewrite($key, $url);
+                    if ($output !== null) {
+                        return $output;
+                    }
+                }
+            }
+
+        } catch (\Exception $e) {
+            $this->handleException($e);
+        }
+
+        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 (\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;
+    }
+
+    /**
+     * Handle route-rewrite
+     *
+     * @param string $key
+     * @param string $url
+     * @return string|null
+     * @throws HttpException
+     * @throws \Exception
+     */
+    protected function handleRouteRewrite($key, string $url): ?string
+    {
+        /* If the request has changed */
+        if ($this->request->hasPendingRewrite() === false) {
+            return null;
+        }
+
+        $route = $this->request->getRewriteRoute();
+
+        if ($route !== null) {
+            /* Add rewrite route */
+            $this->processedRoutes[] = $route;
+        }
+
+        if ($this->request->getRewriteUrl() !== $url) {
+            unset($this->processedRoutes[$key]);
+            $this->request->setHasPendingRewrite(false);
+
+            $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                'rewriteUrl'   => $this->request->getRewriteUrl(),
+                'rewriteRoute' => $this->request->getRewriteRoute(),
+            ]);
+
+            return $this->routeRequest();
+        }
+
+        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));
+
+        $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS, [
+            'exception'         => $e,
+            'exceptionHandlers' => $this->exceptionHandlers,
+        ]);
+
+        /* @var $handler IExceptionHandler */
+        foreach ($this->exceptionHandlers as $key => $handler) {
+
+            if (\is_object($handler) === false) {
+                $handler = new $handler();
+            }
+
+            $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION, [
+                'exception'         => $e,
+                'exceptionHandler'  => $handler,
+                'exceptionHandlers' => $this->exceptionHandlers,
+            ]);
+
+            $this->debug('Processing exception-handler "%s"', \get_class($handler));
+
+            if (($handler instanceof IExceptionHandler) === false) {
+                throw new HttpException('Exception handler must implement the IExceptionHandler interface.', 500);
+            }
+
+            try {
+
+                $this->debug('Start rendering exception handler');
+                $handler->handleError($this->request, $e);
+                $this->debug('Finished rendering exception-handler');
+
+                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasPendingRewrite() === true) {
+
+                    $this->loadedExceptionHandlers[$key] = $handler;
+
+                    $this->debug('Exception handler contains rewrite, reloading routes');
+
+                    $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                        'rewriteUrl'   => $this->request->getRewriteUrl(),
+                        'rewriteRoute' => $this->request->getRewriteRoute(),
+                    ]);
+
+                    if ($this->request->getRewriteRoute() !== null) {
+                        $this->processedRoutes[] = $this->request->getRewriteRoute();
+                    }
+
+                    return $this->routeRequest();
+                }
+
+            } catch (\Exception $e) {
+
+            }
+
+            $this->debug('Finished processing');
+        }
+
+        $this->debug('Finished exception handling - exception not handled, throwing');
+        throw $e;
+    }
+
+    /**
+     * Find route by alias, class, callback or method.
+     *
+     * @param string $name
+     * @return ILoadableRoute|null
+     */
+    public function findRoute(string $name): ?ILoadableRoute
+    {
+        $this->debug('Finding route by name "%s"', $name);
+
+        $this->fireEvents(EventHandler::EVENT_FIND_ROUTE, [
+            'name' => $name,
+        ]);
+
+        /* @var $route ILoadableRoute */
+        foreach ($this->processedRoutes as $route) {
+
+            /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
+            if ($route->hasName($name) === true) {
+                $this->debug('Found route "%s" by name "%s"', $route->getUrl(), $name);
+
+                return $route;
+            }
+
+            /* Direct match to controller */
+            if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($name)) {
+                $this->debug('Found route "%s" by controller "%s"', $route->getUrl(), $name);
+
+                return $route;
+            }
+
+            /* Using @ is most definitely a controller@method or alias@method */
+            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) */
+            $callback = $route->getCallback();
+            if (\is_string($name) === true && \is_string($callback) === true && strpos($name, '@') !== false && strpos($callback, '@') !== false && \is_callable($callback) === false) {
+
+                /* Check if the entire callback is matching */
+                if (strpos($callback, $name) === 0 || strtolower($callback) === 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;
+    }
+
+    /**
+     * 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 Url
+     * @throws InvalidArgumentException
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     */
+    public function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
+    {
+        $this->debug('Finding url', \func_get_args());
+
+        $this->fireEvents(EventHandler::EVENT_GET_URL, [
+            'name'       => $name,
+            'parameters' => $parameters,
+            'getParams'  => $getParams,
+        ]);
+
+        if ($getParams !== null && \is_array($getParams) === false) {
+            throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
+        }
+
+        if ($name === '' && $parameters === '') {
+            return new Url('/');
+        }
+
+        /* Only merge $_GET when all parameters are null */
+        if ($name === null && $parameters === null && $getParams === null) {
+            $getParams = $_GET;
+        } else {
+            $getParams = (array)$getParams;
+        }
+
+        /* Return current route if no options has been specified */
+        if ($name === null && $parameters === null) {
+            return $this->request
+                ->getUrlCopy()
+                ->setParams($getParams);
+        }
+
+        $loadedRoute = $this->request->getLoadedRoute();
+
+        /* If nothing is defined and a route is loaded we use that */
+        if ($name === null && $loadedRoute !== null) {
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name))
+                ->setParams($getParams);
+        }
+
+        /* We try to find a match on the given name */
+        $route = $this->findRoute($name);
+
+        if ($route !== null) {
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($route->findUrl($route->getMethod(), $parameters, $name))
+                ->setParams($getParams);
+        }
+
+        /* Using @ is most definitely a controller@method or alias@method */
+        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 */
+
+            /* @var $route ILoadableRoute */
+            foreach ($this->processedRoutes as $route) {
+
+                /* Check if the route contains the name/alias */
+                if ($route->hasName($controller) === true) {
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
+                }
+
+                /* Check if the route controller is equal to the name */
+                if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($controller)) {
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
+                }
+
+            }
+        }
+
+        /* No result so we assume that someone is using a hardcoded url and join everything together. */
+        $url = trim(implode('/', array_merge((array)$name, (array)$parameters)), '/');
+        $url = (($url === '') ? '/' : '/' . $url . '/');
+
+        return $this->request
+            ->getUrlCopy()
+            ->setPath($url)
+            ->setParams($getParams);
+    }
+
+    /**
+     * Get BootManagers
+     * @return array
+     */
+    public function getBootManagers(): array
+    {
+        return $this->bootManagers;
+    }
+
+    /**
+     * Set BootManagers
+     *
+     * @param array $bootManagers
+     * @return static
+     */
+    public function setBootManagers(array $bootManagers): self
+    {
+        $this->bootManagers = $bootManagers;
+
+        return $this;
+    }
+
+    /**
+     * Add BootManager
+     *
+     * @param IRouterBootManager $bootManager
+     * @return static
+     */
+    public function addBootManager(IRouterBootManager $bootManager): self
+    {
+        $this->bootManagers[] = $bootManager;
+
+        return $this;
+    }
+
+    /**
+     * Get routes that has been processed.
+     *
+     * @return array
+     */
+    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(): Request
+    {
+        return $this->request;
+    }
+
+    /**
+     * Get csrf verifier class
+     * @return BaseCsrfVerifier
+     */
+    public function getCsrfVerifier(): ?BaseCsrfVerifier
+    {
+        return $this->csrfVerifier;
+    }
+
+    /**
+     * Set csrf verifier class
+     *
+     * @param BaseCsrfVerifier $csrfVerifier
+     * @return static
+     */
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier): self
+    {
+        $this->csrfVerifier = $csrfVerifier;
+
+        return $this;
+    }
+
+    /**
+     * Set class loader
+     *
+     * @param IClassLoader $loader
+     * @return static
+     */
+    public function setClassLoader(IClassLoader $loader)
+    {
+        $this->classLoader = $loader;
+
+        return $this;
+    }
+
+    /**
+     * Get class loader
+     *
+     * @return ClassLoader
+     */
+    public function getClassLoader(): IClassLoader
+    {
+        return $this->classLoader;
+    }
+
+    /**
+     * Register event handler
+     *
+     * @param IEventHandler $handler
+     * @return static
+     */
+    public function addEventHandler(IEventHandler $handler): self
+    {
+        $this->eventHandlers[] = $handler;
+
+        return $this;
+    }
+
+    /**
+     * Get registered event-handler.
+     *
+     * @return array
+     */
+    public function getEventHandlers(): array
+    {
+        return $this->eventHandlers;
+    }
+
+    /**
+     * Fire event in event-handler.
+     *
+     * @param string $name
+     * @param array $arguments
+     */
+    protected function fireEvents($name, array $arguments = []): void
+    {
+        if (\count($this->eventHandlers) === 0) {
+            return;
+        }
+
+        /* @var IEventHandler $eventHandler */
+        foreach ($this->eventHandlers as $eventHandler) {
+            $eventHandler->fireEvents($this, $name, $arguments);
+        }
+    }
+
+    /**
+     * 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 $enabled
+     * @return static
+     */
+    public function setDebugEnabled(bool $enabled): self
+    {
+        $this->debugEnabled = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Get the list containing all debug messages.
+     *
+     * @return array
+     */
+    public function getDebugLog(): array
+    {
+        return $this->debugList;
+    }
+
+}

src/Pecee/SimpleRouter/RouterBase.php

@@ -1,363 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Middleware\BaseCsrfVerifier;
-use Pecee\Http\Request;
-
-class RouterBase {
-
-    protected static $instance;
-
-    protected $request;
-    protected $currentRoute;
-    protected $routes;
-    protected $processedRoutes;
-    protected $controllerUrlMap;
-    protected $backstack;
-    protected $loadedRoute;
-    protected $defaultNamespace;
-    protected $baseCsrfVerifier;
-
-    // TODO: make interface for controller routers, so they can be easily detected
-    // TODO: clean up - cut some of the methods down to smaller pieces
-
-    public function __construct() {
-        $this->routes = array();
-        $this->backstack = array();
-        $this->controllerUrlMap = array();
-        $this->request = Request::getInstance();
-    }
-
-    public function addRoute(RouterEntry $route) {
-        if($this->currentRoute !== null) {
-            $this->backstack[] = $route;
-        } else {
-            $this->routes[] = $route;
-        }
-    }
-
-    protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), $backStack = false, $group = null) {
-        // Loop through each route-request
-
-        $activeGroup = null;
-        $routesCount = count($routes);
-        $mergedSettings = array();
-
-        /* @var $route RouterEntry */
-        for($i = 0; $i < $routesCount; $i++) {
-
-            $route = $routes[$i];
-
-            $route->setGroup($group);
-
-            if($this->defaultNamespace && !$route->getNamespace()) {
-                $namespace = null;
-                if ($route->getNamespace()) {
-                    $namespace = $this->defaultNamespace . '\\' . $route->getNamespace();
-                } else {
-                    $namespace = $this->defaultNamespace;
-                }
-
-                $route->setNamespace($namespace);
-            }
-
-            $newPrefixes = $prefixes;
-
-            if($route->getPrefix()) {
-                array_push($newPrefixes, rtrim($route->getPrefix(), '/'));
-            }
-
-            $route->addSettings($settings);
-
-            if(!($route instanceof RouterGroup)) {
-                if(is_array($newPrefixes) && count($newPrefixes) && $backStack) {
-                    $route->setUrl( join('/', $newPrefixes) . $route->getUrl() );
-                }
-
-                $this->controllerUrlMap[] = $route;
-            }
-
-            $this->currentRoute = $route;
-
-            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
-                $route->renderRoute($this->request);
-                $activeGroup = $route;
-                $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
-            }
-
-            $this->currentRoute = null;
-
-            if(count($this->backstack)) {
-                $backStack = $this->backstack;
-                $this->backstack = array();
-
-                // Route any routes added to the backstack
-                $this->processRoutes($backStack, $mergedSettings, $newPrefixes, true, $activeGroup);
-            }
-        }
-    }
-
-    public function routeRequest() {
-
-        // Verify csrf token for request
-        if($this->baseCsrfVerifier !== null) {
-            /* @var $csrfVerifier BaseCsrfVerifier */
-            $csrfVerifier = $this->baseCsrfVerifier;
-            $csrfVerifier = new $csrfVerifier();
-            $csrfVerifier->handle($this->request);
-        }
-
-        // Loop through each route-request
-        $this->processRoutes($this->routes);
-
-        $routeNotAllowed = false;
-
-        $max = count($this->controllerUrlMap);
-
-        /* @var $route RouterEntry */
-        for($i = 0; $i < $max; $i++) {
-
-            $route = $this->controllerUrlMap[$i];
-
-            $routeMatch = $route->matchRoute($this->request);
-
-            if($routeMatch) {
-
-                if(count($route->getRequestMethods()) && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
-                    $routeNotAllowed = true;
-                    continue;
-                }
-
-                $routeNotAllowed = false;
-
-                $this->loadedRoute = $route;
-                $route->loadMiddleware($this->request);
-                $route->renderRoute($this->request);
-                break;
-            }
-        }
-
-        if($routeNotAllowed) {
-            throw new RouterException('Route or method not allowed', 403);
-        }
-
-        if(!$this->loadedRoute) {
-            throw new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultNamespace(){
-        return $this->defaultNamespace;
-    }
-
-    /**
-     * @param string $defaultNamespace
-     */
-    public function setDefaultNamespace($defaultNamespace) {
-        $this->defaultNamespace = $defaultNamespace;
-    }
-
-    /**
-     * @return RouterEntry
-     */
-    public function getLoadedRoute() {
-        if(!($this->loadedRoute instanceof RouterGroup)) {
-            return $this->loadedRoute;
-        }
-        return null;
-    }
-
-    /**
-     * @return array
-     */
-    public function getBackstack() {
-        return $this->backstack;
-    }
-
-    /**
-     * @return RouterEntry
-     */
-    public function getCurrentRoute(){
-        return $this->currentRoute;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRoutes(){
-        return $this->routes;
-    }
-
-    /**
-     * Get current request
-     *
-     * @return Request
-     */
-    public function getRequest() {
-        return $this->request;
-    }
-
-    /**
-     * Get base csrf verifier class
-     * @return BaseCsrfVerifier
-     */
-    public function getBaseCsrfVerifier() {
-        return $this->baseCsrfVerifier;
-    }
-
-    /**
-     * Set base csrf verifier class
-     *
-     * @param BaseCsrfVerifier $baseCsrfVerifier
-     * @return self
-     */
-    public function setBaseCsrfVerifier(BaseCsrfVerifier $baseCsrfVerifier) {
-        $this->baseCsrfVerifier = $baseCsrfVerifier;
-        return $this;
-    }
-
-    public function arrayToParams(array $getParams = null, $includeEmpty = true) {
-        if (is_array($getParams) && count($getParams) > 0) {
-            foreach ($getParams as $key => $val) {
-                if (!empty($val) || empty($val) && $includeEmpty) {
-                    $getParams[$key] = $key . '=' . $val;
-                }
-            }
-            return join('&', $getParams);
-        }
-        return '';
-    }
-
-    protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
-
-        $url = '/' . trim($route->getUrl(), '/');
-
-        if(($route instanceof RouterController || $route instanceof RouterResource) && $method !== null) {
-            $url .= $method;
-        }
-
-        if($route instanceof RouterController || $route instanceof RouterResource) {
-            if(count($parameters)) {
-                $url .= join('/', $parameters);
-            }
-        } else {
-            /* @var $route RouterEntry */
-            $params = $route->getParameters();
-            if(count($params)) {
-                $i = 0;
-                foreach($params as $param => $value) {
-                    $value = (isset($parameters[$param])) ? $parameters[$param] : $value;
-                    $url = str_ireplace(array('{' . $param. '}', '{' . $param. '?}'), $value, $url);
-                    $i++;
-                }
-            } else {
-                // If no parameters are specified in the route, assume that the provided parameters should be used.
-                if(count($parameters)) {
-                    $url = rtrim($url, '/') . '/' . join('/', $parameters);
-                }
-            }
-        }
-
-        $url = rtrim($url, '/') . '/';
-
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
-        }
-
-        return $url;
-    }
-
-    public function getRoute($controller = null, $parameters = null, $getParams = null) {
-
-        if($parameters !== null && !is_array($parameters)) {
-            throw new \InvalidArgumentException('Invalid type for parameter. Must be array or null');
-        }
-
-        if($getParams !== null && !is_array($getParams)) {
-            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
-        }
-
-        if($controller === null && $parameters === null && $this->loadedRoute !== null) {
-            return $this->processUrl($this->loadedRoute, null, $getParams);
-        }
-
-        $c = '';
-        $method = null;
-
-        $max = count($this->controllerUrlMap);
-
-        /* @var $route RouterRoute */
-        for($i = 0; $i < $max; $i++) {
-
-            $route = $this->controllerUrlMap[$i];
-
-            // Check an alias exist, if the matches - use it
-            if($route instanceof RouterRoute && strtolower($route->getAlias()) === strtolower($controller)) {
-                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-            }
-
-            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getCallback();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
-                $c = $route->getController();
-            }
-
-            if($c === $controller || strpos($c, $controller) === 0) {
-                return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-            }
-        }
-
-        $c = '';
-
-        // No match has yet been found, let's try to guess what url that should be returned
-        for($i = 0; $i < $max; $i++) {
-
-            $route = $this->controllerUrlMap[$i];
-
-            if($route instanceof RouterRoute && !is_callable($route->getCallback()) && stripos($route->getCallback(), '@') !== false) {
-                $c = $route->getClass();
-            } else if($route instanceof RouterController || $route instanceof RouterResource) {
-                $c = $route->getController();
-            }
-
-            if(stripos($controller, '@') !== false) {
-                $tmp = explode('@', $controller);
-                $controller = $tmp[0];
-                $method = $tmp[1];
-            }
-
-            if($controller === $c) {
-                return $this->processUrl($route, $method, $parameters, $getParams);
-            }
-        }
-
-        $controller = ($controller === null) ? '/' : $controller;
-        $url = array($controller);
-
-        if(is_array($parameters)) {
-            foreach($parameters as $key => $value) {
-                array_push($url,$value);
-            }
-        }
-
-        $url = '/' . trim(join('/', $url), '/') . '/';
-
-
-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
-        }
-
-        return $url;
-    }
-
-    public static function getInstance() {
-        if(self::$instance === null) {
-            self::$instance = new static();
-        }
-        return self::$instance;
-    }
-
-}

src/Pecee/SimpleRouter/RouterController.php

@@ -1,115 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterController extends RouterEntry {
-
-    const DEFAULT_METHOD = 'index';
-
-    protected $url;
-    protected $controller;
-    protected $method;
-
-    public function __construct($url, $controller) {
-        parent::__construct();
-        $this->url = $url;
-        $this->controller = $controller;
-    }
-
-    public function renderRoute(Request $request) {
-        if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
-
-            // When the callback is a function
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-
-            $class = $this->loadClass($className);
-            $method = $request->getMethod() . ucfirst($controller[1]);
-
-            if (!method_exists($class, $method)) {
-                throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            call_user_func_array(array($class, $method), $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
-        $url = rtrim($url['path'], '/') . '/';
-
-        if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
-
-            $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
-
-            $path = explode('/', $strippedUrl);
-
-            if(count($path)) {
-
-                $method = (!isset($path[0]) || trim($path[0]) === '') ? self::DEFAULT_METHOD : $path[0];
-                $this->method = $method;
-
-                array_shift($path);
-                $this->parameters = $path;
-
-                // Set callback
-                $this->setCallback($this->controller . '@' . $this->method);
-
-                return true;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     */
-    public function setUrl($url) {
-        $url = rtrim($url, '/') . '/';
-        $this->url = $url;
-    }
-
-    /**
-     * @return string
-     */
-    public function getController() {
-        return $this->controller;
-    }
-
-    /**
-     * @param string $controller
-     */
-    public function setController($controller) {
-        $this->controller = $controller;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMethod() {
-        return $this->method;
-    }
-
-    /**
-     * @param string $method
-     */
-    public function setMethod($method) {
-        $this->method = $method;
-    }
-
-}

src/Pecee/SimpleRouter/RouterEntry.php

@@ -1,411 +0,0 @@
-<?php
-
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-abstract class RouterEntry {
-
-    const REQUEST_TYPE_POST = 'post';
-    const REQUEST_TYPE_GET = 'get';
-    const REQUEST_TYPE_PUT = 'put';
-    const REQUEST_TYPE_PATCH = 'patch';
-    const REQUEST_TYPE_DELETE = 'delete';
-
-    public static $allowedRequestTypes = array(
-        self::REQUEST_TYPE_DELETE,
-        self::REQUEST_TYPE_GET,
-        self::REQUEST_TYPE_POST,
-        self::REQUEST_TYPE_PUT,
-        self::REQUEST_TYPE_PATCH
-    );
-
-    protected $settings;
-    protected $callback;
-
-    public function __construct() {
-        $this->settings = array();
-        $this->settings['requestMethods'] = array();
-        $this->settings['parametersRegex'] = array();
-        $this->settings['parameters'] = array();
-    }
-
-    /**
-     * Returns callback name/identifier for the current route based on the callback.
-     * Useful if you need to get a unique identifier for the loaded route, for instance
-     * when using translations etc.
-     *
-     * @return string
-     */
-    public function getIdentifier() {
-        if(strpos($this->callback, '@') !== false) {
-            return $this->callback;
-        }
-        return 'function_' . md5($this->callback);
-    }
-
-    /**
-     * @param string $callback
-     * @return self;
-     */
-    public function setCallback($callback) {
-        $this->callback = $callback;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCallback() {
-        return $this->callback;
-    }
-
-    public function getMethod() {
-        if(strpos($this->callback, '@') !== false) {
-            $tmp = explode('@', $this->callback);
-            return $tmp[1];
-        }
-        return null;
-    }
-
-    public function getClass() {
-        if(strpos($this->callback, '@') !== false) {
-            $tmp = explode('@', $this->callback);
-            return $tmp[0];
-        }
-        return null;
-    }
-
-    /**
-     * @param string $prefix
-     * @return self
-     */
-    public function setPrefix($prefix) {
-        $this->prefix = '/' . trim($prefix, '/') . '/';
-        return $this;
-    }
-
-    /**
-     * @param string $middleware
-     * @return self
-     */
-    public function setMiddleware($middleware) {
-        $this->middleware = $middleware;
-        return $this;
-    }
-
-    /**
-     * @param string $namespace
-     * @return self
-     */
-    public function setNamespace($namespace) {
-        $this->namespace = $namespace;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix() {
-        return $this->prefix;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMiddleware() {
-        return $this->middleware;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNamespace() {
-        return $this->namespace;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSettings() {
-        return $this->settings;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getParameters(){
-        return ($this->parameters === null) ? array() : $this->parameters;
-    }
-
-    /**
-     * @param mixed $parameters
-     * @return self
-     */
-    public function setParameters($parameters) {
-        $this->parameters = $parameters;
-        return $this;
-    }
-
-    /**
-     * Add regular expression parameter match
-     *
-     * @param array $options
-     * @return self
-     */
-    public function where(array $options) {
-        $this->parametersRegex = array_merge($this->parametersRegex, $options);
-        return $this;
-    }
-
-    /**
-     * Add regular expression match for url
-     *
-     * @param string $regex
-     * @return self
-     */
-    public function match($regex) {
-        $this->regexMatch = $regex;
-        return $this;
-    }
-
-    /**
-     * Get settings that are allowed to be inherited by child routes.
-     *
-     * @return array
-     */
-    public function getMergeableSettings() {
-        $settings = $this->settings;
-
-        /*if(isset($settings['middleware'])) {
-            unset($settings['middleware']);
-        }*/
-
-        if(isset($settings['prefix'])) {
-            unset($settings['prefix']);
-        }
-
-        return $settings;
-    }
-
-    /**
-     * @param array $settings
-     * @return self
-     */
-    public function addSettings(array $settings = null) {
-        if(is_array($settings)) {
-            $this->settings = array_merge($this->settings, $settings);
-        }
-        return $this;
-    }
-
-    /**
-     * @param array $settings
-     * @return self
-     */
-    public function setSettings($settings) {
-        $this->settings = $settings;
-
-        if(isset($settings['prefix'])) {
-            $this->setPrefix($settings['prefix']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Dynamically access settings value
-     *
-     * @param $name
-     * @return mixed|null
-     */
-    public function __get($name) {
-        return (isset($this->settings[$name]) ? $this->settings[$name] : null);
-    }
-
-    /**
-     * Dynamicially set settings value
-     *
-     * @param string $name
-     * @param mixed|null $value
-     */
-    public function __set($name, $value = null) {
-        $this->settings[$name] = $value;
-    }
-
-    protected function loadClass($name) {
-        if(!class_exists($name)) {
-            throw new RouterException(sprintf('Class %s does not exist', $name));
-        }
-
-        return new $name();
-    }
-
-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]*?') {
-        $parameterNames = array();
-        $regex = '';
-        $lastCharacter = '';
-        $isParameter = false;
-        $parameter = '';
-
-        // Use custom parameter regex if it exists
-        if(is_array($this->parametersRegex) && isset($this->parametersRegex[$parameter])) {
-            $parameterRegex = $this->parametersRegex[$parameter];
-        }
-
-        $routeLength = strlen($route);
-        for($i = 0; $i < $routeLength; $i++) {
-
-            $character = $route[$i];
-
-            // Skip "/" if we are at the end of a parameter
-            if($lastCharacter === '}' && $character === '/') {
-                $lastCharacter = $character;
-                continue;
-            }
-
-            if($character === '{') {
-                // Remove "/" and "\" from regex
-                if(substr($regex, strlen($regex)-1) === '/') {
-                    $regex = substr($regex, 0, strlen($regex) - 2);
-                }
-
-                $isParameter = true;
-            } elseif($isParameter && $character === '}') {
-                $required = true;
-                // Check for optional parameter
-                if($lastCharacter === '?') {
-                    $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '(?:(?:\/{0,1}(?P<'.$parameter.'>'.$parameterRegex.')){0,1}\\/{0,1})';
-                    $required = false;
-                } else {
-                    $regex .= '(?:\\/{0,1}(?P<' . $parameter . '>'. $parameterRegex .')\\/{0,1})';
-                }
-                $parameterNames[] = array('name' => $parameter, 'required' => $required);
-                $parameter = '';
-                $isParameter = false;
-
-            } elseif($isParameter) {
-                $parameter .= $character;
-            } elseif($character === '/') {
-                $regex .= '\\' . $character;
-            } else {
-                $regex .= str_replace('.', '\\.', $character);
-            }
-
-            $lastCharacter = $character;
-        }
-
-        $parameterValues = array();
-
-        if(preg_match('/^'.$regex.'$/is', $url, $parameterValues)) {
-            $parameters = array();
-
-            $max = count($parameterNames);
-
-            if($max) {
-                for($i = 0; $i < $max; $i++) {
-                    $name = $parameterNames[$i];
-                    $parameterValue = (isset($parameterValues[$name['name']]) && !empty($parameterValues[$name['name']])) ? $parameterValues[$name['name']] : null;
-
-                    if($name['required'] && $parameterValue === null) {
-                        throw new RouterException('Missing required parameter ' . $name['name'], 404);
-                    }
-
-                    $parameters[$name['name']] = $parameterValue;
-                }
-            }
-
-            return $parameters;
-        }
-
-        return null;
-    }
-
-    public function loadMiddleware(Request $request) {
-        if($this->getMiddleware()) {
-            if(is_array($this->getMiddleware())) {
-                foreach($this->getMiddleware() as $middleware) {
-                    $middleware = $this->loadClass($middleware);
-                    if (!($middleware instanceof IMiddleware)) {
-                        throw new RouterException($middleware . ' must be instance of Middleware');
-                    }
-
-                    /* @var $class IMiddleware */
-                    $middleware->handle($request);
-                }
-            } else {
-                $middleware = $this->loadClass($this->getMiddleware());
-                if (!($middleware instanceof IMiddleware)) {
-                    throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
-                }
-
-                /* @var $class IMiddleware */
-                $middleware->handle($request);
-            }
-        }
-    }
-
-    public function renderRoute(Request $request) {
-
-        if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
-
-            // When the callback is a function
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-
-            $class = $this->loadClass($className);
-            $method = $controller[1];
-
-            if (!method_exists($class, $method)) {
-                throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            call_user_func_array(array($class, $method), $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    /**
-     * Set allowed request methods
-     *
-     * @param array $methods
-     * @return self $this
-     */
-    public function setRequestMethods(array $methods) {
-        $this->settings['requestMethods'] = $methods;
-        return $this;
-    }
-
-    /**
-     * Get allowed requeset methods
-     *
-     * @return array
-     */
-    public function getRequestMethods() {
-        if(!isset($this->settings['requestMethods']) || isset($this->settings['requestMethods']) && !is_array($this->settings['requestMethods'])) {
-            $value = isset($this->settings['requestMethods']) ? $this->settings['requestMethods'] : null;
-            return array($value);
-        }
-        return $this->settings['requestMethods'];
-    }
-
-    public function getGroup() {
-        return $this->group;
-    }
-
-    public function setGroup($group) {
-        $this->group = $group;
-        return $this;
-    }
-
-    abstract function matchRoute(Request $request);
-
-}

src/Pecee/SimpleRouter/RouterException.php

@@ -1,3 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-class RouterException extends \Exception { }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterGroup extends RouterEntry {
-
-    public function __construct() {
-        parent::__construct();
-    }
-
-    protected function matchDomain(Request $request) {
-        if($this->domain !== null) {
-
-            if(is_array($this->domain)) {
-
-                $max = count($this->domain);
-
-                for($i = 0; $i < $max; $i++) {
-                    $domain = $this->domain[$i];
-
-                    $parameters = $this->parseParameters($domain, $request->getHost(), '[^.]*');
-
-                    if($parameters !== null) {
-                        $this->parameters = $parameters;
-                        return true;
-                    }
-                }
-
-                return null;
-            }
-
-            $parameters = $this->parseParameters($this->domain, $request->getHost(), '[^.]*');
-
-            if ($parameters !== null) {
-                $this->parameters = $parameters;
-                return true;
-            }
-
-            return null;
-        }
-
-        return false;
-    }
-
-    public function renderRoute(Request $request) {
-        // Check if request method is allowed
-        $hasAccess = (!$this->method);
-
-        if($this->method) {
-            if(is_array($this->method)) {
-                $hasAccess = (in_array($request->getMethod(), $this->getRequestMethods()));
-            } else {
-                $hasAccess = strtolower($this->getRequestMethods()) == strtolower($request->getMethod());
-            }
-        }
-
-        if(!$hasAccess) {
-            throw new RouterException('Method not allowed');
-        }
-
-        if($this->matchDomain($request) === null) {
-            return null;
-        }
-
-        return parent::renderRoute($request);
-    }
-
-    public function matchRoute(Request $request) {
-        return null;
-    }
-
-    public function setExceptionHandler($class) {
-        $this->exceptionHandler = $class;
-        return $this;
-    }
-
-    public function getExceptionHandler() {
-        return $this->exceptionHandler;
-    }
-
-}

src/Pecee/SimpleRouter/RouterResource.php

@@ -1,152 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterResource extends RouterEntry {
-
-    const DEFAULT_METHOD = 'index';
-
-    protected $url;
-    protected $controller;
-    protected $method;
-    protected $postMethod;
-
-    public function __construct($url, $controller) {
-        parent::__construct();
-        $this->url = $url;
-        $this->controller = $controller;
-        $this->postMethod = strtolower(($_SERVER['REQUEST_METHOD'] != 'GET') ? 'post' : 'get');
-    }
-
-    public function renderRoute(Request $request) {
-        if(is_object($this->getCallback()) && is_callable($this->getCallback())) {
-            // When the callback is a function
-            call_user_func_array($this->getCallback(), $this->getParameters());
-        } else {
-            // When the callback is a method
-            $controller = explode('@', $this->getCallback());
-            $className = $this->getNamespace() . '\\' . $controller[0];
-            $class = $this->loadClass($className);
-            $method = strtolower($controller[1]);
-
-            if (!method_exists($class, $method)) {
-                throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            call_user_func_array(array($class, $method), $this->getParameters());
-
-            return $class;
-        }
-
-        return null;
-    }
-
-    protected function call($method, $parameters) {
-        $this->setCallback($this->controller . '@' . $method);
-        $this->parameters = $parameters;
-        return true;
-    }
-
-    public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
-        $url = rtrim($url['path'], '/') . '/';
-
-        if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
-            $url = rtrim($url, '/');
-
-            $strippedUrl = trim(substr($url, strlen($this->url)), '/');
-            $path = explode('/', $strippedUrl);
-
-            $args = $path;
-            $action = '';
-
-            if(count($args)) {
-                $action = $args[0];
-                array_shift($args);
-            }
-
-            if (count($path)) {
-
-                // Delete
-                if($request->getMethod() === self::REQUEST_TYPE_DELETE && $this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('destroy', $args);
-                }
-
-                // Update
-                if(in_array($request->getMethod(), array('put', 'patch')) && $this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('update', array_merge(array($action), $args));
-                }
-
-                // Edit
-                if(isset($args[0]) && strtolower($args[0]) === 'edit' && $this->postMethod === self::REQUEST_TYPE_GET) {
-                    return $this->call('edit', array_merge(array($action), array_slice($args, 1)));
-                }
-
-                // Create
-                if(strtolower($action) === 'create' && $request->getMethod() === self::REQUEST_TYPE_GET) {
-                    return $this->call('create', $args);
-                }
-
-                // Save
-                if($this->postMethod === self::REQUEST_TYPE_POST) {
-                    return $this->call('store', $args);
-                }
-
-                // Show
-                if($action && $this->postMethod === self::REQUEST_TYPE_GET) {
-                    return $this->call('show', array_merge(array($action), $args));
-                }
-
-                // Index
-                return $this->call('index', $args);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     */
-    public function setUrl($url) {
-        $url = rtrim($url, '/') . '/';
-        $this->url = $url;
-    }
-
-    /**
-     * @return string
-     */
-    public function getController() {
-        return $this->controller;
-    }
-
-    /**
-     * @param string $controller
-     */
-    public function setController($controller) {
-        $this->controller = $controller;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMethod() {
-        return $this->method;
-    }
-
-    /**
-     * @param string $method
-     */
-    public function setMethod($method) {
-        $this->method = $method;
-    }
-
-}

src/Pecee/SimpleRouter/RouterRoute.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterRoute extends RouterEntry {
-
-    const PARAMETERS_REGEX_MATCH = '{([A-Za-z\-\_]*?)\?{0,1}}';
-
-    protected $url;
-
-    public function __construct($url, $callback) {
-        parent::__construct();
-        $this->setUrl($url);
-        $this->setCallback($callback);
-
-        $this->settings['aliases'] = array();
-    }
-
-    public function matchRoute(Request $request) {
-
-        $url = parse_url($request->getUri());
-        $url = rtrim($url['path'], '/') . '/';
-
-        // Match on custom defined regular expression
-        if($this->regexMatch) {
-            $parameters = array();
-            if(preg_match('/('.$this->regexMatch.')/is', $request->getHost() . $url, $parameters)) {
-                $this->parameters = (!is_array($parameters[0]) ? array($parameters[0]) : $parameters[0]);
-                return true;
-            }
-            return null;
-        }
-
-        // Make regular expression based on route
-        $route = rtrim($this->url, '/') . '/';
-
-        $parameters = $this->parseParameters($route, $url);
-
-        if($parameters !== null) {
-
-            if(is_array($this->parameters)) {
-                $this->parameters = array_merge($this->parameters, $parameters);
-            } else {
-                $this->parameters = $parameters;
-            }
-
-            return true;
-        }
-
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     * @return self
-     */
-    public function setUrl($url) {
-        $parameters = array();
-        $matches = array();
-
-        if(preg_match_all('/'.self::PARAMETERS_REGEX_MATCH.'/is', $url, $matches)) {
-            $parameters = $matches[1];
-        }
-
-        if(count($parameters)) {
-            $tmp = array();
-            foreach($parameters as $param) {
-                $tmp[$param] = '';
-            }
-            $this->parameters = $tmp;
-        }
-
-        $this->url = $url;
-        return $this;
-    }
-
-    /**
-     * Get alias for the url which can be used when getting the url route.
-     * @return string
-     */
-    public function getAlias(){
-        return $this->alias;
-    }
-
-    /**
-     * Set the url alias for easier getting the url route.
-     * @param string $alias
-     * @return self
-     */
-    public function setAlias($alias){
-        $this->alias = $alias;
-        return $this;
-    }
-
-    public function setSettings($settings) {
-
-        // Change as to alias
-        if(isset($settings{'as'})) {
-            $this->setAlias($settings['as']);
-        }
-
-        return parent::setSettings($settings);
-    }
-
-}

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -1,135 +1,566 @@
 <?php
-
 /**
  * ---------------------------
  * Router helper class
  * ---------------------------
- * This class is added so calls can be made statically like Router::get() making the code look more pretty.
+ *
+ * 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 DI\Container;
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
+use Pecee\Http\Response;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
+use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+use Pecee\SimpleRouter\Route\IGroupRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
+use Pecee\SimpleRouter\Route\IRoute;
+use Pecee\SimpleRouter\Route\RouteController;
+use Pecee\SimpleRouter\Route\RouteGroup;
+use Pecee\SimpleRouter\Route\RoutePartialGroup;
+use Pecee\SimpleRouter\Route\RouteResource;
+use Pecee\SimpleRouter\Route\RouteUrl;
 
-class SimpleRouter {
+class SimpleRouter
+{
+    /**
+     * Default namespace added to all routes
+     * @var string|null
+     */
+    protected static $defaultNamespace;
 
     /**
-     * Start/route request
-     * @param null $defaultNamespace
-     * @throws RouterException
+     * The response object
+     * @var Response
      */
-    public static function start($defaultNamespace = null) {
-        $router = RouterBase::getInstance();
-        $router->setDefaultNamespace($defaultNamespace);
-        $router->routeRequest();
+    protected static $response;
+
+    /**
+     * Router instance
+     * @var Router
+     */
+    protected static $router;
+
+    /**
+     * Start routing
+     *
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public static function start(): void
+    {
+        echo static::router()->start();
     }
 
     /**
-     * Set base csrf verifier
-     * @param BaseCsrfVerifier $baseCsrfVerifier
+     * Start the routing an return array with debugging-information
+     *
+     * @return array
      */
-    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier) {
-        RouterBase::getInstance()->setBaseCsrfVerifier($baseCsrfVerifier);
-    }
+    public static function startDebug(): array
+    {
+        $routerOutput = null;
 
-    public static function get($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_GET));
+        try {
+            ob_start();
+            static::router()->setDebugEnabled(true);
+            static::start();
+            $routerOutput = ob_get_contents();
+            ob_end_clean();
+        } catch (\Exception $e) {
 
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
-    }
-
-    public static function post($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_POST));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
-    }
-
-    public static function put($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_PUT, RouterRoute::REQUEST_TYPE_PATCH));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
-    }
-
-    public static function delete($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $route->setRequestMethods(array(RouterRoute::REQUEST_TYPE_DELETE));
-
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
-
-        return $route;
-    }
-
-    public static function group($settings = array(), $callback) {
-        $group = new RouterGroup();
-        $group->setCallback($callback);
-
-        if($settings !== null && is_array($settings)) {
-            $group->setSettings($settings);
         }
 
-        $router = RouterBase::getInstance();
-        $router->addRoute($group);
+        // Try to parse library version
+        $composerFile = \dirname(__DIR__, 3) . '/composer.lock';
+        $version = false;
+
+        if (is_file($composerFile) === true) {
+            $composerInfo = json_decode(file_get_contents($composerFile), true);
+
+            if (isset($composerInfo['packages']) === true && \is_array($composerInfo['packages']) === true) {
+                foreach ($composerInfo['packages'] as $package) {
+                    if (isset($package['name']) === true && strtolower($package['name']) === 'pecee/simple-router') {
+                        $version = $package['version'];
+                        break;
+                    }
+                }
+            }
+        }
+
+        $request = static::request();
+        $router = static::router();
+
+        return [
+            'url'             => $request->getUrl(),
+            'method'          => $request->getMethod(),
+            'host'            => $request->getHost(),
+            'loaded_routes'   => $request->getLoadedRoutes(),
+            'all_routes'      => $router->getRoutes(),
+            'boot_managers'   => $router->getBootManagers(),
+            'csrf_verifier'   => $router->getCsrfVerifier(),
+            'log'             => $router->getDebugLog(),
+            'event_handlers'  => $router->getEventHandlers(),
+            'router_output'   => $routerOutput,
+            'library_version' => $version,
+            'php_version'     => PHP_VERSION,
+            'server_params'   => $request->getHeaders(),
+        ];
+    }
+
+    /**
+     * Set default namespace which will be prepended to all routes.
+     *
+     * @param string $defaultNamespace
+     */
+    public static function setDefaultNamespace(string $defaultNamespace): void
+    {
+        static::$defaultNamespace = $defaultNamespace;
+    }
+
+    /**
+     * Base CSRF verifier
+     *
+     * @param BaseCsrfVerifier $baseCsrfVerifier
+     */
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
+    {
+        static::router()->setCsrfVerifier($baseCsrfVerifier);
+    }
+
+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }
+
+    /**
+     * Boot managers allows you to alter the routes before the routing occurs.
+     * Perfect if you want to load pretty-urls from a file or database.
+     *
+     * @param IRouterBootManager $bootManager
+     */
+    public static function addBootManager(IRouterBootManager $bootManager): void
+    {
+        static::router()->addBootManager($bootManager);
+    }
+
+    /**
+     * Route the given url to your callback on GET request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     *
+     * @return RouteUrl
+     */
+    public static function get(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['get'], $url, $callback, $settings);
+    }
+
+    /**
+     * Route the given url to your callback on POST request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function post(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['post'], $url, $callback, $settings);
+    }
+
+    /**
+     * Route the given url to your callback on PUT request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function put(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['put'], $url, $callback, $settings);
+    }
+
+    /**
+     * Route the given url to your callback on PATCH request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function patch(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['patch'], $url, $callback, $settings);
+    }
+
+    /**
+     * Route the given url to your callback on OPTIONS request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function options(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['options'], $url, $callback, $settings);
+    }
+
+    /**
+     * Route the given url to your callback on DELETE request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl
+     */
+    public static function delete(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['delete'], $url, $callback, $settings);
+    }
+
+    /**
+     * Groups allows for encapsulating routes with special settings.
+     *
+     * @param array $settings
+     * @param \Closure $callback
+     * @return RouteGroup
+     * @throws InvalidArgumentException
+     */
+    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);
+        $group = static::addDefaultNamespace($group);
+
+        static::router()->addRoute($group);
 
         return $group;
     }
 
-    public static function match(array $requestMethods, $url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
+    /**
+     * 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 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);
+        $group = static::addDefaultNamespace($group);
+
+        static::router()->addRoute($group);
+
+        return $group;
+    }
+
+    /**
+     * Alias for the form method
+     *
+     * @param string $url
+     * @param callable $callback
+     * @param array|null $settings
+     * @see SimpleRouter::form
+     * @return RouteUrl
+     */
+    public static function basic(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['get', 'post'], $url, $callback, $settings);
+    }
+
+    /**
+     * This type will route the given url to your callback on the provided request methods.
+     * Route the given url to your callback on POST and GET request method.
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @see SimpleRouter::form
+     * @return RouteUrl
+     */
+    public static function form(string $url, $callback, array $settings = null): IRoute
+    {
+        return static::match(['get', 'post'], $url, $callback, $settings);
+    }
+
+    /**
+     * This type will route the given url to your callback on the provided request methods.
+     *
+     * @param array $requestMethods
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl|IRoute
+     */
+    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
         $route->setRequestMethods($requestMethods);
-        $route->addSettings($settings);
+        $route = static::addDefaultNamespace($route);
 
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
+
+        static::router()->addRoute($route);
 
         return $route;
     }
 
-    public static function all($url, $callback, array $settings = null) {
-        $route = new RouterRoute($url, $callback);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+    /**
+     * This type will route the given url to your callback and allow any type of request method
+     *
+     * @param string $url
+     * @param string|\Closure $callback
+     * @param array|null $settings
+     * @return RouteUrl|IRoute
+     */
+    public static function all(string $url, $callback, array $settings = null)
+    {
+        $route = new RouteUrl($url, $callback);
+        $route = static::addDefaultNamespace($route);
+
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
+
+        static::router()->addRoute($route);
 
         return $route;
     }
 
-    public static function controller($url, $controller, array $settings = null) {
-        $route = new RouterController($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+    /**
+     * This route will route request from the given url to the controller.
+     *
+     * @param string $url
+     * @param string $controller
+     * @param array|null $settings
+     * @return RouteController|IRoute
+     */
+    public static function controller(string $url, $controller, array $settings = null)
+    {
+        $route = new RouteController($url, $controller);
+        $route = static::addDefaultNamespace($route);
+
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
+
+        static::router()->addRoute($route);
 
         return $route;
     }
 
-    public static function resource($url, $controller, array $settings = null) {
-        $route = new RouterResource($url, $controller);
-        $route->addSettings($settings);
-        $router = RouterBase::getInstance();
-        $router->addRoute($route);
+    /**
+     * This type will route all REST-supported requests to different methods in the provided controller.
+     *
+     * @param string $url
+     * @param string $controller
+     * @param array|null $settings
+     * @return RouteResource|IRoute
+     */
+    public static function resource(string $url, $controller, array $settings = null)
+    {
+        $route = new RouteResource($url, $controller);
+        $route = static::addDefaultNamespace($route);
+
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
+
+        static::router()->addRoute($route);
 
         return $route;
     }
 
-    public static function getRoute($controller = null, $parameters = null, $getParams = null) {
-        return RouterBase::getInstance()->getRoute($controller, $parameters, $getParams);
+    /**
+     * Add exception callback handler.
+     *
+     * @param \Closure $callback
+     * @return CallbackExceptionHandler $callbackHandler
+     */
+    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.
+     *
+     * 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 Url
+     */
+    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): Url
+    {
+        try {
+            return static::router()->getUrl($name, $parameters, $getParams);
+        } catch (\Exception $e) {
+            try {
+                return new Url('/');
+            } catch (MalformedUrlException $e) {
+
+            }
+        }
+
+        // This will never happen...
+        return null;
+    }
+
+    /**
+     * Get the request
+     *
+     * @return \Pecee\Http\Request
+     */
+    public static function request(): Request
+    {
+        return static::router()->getRequest();
+    }
+
+    /**
+     * Get the response object
+     *
+     * @return Response
+     */
+    public static function response(): Response
+    {
+        if (static::$response === null) {
+            static::$response = new Response(static::request());
+        }
+
+        return static::$response;
+    }
+
+    /**
+     * Returns the router instance
+     *
+     * @return Router
+     */
+    public static function router(): Router
+    {
+        if (static::$router === null) {
+            static::$router = new Router();
+        }
+
+        return static::$router;
+    }
+
+    /**
+     * Prepends the default namespace to all new routes added.
+     *
+     * @param IRoute $route
+     * @return IRoute
+     */
+    public static function addDefaultNamespace(IRoute $route): IRoute
+    {
+        if (static::$defaultNamespace !== null) {
+
+            if ($route instanceof IGroupRoute) {
+                $route->setNamespace(static::$defaultNamespace . '\\' . ltrim($route->getNamespace(), '\\'));
+
+                return $route;
+            }
+
+            $callback = $route->getCallback();
+
+            /* Only add default namespace on relative callbacks */
+            if ($callback === null || (\is_string($callback) === true && $callback[0] !== '\\')) {
+
+                $namespace = static::$defaultNamespace;
+
+                $currentNamespace = $route->getNamespace();
+
+                if ($currentNamespace !== null) {
+                    $namespace .= '\\' . $currentNamespace;
+                }
+
+                $route->setDefaultNamespace($namespace);
+
+            }
+        }
+
+        return $route;
+    }
+
+    /**
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
+     */
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public static function getDefaultNamespace(): ?string
+    {
+        return static::$defaultNamespace;
     }
 
 }

tests/Pecee/SimpleRouter/DependencyInjectionTest.php

@@ -0,0 +1,53 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+
+class DependencyInjectionTest extends \PHPUnit\Framework\TestCase
+{
+    public function testDependencyInjectionDevelopment()
+    {
+        $builder = new \DI\ContainerBuilder();
+        $container = $builder
+            ->useAutowiring(true)
+            ->ignorePhpDocErrors(true)
+            ->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+
+    public function testDependencyInjectionProduction()
+    {
+        $cacheDir = dirname(__DIR__, 2) . '/tmp';
+
+        $builder = new \DI\ContainerBuilder();
+        $builder
+            ->enableCompilation($cacheDir)
+            ->writeProxiesToFile(true, $cacheDir . '/proxies')
+            ->ignorePhpDocErrors(true)
+            ->useAutowiring(true);
+
+        $container = $builder->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+}

tests/Pecee/SimpleRouter/Dummy/DummyController.php

@@ -0,0 +1,35 @@
+<?php
+
+class DummyController
+{
+	public function method1()
+	{
+
+	}
+
+    public function method2()
+    {
+
+    }
+
+	public function param($params = null)
+	{
+		echo join(', ', func_get_args());
+	}
+
+	public function getTest()
+    {
+        echo 'getTest';
+    }
+
+    public function postTest()
+    {
+        echo 'postTest';
+    }
+
+    public function putTest()
+    {
+        echo 'putTest';
+    }
+
+}

tests/Pecee/SimpleRouter/Dummy/DummyMiddleware.php

@@ -0,0 +1,13 @@
+<?php
+require_once 'Exception/MiddlewareLoadedException.php';
+
+use Pecee\Http\Request;
+
+class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
+{
+	public function handle(Request $request) : void
+	{
+		throw new MiddlewareLoadedException('Middleware loaded!');
+	}
+
+}

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

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

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

@@ -0,0 +1,4 @@
+<?php
+class MiddlewareLoadedException extends \Exception
+{
+}

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

@@ -0,0 +1,18 @@
+<?php
+
+class ResponseException extends \Exception
+{
+    protected $response;
+
+    public function __construct($response)
+    {
+        $this->response = $response;
+        parent::__construct('', 0);
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+}

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

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

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

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

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

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

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

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

tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php

@@ -0,0 +1,32 @@
+<?php
+
+class TestBootManager implements \Pecee\SimpleRouter\IRouterBootManager
+{
+
+    protected $routes;
+    protected $aliasUrl;
+
+    public function __construct(array $routes, string $aliasUrl)
+    {
+        $this->routes = $routes;
+        $this->aliasUrl = $aliasUrl;
+    }
+
+    /**
+     * Called when router loads it's routes
+     *
+     * @param \Pecee\SimpleRouter\Router $router
+     * @param \Pecee\Http\Request $request
+     */
+    public function boot(\Pecee\SimpleRouter\Router $router, \Pecee\Http\Request $request): void
+    {
+        foreach ($this->routes as $url) {
+            // If the current url matches the rewrite url, we use our custom route
+
+            if ($request->getUrl()->contains($url) === true) {
+                $request->setRewriteUrl($this->aliasUrl);
+            }
+
+        }
+    }
+}

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

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

tests/Pecee/SimpleRouter/Dummy/ResourceController.php

@@ -0,0 +1,46 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index() : ?string
+    {
+        echo 'index';
+        return null;
+    }
+
+    public function show($id) : ?string
+    {
+        echo 'show ' . $id;
+        return null;
+    }
+
+    public function store() : ?string
+    {
+        echo 'store';
+        return null;
+    }
+
+    public function create() : ?string
+    {
+        echo 'create';
+        return null;
+    }
+
+    public function edit($id) : ?string
+    {
+        echo 'edit ' . $id;
+        return null;
+    }
+
+    public function update($id) : ?string
+    {
+        echo 'update ' . $id;
+        return null;
+    }
+
+    public function destroy($id) : ?string
+    {
+        echo 'destroy ' . $id;
+        return null;
+    }
+}

tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php

@@ -0,0 +1,41 @@
+<?php
+
+class SilentTokenProvider implements \Pecee\Http\Security\ITokenProvider {
+
+    protected $token;
+
+    public function __construct()
+    {
+        $this->refresh();
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void
+    {
+        $this->token = uniqid('', false);
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        return ($token === $this->token);
+    }
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string
+    {
+        return $this->token ?? $defaultValue;
+    }
+}

tests/Pecee/SimpleRouter/EventHandlerTest.php

@@ -0,0 +1,81 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Dummy/Security/SilentTokenProvider.php';
+require_once 'Dummy/Managers/TestBootManager.php';
+
+use \Pecee\SimpleRouter\Handlers\EventHandler;
+use \Pecee\SimpleRouter\Event\EventArgument;
+
+class EventHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testAllEventTriggered()
+    {
+        $events = EventHandler::$events;
+
+        // Remove the all event
+        unset($events[\array_search(EventHandler::EVENT_ALL, $events, true)]);
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$events) {
+            $key = \array_search($arg->getEventName(), $events, true);
+            unset($events[$key]);
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        // Add rewrite
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            // Trigger rewrite
+            $request->setRewriteUrl('/');
+
+        });
+
+        TestRouter::get('/', 'DummyController@method1')->name('home');
+
+        // Trigger findRoute
+        TestRouter::router()->findRoute('home');
+
+        // Trigger getUrl
+        TestRouter::router()->getUrl('home');
+
+        // Add csrf-verifier
+        $csrfVerifier = new \Pecee\Http\Middleware\BaseCsrfVerifier();
+        $csrfVerifier->setTokenProvider(new SilentTokenProvider());
+        TestRouter::csrfVerifier($csrfVerifier);
+
+        // Add boot-manager
+        TestRouter::addBootManager(new TestBootManager([
+            '/test',
+        ], '/'));
+
+        // Start router
+        TestRouter::debug('/non-existing');
+
+        $this->assertEquals($events, []);
+    }
+
+    public function testAllEvent()
+    {
+
+        $status = false;
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$status) {
+            $status = true;
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::debug('/');
+
+        // All event should fire for each other event
+        $this->assertEquals(true, $status);
+    }
+
+}

tests/Pecee/SimpleRouter/GroupTest.php

@@ -0,0 +1,84 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+
+class GroupTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testGroupLoad()
+    {
+        $result = false;
+
+        TestRouter::group(['prefix' => '/group'], function () use(&$result) {
+            $result = true;
+        });
+
+        try {
+            TestRouter::debug('/', 'get');
+        } catch(\Exception $e) {
+
+        }
+        $this->assertTrue($result);
+    }
+
+    public function testNestedGroup()
+    {
+
+        TestRouter::group(['prefix' => '/api'], function () {
+
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
+            });
+
+        });
+
+        TestRouter::debug('/api/v1/test', 'get');
+
+        $this->assertTrue(true);
+    }
+
+    public function testMultipleRoutes()
+    {
+
+        TestRouter::group(['prefix' => '/api'], function () {
+
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/test', 'DummyController@method1');
+            });
+
+        });
+
+        TestRouter::get('/my/match', 'DummyController@method1');
+
+        TestRouter::group(['prefix' => '/service'], function () {
+
+            TestRouter::group(['prefix' => '/v1'], function () {
+                TestRouter::get('/no-match', 'DummyController@method1');
+            });
+
+        });
+
+        TestRouter::debug('/my/match', 'get');
+
+        $this->assertTrue(true);
+    }
+
+    public function testUrls()
+    {
+        // Test array name
+        TestRouter::get('/my/fancy/url/1', 'DummyController@method1', ['as' => 'fancy1']);
+
+        // Test method name
+        TestRouter::get('/my/fancy/url/2', 'DummyController@method1')->setName('fancy2');
+
+        TestRouter::debugNoReset('/my/fancy/url/1');
+
+        $this->assertEquals('/my/fancy/url/1/', TestRouter::getUrl('fancy1'));
+        $this->assertEquals('/my/fancy/url/2/', TestRouter::getUrl('fancy2'));
+
+        TestRouter::router()->reset();
+
+    }
+
+}

tests/Pecee/SimpleRouter/InputHandlerTest.php

@@ -0,0 +1,35 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class InputHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testGet()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testPost()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testFile()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testFiles()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testAll()
+    {
+        $this->assertEquals(true, true);
+    }
+
+}

tests/Pecee/SimpleRouter/MiddlewareTest.php

@@ -0,0 +1,35 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class MiddlewareTest extends \PHPUnit\Framework\TestCase
+{
+    public function testMiddlewareFound()
+    {
+        $this->expectException(MiddlewareLoadedException::class);
+
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
+            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
+        });
+
+        TestRouter::debug('/my/test/url', 'get');
+
+    }
+
+    public function testNestedMiddlewareDontLoad()
+    {
+
+        TestRouter::group(['exceptionHandler' => 'ExceptionHandler', 'middleware' => 'DummyMiddleware'], function () {
+            TestRouter::get('/middleware', 'DummyController@method1');
+        });
+
+        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

@@ -0,0 +1,41 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+
+class RouterControllerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+require_once 'Dummy/ResourceController.php';
+
+class RouterResourceTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testResourceStore()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'post');
+
+        $this->assertEquals('store', $response);
+    }
+
+    public function testResourceCreate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/create', 'get');
+
+        $this->assertEquals('create', $response);
+
+    }
+
+    public function testResourceIndex()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource', 'get');
+
+        $this->assertEquals('index', $response);
+    }
+
+    public function testResourceDestroy()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'delete');
+
+        $this->assertEquals('destroy 38', $response);
+    }
+
+
+    public function testResourceEdit()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38/edit', 'get');
+
+        $this->assertEquals('edit 38', $response);
+
+    }
+
+    public function testResourceUpdate()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'put');
+
+        $this->assertEquals('update 38', $response);
+
+    }
+
+    public function testResourceGet()
+    {
+        TestRouter::resource('/resource', 'ResourceController');
+        $response = TestRouter::debugOutput('/resource/38', 'get');
+
+        $this->assertEquals('show 38', $response);
+
+    }
+
+}

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

@@ -0,0 +1,169 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
+
+class RouterRouteTest extends \PHPUnit\Framework\TestCase
+{
+    public function testMultiParam()
+    {
+        $result = false;
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use(&$result) {
+
+            if ($param1 === 'param1' && $param2 === 'param2') {
+                $result = true;
+            }
+
+        });
+
+        TestRouter::debug('/test-param1-param2', 'get');
+
+        $this->assertTrue($result);
+
+    }
+
+    public function testNotFound()
+    {
+        $this->expectException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        TestRouter::get('/non-existing-path', 'DummyController@method1');
+        TestRouter::debug('/test-param1-param2', 'post');
+    }
+
+    public function testGet()
+    {
+        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()
+    {
+        TestRouter::get('/my/test/url', 'DummyController@method1');
+
+        try {
+            TestRouter::debug('/my/test/url', 'post');
+        } catch (\Exception $e) {
+            $this->assertEquals(403, $e->getCode());
+        }
+    }
+
+    public function testSimpleParam()
+    {
+        TestRouter::get('/test-{param1}', 'DummyController@param');
+        $response = TestRouter::debugOutput('/test-param1', 'get');
+
+        $this->assertEquals('param1', $response);
+    }
+
+    public function testPathParamRegex()
+    {
+        TestRouter::get('/{lang}/productscategories/{name}', 'DummyController@param', ['where' => ['lang' => '[a-z]+', 'name' => '[A-Za-z0-9\-]+']]);
+        $response = TestRouter::debugOutput('/it/productscategories/system', 'get');
+
+        $this->assertEquals('it, system', $response);
+    }
+
+    public function testDomainAllowedRoute()
+    {
+        $result = false;
+        TestRouter::request()->setHost('hello.world.com');
+
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
+            });
+        });
+
+
+        TestRouter::debug('/test', 'get');
+
+        $this->assertTrue($result);
+
+    }
+
+    public function testDomainNotAllowedRoute()
+    {
+        TestRouter::request()->setHost('other.world.com');
+
+        $result = false;
+
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
+            });
+        });
+
+        TestRouter::debug('/test', 'get');
+
+        $this->assertFalse($result);
+
+    }
+
+    public function testRegEx()
+    {
+        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

@@ -0,0 +1,173 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterUrlTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testIssue253()
+    {
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
+
+        TestRouter::debugNoReset('/page/22', 'get');
+        $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/', 'get');
+        $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUnicodeCharacters()
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::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');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
+
+        TestRouter::debugNoReset('/url1', 'get');
+
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUrls()
+    {
+        // Match normal route on alias
+        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);
+
+        TestRouter::get('/about', 'DummyController@about');
+
+        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
+
+            // Match route with prefix on alias
+            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);
+
+            // Match controller with prefix and alias
+            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);
+
+            // Match controller with prefix and NO alias
+            TestRouter::controller('/pages', 'DummyController');
+
+        });
+
+        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
+
+            // Match resource controller
+            TestRouter::resource('phones', 'DummyController');
+
+        });
+
+        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+
+        // Match controller with no prefix and no alias
+        TestRouter::controller('/cats', 'CatsController');
+
+        // Pretend to load page
+        TestRouter::debugNoReset('/', 'get');
+
+        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));
+
+        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));
+
+        // Should match /
+        $this->assertEquals('/', TestRouter::getUrl('home'));
+
+        // Should match /about/
+        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));
+
+        // Should match /admin/2/
+        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
+
+        // Should match /admin/users/
+        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
+
+        // Should match /admin/users/home/
+        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
+
+        // Should match /cats/
+        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
+
+        // Should match /cats/view/
+        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
+
+        // Should match /cats/view/
+        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
+
+        // Should match /cats/view/666
+        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
+
+        // Should match /funny/man/
+        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
+
+        // Should match /?jackdaniels=true&cola=yeah
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+
+        TestRouter::router()->reset();
+
+    }
+
+}

tests/TestRouter.php

@@ -0,0 +1,43 @@
+<?php
+
+class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
+{
+
+    public static function debugNoReset($testUrl, $testMethod = 'get')
+    {
+        $request = static::request();
+
+        $request->setUrl((new \Pecee\Http\Url($testUrl))->setHost('local.unitTest'));
+        $request->setMethod($testMethod);
+
+        static::start();
+    }
+
+    public static function debug($testUrl, $testMethod = 'get')
+    {
+        try {
+            static::debugNoReset($testUrl, $testMethod);
+        } catch(\Exception $e) {
+            static::router()->reset();
+            throw $e;
+        }
+
+        static::router()->reset();
+
+    }
+
+    public static function debugOutput($testUrl, $testMethod = 'get')
+    {
+        $response = null;
+
+        // Route request
+        ob_start();
+        static::debug($testUrl, $testMethod);
+        $response = ob_get_contents();
+        ob_end_clean();
+
+        // Return response
+        return $response;
+    }
+
+}

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;