Merge pull request #391 from skipperbent/v4-development

Bugfixes
2026-06-25 12:39:16 +00:00 · 2018-03-29 22:18:26 +02:00 · 2018-03-29 22:17:53 +02:00 · 2018-03-29 21:45:26 +02:00 · 2018-03-29 21:44:41 +02:00 · 2018-03-29 21:26:37 +02:00
41 changed files with 2213 additions and 782 deletions
@@ -1,3 +1,4 @@
 .idea
 composer.lock
-vendor/
+vendor/
+tests/tmp/*
@@ -27,7 +27,8 @@
    }
  ],
  "require": {
-    "php": ">=7.1"
+    "php": ">=7.1",
+    "php-di/php-di": "^6.0"
  },
  "require-dev": {
    "phpunit/phpunit": "^6.0",
@@ -38,4 +39,4 @@
      "Pecee\\": "src/Pecee/"
    }
  }
-}
+}
@@ -1,6 +1,9 @@
 <?php

 use Pecee\SimpleRouter\SimpleRouter as Router;
+use \Pecee\Http\Url;
+use \Pecee\Http\Response;
+use \Pecee\Http\Request;

 /**
 * Get url for a route by using either name/alias, class or method name.
@@ -17,29 +20,26 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
 * @param string|null $name
 * @param string|array|null $parameters
 * @param array|null $getParams
- * @return string
+ * @return \Pecee\Http\Url
 * @throws \InvalidArgumentException
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
 */
-function url($name = null, $parameters = null, $getParams = null)
+function url(?string $name = null, $parameters = null, ?array $getParams = null): Url
 {
    return Router::getUrl($name, $parameters, $getParams);
 }

 /**
 * @return \Pecee\Http\Response
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
 */
-function response()
+function response(): Response
 {
    return Router::response();
 }

 /**
 * @return \Pecee\Http\Request
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
 */
-function request()
+function request(): Request
 {
    return Router::request();
 }
@@ -48,20 +48,23 @@ function request()
 * Get input class
 * @param string|null $index Parameter index name
 * @param string|null $defaultValue Default return value
- * @param string|array|null $methods Default method
- * @return \Pecee\Http\Input\InputHandler|string
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
+ * @param array ...$methods Default methods
+ * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
 */
-function input($index = null, $defaultValue = null, $methods = null)
+function input($index = null, $defaultValue = null, ...$methods)
 {
    if ($index !== null) {
-        return request()->getInputHandler()->get($index, $defaultValue, $methods);
+        return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
    }

    return request()->getInputHandler();
 }

-function redirect($url, $code = null)
+/**
+ * @param string $url
+ * @param int|null $code
+ */
+function redirect(string $url, ?int $code = null): void
 {
    if ($code !== null) {
        response()->httpCode($code);
@@ -73,9 +76,8 @@ function redirect($url, $code = null)
 /**
 * Get current csrf-token
 * @return string|null
- * @throws \Pecee\Http\Exceptions\MalformedUrlException
 */
-function csrf_token()
+function csrf_token(): ?string
 {
    $baseVerifier = Router::router()->getCsrfVerifier();
    if ($baseVerifier !== null) {
@@ -87,7 +87,6 @@ class InputHandler
            }

            $keys = [$key];
-
            $files = $this->rearrangeFiles($value['name'], $keys, $value);

            if (isset($list[$key]) === true) {
@@ -212,31 +211,26 @@ class InputHandler
     * Get input object
     *
     * @param string $index
-     * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return IInputItem|string
+     * @param array ...$methods
+     * @return IInputItem|null
     */
-    public function getObject(string $index, ?string $defaultValue = null, $methods = null)
+    public function get(string $index, ...$methods): ?IInputItem
    {
-        if ($methods !== null && \is_string($methods) === true) {
-            $methods = [$methods];
-        }
-
        $element = null;

-        if ($methods === null || \in_array('get', $methods, true) === true) {
+        if (\count($methods) === 0 || \in_array('get', $methods, true) === true) {
            $element = $this->findGet($index);
        }

-        if (($element === null && $methods === null) || ($methods !== null && \in_array('post', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('post', $methods, true) === true)) {
            $element = $this->findPost($index);
        }

-        if (($element === null && $methods === null) || ($methods !== null && \in_array('file', $methods, true) === true)) {
+        if (($element === null && \count($methods) === 0) || (\count($methods) === 0 && \in_array('file', $methods, true) === true)) {
            $element = $this->findFile($index);
        }

-        return $element ?? $defaultValue;
+        return $element;
    }

    /**
@@ -244,29 +238,25 @@ class InputHandler
     *
     * @param string $index
     * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return InputItem|string
+     * @param array ...$methods
+     * @return string
     */
-    public function get(string $index, ?string $defaultValue = null, $methods = null)
+    public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string
    {
-        $input = $this->getObject($index, $defaultValue, $methods);
-
-        if ($input instanceof InputItem) {
-            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
-        }
-
-        return $input;
+        $input = $this->get($index, ...$methods);
+        return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
    }

    /**
     * Check if a input-item exist
     *
     * @param string $index
+     * @param array ...$method
     * @return bool
     */
-    public function exists(string $index): bool
+    public function exists(string $index, ...$method): bool
    {
-        return ($this->getObject($index) !== null);
+        return $this->get($index, $method) !== null;
    }

    /**
@@ -276,12 +266,16 @@ class InputHandler
     */
    public function all(array $filter = null): array
    {
-        $output = $_GET + $_POST;
+        $output = $_GET;

        if ($this->request->getMethod() === 'post') {

+            // Append POST data
+            $output += $_POST;
+
            $contents = file_get_contents('php://input');

+            // Append any PHP-input json
            if (strpos(trim($contents), '{') === 0) {
                $post = json_decode($contents, true);
                if ($post !== false) {
@@ -67,14 +67,13 @@ class BaseCsrfVerifier implements IMiddleware

        if ($this->skip($request) === false && \in_array($request->getMethod(), ['post', 'put', 'delete'], true) === true) {

-            $token = $request->getInputHandler()->get(static::POST_KEY, null, 'post');
+            $token = $request->getInputHandler()->getValue(
+                static::POST_KEY,
+                $request->getHeader(static::HEADER_KEY),
+                'post'
+            );

-            // If the token is not posted, check headers for valid x-csrf-token
-            if ($token === null) {
-                $token = $request->getHeader(static::HEADER_KEY);
-            }
-
-            if ($this->tokenProvider->validate($token) === false) {
+            if ($this->tokenProvider->validate((string)$token) === false) {
                throw new TokenMismatchException('Invalid CSRF-token.');
            }

@@ -2,6 +2,7 @@

 namespace Pecee\Http;

+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Input\InputHandler;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
 use Pecee\SimpleRouter\Route\RouteUrl;
@@ -9,19 +10,58 @@ use Pecee\SimpleRouter\SimpleRouter;

 class Request
 {
+    /**
+     * Additional data
+     *
+     * @var array
+     */
    private $data = [];
+
+    /**
+     * Server headers
+     * @var array
+     */
    protected $headers = [];
+
+    /**
+     * Request host
+     * @var string
+     */
    protected $host;
+
+    /**
+     * Current request url
+     * @var Url
+     */
    protected $url;
+
+    /**
+     * Request method
+     * @var string
+     */
    protected $method;
+
+    /**
+     * Input handler
+     * @var InputHandler
+     */
    protected $inputHandler;

-    protected $hasRewrite = false;
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;

    /**
     * @var ILoadableRoute|null
     */
    protected $rewriteRoute;
+
+    /**
+     * Rewrite url
+     * @var string|null
+     */
    protected $rewriteUrl;

    /**
@@ -31,7 +71,7 @@ class Request

    /**
     * Request constructor.
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws MalformedUrlException
     */
    public function __construct()
    {
@@ -43,10 +83,10 @@ class Request
        $this->setHost($this->getHeader('http-host'));

        // Check if special IIS header exist, otherwise use default.
-        $this->setUrl($this->getHeader('unencoded-url', $this->getHeader('request-uri')));
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));

        $this->inputHandler = new InputHandler($this);
-        $this->method = strtolower($this->inputHandler->get('_method', $this->getHeader('request-method')));
+        $this->method = strtolower($this->inputHandler->getValue('_method', $this->getHeader('request-method')));
    }

    public function isSecure(): bool
@@ -62,6 +102,16 @@ class Request
        return $this->url;
    }

+    /**
+     * Copy url object
+     *
+     * @return Url
+     */
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }
+
    /**
     * @return string|null
     */
@@ -205,12 +255,15 @@ class Request
    }

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

    /**
@@ -237,7 +290,7 @@ class Request
     */
    public function setRewriteRoute(ILoadableRoute $route): self
    {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;
        $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);

        return $this;
@@ -271,7 +324,7 @@ class Request
     */
    public function setRewriteUrl(string $rewriteUrl): self
    {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;
        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';

        return $this;
@@ -284,7 +337,7 @@ class Request
     */
    public function setRewriteCallback($callback): self
    {
-        $this->hasRewrite = true;
+        $this->hasPendingRewrite = true;

        return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
    }
@@ -339,9 +392,9 @@ class Request
     *
     * @return bool
     */
-    public function hasRewrite(): bool
+    public function hasPendingRewrite(): bool
    {
-        return $this->hasRewrite;
+        return $this->hasPendingRewrite;
    }

    /**
@@ -350,9 +403,9 @@ class Request
     * @param bool $boolean
     * @return Request
     */
-    public function setHasRewrite(bool $boolean): self
+    public function setHasPendingRewrite(bool $boolean): self
    {
-        $this->hasRewrite = $boolean;
+        $this->hasPendingRewrite = $boolean;

        return $this;
    }
@@ -63,7 +63,7 @@ class CookieTokenProvider implements ITokenProvider
    public function setToken(string $token): void
    {
        $this->token = $token;
-        setcookie(static::CSRF_KEY, $token, time() + 60 * $this->cookieTimeoutMinutes, '/');
+        setcookie(static::CSRF_KEY, $token, (int)((time() + 60) * $this->cookieTimeoutMinutes), '/', ini_get('session.cookie_domain'), ini_get('session.cookie_secure'), ini_get('session.cookie_httponly'));
    }

    /**
@@ -7,36 +7,52 @@ use Pecee\Http\Exceptions\MalformedUrlException;
 class Url
 {
    private $originalUrl;
-    private $data = [
-        'scheme'   => null,
-        'host'     => null,
-        'port'     => null,
-        'user'     => null,
-        'pass'     => null,
-        'path'     => null,
-        'query'    => null,
-        'fragment' => null,
-    ];
+
+    private $scheme;
+    private $host;
+    private $port;
+    private $username;
+    private $password;
+    private $path;
+    private $params;
+    private $fragment;

    /**
     * Url constructor.
+     *
     * @param string $url
     * @throws MalformedUrlException
     */
    public function __construct(?string $url)
    {
        $this->originalUrl = $url;
-        if ($url !== null) {
-            $this->data = $this->parseUrl($url) + $this->data;

-            if (isset($this->data['path']) === true && $this->data['path'] !== '/') {
-                $this->data['path'] = rtrim($this->data['path'], '/') . '/';
+        if ($url !== null && $url !== '/') {
+            $data = $this->parseUrl($url);
+
+            $this->scheme = $data['scheme'] ?? null;
+            $this->host = $data['host'] ?? null;
+            $this->port = $data['port'] ?? null;
+            $this->username = $data['user'] ?? null;
+            $this->password = $data['pass'] ?? null;
+
+            if (isset($data['path']) === true) {
+                $this->setPath($data['path']);
+            }
+
+            $this->fragment = $data['fragment'] ?? null;
+
+            if (isset($data['query']) === true) {
+                $params = [];
+                parse_str($data['query'], $params);
+                $this->setParams($params);
            }
        }
    }

    /**
     * Check if url is using a secure protocol like https
+     *
     * @return bool
     */
    public function isSecure(): bool
@@ -46,6 +62,7 @@ class Url

    /**
     * Checks if url is relative
+     *
     * @return bool
     */
    public function isRelative(): bool
@@ -55,38 +72,94 @@ class Url

    /**
     * Get url scheme
+     *
     * @return string|null
     */
    public function getScheme(): ?string
    {
-        return $this->data['scheme'];
+        return $this->scheme;
+    }
+
+    /**
+     * Set the scheme of the url
+     *
+     * @param string $scheme
+     * @return static
+     */
+    public function setScheme(string $scheme): self
+    {
+        $this->scheme = $scheme;
+
+        return $this;
    }

    /**
     * Get url host
+     *
     * @return string|null
     */
    public function getHost(): ?string
    {
-        return $this->data['host'];
+        return $this->host;
+    }
+
+    /**
+     * Set the host of the url
+     *
+     * @param string $host
+     * @return static
+     */
+    public function setHost(string $host): self
+    {
+        $this->host = $host;
+
+        return $this;
    }

    /**
     * Get url port
+     *
     * @return int|null
     */
    public function getPort(): ?int
    {
-        return ($this->data['port'] !== null) ? (int)$this->data['port'] : null;
+        return ($this->port !== null) ? (int)$this->port : null;
+    }
+
+    /**
+     * Set the port of the url
+     *
+     * @param int $port
+     * @return static
+     */
+    public function setPort(int $port): self
+    {
+        $this->port = $port;
+
+        return $this;
    }

    /**
     * Parse username from url
+     *
     * @return string|null
     */
-    public function getUserName(): ?string
+    public function getUsername(): ?string
    {
-        return $this->data['user'];
+        return $this->username;
+    }
+
+    /**
+     * Set the username of the url
+     *
+     * @param string $username
+     * @return static
+     */
+    public function setUsername(string $username): self
+    {
+        $this->username = $username;
+
+        return $this;
    }

    /**
@@ -95,7 +168,20 @@ class Url
     */
    public function getPassword(): ?string
    {
-        return $this->data['pass'];
+        return $this->password;
+    }
+
+    /**
+     * Set the url password
+     *
+     * @param string $password
+     * @return static
+     */
+    public function setPassword(string $password): self
+    {
+        $this->password = $password;
+
+        return $this;
    }

    /**
@@ -104,25 +190,87 @@ class Url
     */
    public function getPath(): ?string
    {
-        return $this->data['path'] ?? '/';
+        return $this->path ?? '/';
    }

    /**
-     * Get querystring from url
-     * @return string|null
+     * Set the url path
+     *
+     * @param string $path
+     * @return static
     */
-    public function getQueryString(): ?string
+    public function setPath(string $path): self
    {
-        return $this->data['query'];
+        $this->path = rtrim($path, '/') . '/';
+
+        return $this;
+    }
+
+    /**
+     * Get query-string from url
+     *
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->params;
+    }
+
+    /**
+     * Merge parameters array
+     *
+     * @param array $params
+     * @return static
+     */
+    public function mergeParams(array $params): self
+    {
+        return $this->setParams(array_merge($this->getParams(), $params));
+    }
+
+    /**
+     * Set the url params
+     *
+     * @param array $params
+     * @return static
+     */
+    public function setParams(array $params): self
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * Get query-string params as string
+     *
+     * @return string
+     */
+    public function getQueryString(): string
+    {
+        return static::arrayToParams($this->getParams());
    }

    /**
     * Get fragment from url (everything after #)
+     *
     * @return string|null
     */
    public function getFragment(): ?string
    {
-        return $this->data['fragment'];
+        return $this->fragment;
+    }
+
+    /**
+     * Set url fragment
+     *
+     * @param string $fragment
+     * @return static
+     */
+    public function setFragment(string $fragment): self
+    {
+        $this->fragment = $fragment;
+
+        return $this;
    }

    /**
@@ -133,32 +281,6 @@ class Url
        return $this->originalUrl;
    }

-    /**
-     * UTF-8 aware parse_url() replacement.
-     * @param string $url
-     * @param int $component
-     * @throws MalformedUrlException
-     * @return array
-     */
-    public function parseUrl(string $url, int $component = -1): array
-    {
-        $encodedUrl = preg_replace_callback(
-            '/[^:\/@?&=#]+/u',
-            function ($matches) {
-                return urlencode($matches[0]);
-            },
-            $url
-        );
-
-        $parts = parse_url($encodedUrl, $component);
-
-        if ($parts === false) {
-            throw new MalformedUrlException('Malformed URL: ' . $url);
-        }
-
-        return array_map('urldecode', $parts);
-    }
-
    /**
     * Get position of value.
     * Returns -1 on failure.
@@ -185,17 +307,143 @@ class Url
    }

    /**
-     * Returns data array with information about the url
-     * @return array
+     * Check if url contains parameter/query string.
+     *
+     * @param string $name
+     * @return bool
     */
-    public function getData(): array
+    public function hasParam(string $name): bool
    {
-        return $this->data;
+        return \in_array($name, $this->getParams(), true);
+    }
+
+    /**
+     * Removes parameter from query-string
+     *
+     * @param string $name
+     */
+    public function removeParam(string $name): void
+    {
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                unset($params[$key]);
+                $this->setParams($params);
+            }
+        }
+    }
+
+    /**
+     * Get parameter by name.
+     * Returns parameter value or default value.
+     *
+     * @param string $name
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getParam(string $name, ?string $defaultValue = null): ?string
+    {
+        $output = null;
+
+        if ($this->hasParam($name) === true) {
+            $params = $this->getParams();
+            $key = \array_search($name, $params, true);
+
+            if ($key === true) {
+                $output = $params[$key];
+            }
+        }
+
+        return $output ?? $defaultValue;
+    }
+
+    /**
+     * UTF-8 aware parse_url() replacement.
+     * @param string $url
+     * @param int $component
+     * @return array
+     * @throws MalformedUrlException
+     */
+    public function parseUrl(string $url, int $component = -1): array
+    {
+        $encodedUrl = preg_replace_callback(
+            '/[^:\/@?&=#]+/u',
+            function ($matches) {
+                return urlencode($matches[0]);
+            },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl, $component);
+
+        if ($parts === false) {
+            throw new MalformedUrlException(sprintf('Failed to parse url: "%s"', $url));
+        }
+
+        return array_map('urldecode', $parts);
+    }
+
+    /**
+     * Convert array to query-string params
+     *
+     * @param array $getParams
+     * @param bool $includeEmpty
+     * @return string
+     */
+    public static function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
+    {
+        if (\count($getParams) !== 0) {
+
+            if ($includeEmpty === false) {
+                $getParams = array_filter($getParams, function ($item) {
+                    return (trim($item) !== '');
+                });
+            }
+
+            return http_build_query($getParams);
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns the relative url
+     *
+     * @return string
+     */
+    public function getRelativeUrl(): string
+    {
+        $params = $this->getQueryString();
+
+        $path = $this->path ?? '';
+        $query = $params !== '' ? '?' . $params : '';
+        $fragment = $this->fragment !== null ? '#' . $this->fragment : '';
+
+        return $path . $query . $fragment;
+    }
+
+    /**
+     * Returns the absolute url
+     *
+     * @return string
+     */
+    public function getAbsoluteUrl(): string
+    {
+        $scheme = $this->scheme !== null ? $this->scheme . '://' : '';
+        $host = $this->host ?? '';
+        $port = $this->port !== null ? ':' . $this->port : '';
+        $user = $this->username ?? '';
+        $pass = $this->password !== null ? ':' . $this->password : '';
+        $pass = ($user || $pass) ? $pass . '@' : '';
+
+        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
    }

    public function __toString()
    {
-        return $this->getOriginalUrl();
+        return $this->getRelativeUrl();
    }

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

-namespace Pecee\Handlers;
+namespace Pecee\SimpleRouter\Handlers;

 use Pecee\Http\Request;

@@ -10,7 +10,7 @@ use Pecee\Http\Request;
 * Class is used to create callbacks which are fired when an exception is reached.
 * This allows for easy handling 404-exception etc. without creating an custom ExceptionHandler.
 *
- * @package Pecee\Handlers
+ * @package \Pecee\SimpleRouter\Handlers
 */
 class CallbackExceptionHandler implements IExceptionHandler
 {
@@ -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;
+    }
+
+}
@@ -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));
+        }
+    }
+
+}
@@ -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;
+
+}
@@ -1,6 +1,6 @@
 <?php

-namespace Pecee\Handlers;
+namespace Pecee\SimpleRouter\Handlers;

 use Pecee\Http\Request;

@@ -9,7 +9,8 @@ interface IRouterBootManager
    /**
     * Called when router loads it's routes
     *
+     * @param Router $router
     * @param Request $request
     */
-    public function boot(Request $request): void;
+    public function boot(Router $router, Request $request): void;
 }
@@ -2,8 +2,8 @@

 namespace Pecee\SimpleRouter\Route;

-use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;

 interface IGroupRoute extends IRoute
 {
@@ -12,11 +12,11 @@ interface ILoadableRoute extends IRoute
     * Used when calling the url() helper.
     *
     * @param string|null $method
-     * @param array|null $parameters
+     * @param array|string|null $parameters
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null): string;
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string;

    /**
     * Loads and renders middleware-classes
@@ -35,16 +35,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        foreach ($this->getMiddlewares() as $middleware) {

            if (\is_object($middleware) === false) {
-                $middleware = $this->loadClass($middleware);
+                $middleware = $router->getClassLoader()->loadClass($middleware);
            }

            if (($middleware instanceof IMiddleware) === false) {
                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
            }

-            $router->debug('Loading middleware "%s"', \get_class($middleware));
+            $className = \get_class($middleware);
+
+            $router->debug('Loading middleware "%s"', $className);
            $middleware->handle($request);
-            $router->debug('Finished loading middleware');
+            $router->debug('Finished loading middleware "%s"', $className);
        }

        $router->debug('Finished loading middlewares');
@@ -97,7 +99,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = $this->getUrl();

@@ -57,21 +57,6 @@ abstract class Route implements IRoute
    protected $originalParameters = [];
    protected $middlewares = [];

-    /**
-     * Load class by name
-     * @param string $name
-     * @return mixed
-     * @throws NotFoundHttpException
-     */
-    protected function loadClass($name)
-    {
-        if (class_exists($name) === false) {
-            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $name), 404);
-        }
-
-        return new $name();
-    }
-
    /**
     * Render route
     *
@@ -82,7 +67,7 @@ abstract class Route implements IRoute
     */
    public function renderRoute(Request $request, Router $router): ?string
    {
-        $router->debug('Starting rendering route');
+        $router->debug('Starting rendering route "%s"', \get_class($this));

        $callback = $this->getCallback();

@@ -107,7 +92,7 @@ abstract class Route implements IRoute

            /* When the callback is a function */

-            return \call_user_func_array($callback, $parameters);
+            return $router->getClassLoader()->loadClosure($callback, $parameters);
        }

        /* When the callback is a class + method */
@@ -118,7 +103,8 @@ abstract class Route implements IRoute
        $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];

        $router->debug('Loading class %s', $className);
-        $class = $this->loadClass($className);
+        $class = $router->getClassLoader()->loadClass($className);
+
        $method = $controller[1];

        if (method_exists($class, $method) === false) {
@@ -136,7 +122,7 @@ abstract class Route implements IRoute

        $parameters = [];

-        // Ensures that hostnames/domains will work with parameters
+        // Ensures that host names/domains will work with parameters
        $url = '/' . ltrim($url, '/');

        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
@@ -49,7 +49,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        if (strpos($name, '.') !== false) {
            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
@@ -2,8 +2,8 @@

 namespace Pecee\SimpleRouter\Route;

-use Pecee\Handlers\IExceptionHandler;
 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;

 class RouteGroup extends Route implements IGroupRoute
 {
@@ -6,7 +6,14 @@ use Pecee\Http\Request;

 class RoutePartialGroup extends RouteGroup implements IPartialGroupRoute
 {
-    protected $urlRegex = '/^%s\/?/u';
+
+    /**
+     * RoutePartialGroup constructor.
+     */
+    public function __construct()
+    {
+        $this->urlRegex = '/^%s\/?/u';
+    }

    /**
     * Method called to check if route matches
@@ -60,7 +60,13 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        return (strtolower($this->name) === strtolower($name));
    }

-    public function findUrl($method = null, $parameters = null, $name = null): string
+    /**
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = array_search($name, $this->names, false);
        if ($url !== false) {
@@ -3,11 +3,17 @@
 namespace Pecee\SimpleRouter;

 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\IExceptionHandler;
+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;
@@ -27,32 +33,32 @@ class Router
     * Defines if a route is currently being processed.
     * @var bool
     */
-    protected $processingRoute;
+    protected $isProcessingRoute;

    /**
     * All added routes
     * @var array
     */
-    protected $routes;
+    protected $routes = [];

    /**
     * List of processed routes
     * @var array
     */
-    protected $processedRoutes;
+    protected $processedRoutes = [];

    /**
     * Stack of routes used to keep track of sub-routes added
     * when a route is being processed.
     * @var array
     */
-    protected $routeStack;
+    protected $routeStack = [];

    /**
     * List of added bootmanagers
     * @var array
     */
-    protected $bootManagers;
+    protected $bootManagers = [];

    /**
     * Csrf verifier class
@@ -64,7 +70,7 @@ class Router
     * Get exception handlers
     * @var array
     */
-    protected $exceptionHandlers;
+    protected $exceptionHandlers = [];

    /**
     * List of loaded exception that has been loaded.
@@ -72,7 +78,7 @@ class Router
     *
     * @var array
     */
-    protected $loadedExceptionHandlers;
+    protected $loadedExceptionHandlers = [];

    /**
     * Enable or disabled debugging
@@ -92,9 +98,20 @@ class Router
     */
    protected $debugList = [];

+    /**
+     * Contains any registered event-handler.
+     * @var array
+     */
+    protected $eventHandlers = [];
+
+    /**
+     * Class loader instance
+     * @var ClassLoader
+     */
+    protected $classLoader;
+
    /**
     * Router constructor.
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public function __construct()
    {
@@ -102,18 +119,29 @@ class Router
    }

    /**
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * Resets the router by reloading request and clearing all routes and data.
     */
    public function reset(): void
    {
-        $this->processingRoute = false;
-        $this->request = new Request();
+        $this->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();
    }

    /**
@@ -127,7 +155,7 @@ class Router
         * If a route is currently being processed, that means that the route being added are rendered from the parent
         * routes callback, so we add them to the stack instead.
         */
-        if ($this->processingRoute === true) {
+        if ($this->isProcessingRoute === true) {
            $this->routeStack[] = $route;

            return $route;
@@ -147,9 +175,9 @@ class Router
    protected function renderAndProcess(IRoute $route): void
    {

-        $this->processingRoute = true;
+        $this->isProcessingRoute = true;
        $route->renderRoute($this->request, $this);
-        $this->processingRoute = false;
+        $this->isProcessingRoute = false;

        if (\count($this->routeStack) !== 0) {

@@ -239,46 +267,90 @@ class Router
    {
        $this->debug('Loading routes');

+        $this->fireEvents(EventHandler::EVENT_BOOT, [
+            'bootmanagers' => $this->bootManagers,
+        ]);
+
        /* Initialize boot-managers */
+
        /* @var $manager IRouterBootManager */
        foreach ($this->bootManagers as $manager) {
-            $this->debug('Rendering bootmanager %s', \get_class($manager));
-            $manager->boot($this->request);
-            $this->debug('Finished rendering bootmanager');
+
+            $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
     *
-     * @param bool $rewrite
     * @return string|null
     * @throws HttpException
     * @throws \Exception
     */
-    public function routeRequest(bool $rewrite = false): ?string
+    public function routeRequest(): ?string
    {
-        $this->debug('Started routing request (rewrite: %s)', $rewrite === true ? 'yes' : 'no');
+        $this->debug('Routing request');

        $methodNotAllowed = false;

        try {
-
-            if ($rewrite === false) {
-                $this->loadRoutes();
-
-                if ($this->csrfVerifier !== null) {
-
-                    /* Verify csrf token for request */
-                    $this->csrfVerifier->handle($this->request);
-                }
-            }
-
            $url = $this->request->getRewriteUrl() ?? $this->request->getUrl()->getPath();

            /* @var $route ILoadableRoute */
@@ -289,6 +361,10 @@ class Router
                /* 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());
@@ -296,6 +372,11 @@ class Router
                        continue;
                    }

+                    $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARES, [
+                        'route'       => $route,
+                        'middlewares' => $route->getMiddlewares(),
+                    ]);
+
                    $route->loadMiddleware($this->request, $this);

                    $output = $this->handleRouteRewrite($key, $url);
@@ -303,13 +384,15 @@ class Router
                        return $output;
                    }

-                    /* Render route */
                    $methodNotAllowed = false;

                    $this->request->addLoadedRoute($route);

-                    $output = $route->renderRoute($this->request, $this);
+                    $this->fireEvents(EventHandler::EVENT_RENDER_ROUTE, [
+                        'route' => $route,
+                    ]);

+                    $output = $route->renderRoute($this->request, $this);
                    if ($output !== null) {
                        return $output;
                    }
@@ -360,7 +443,7 @@ class Router
    protected function handleRouteRewrite($key, string $url): ?string
    {
        /* If the request has changed */
-        if ($this->request->hasRewrite() === false) {
+        if ($this->request->hasPendingRewrite() === false) {
            return null;
        }

@@ -373,9 +456,14 @@ class Router

        if ($this->request->getRewriteUrl() !== $url) {
            unset($this->processedRoutes[$key]);
-            $this->request->setHasRewrite(false);
+            $this->request->setHasPendingRewrite(false);

-            return $this->routeRequest(true);
+            $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                'rewriteUrl'   => $this->request->getRewriteUrl(),
+                'rewriteRoute' => $this->request->getRewriteRoute(),
+            ]);
+
+            return $this->routeRequest();
        }

        return null;
@@ -391,6 +479,11 @@ class Router
    {
        $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) {

@@ -398,6 +491,12 @@ class Router
                $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) {
@@ -410,12 +509,17 @@ class Router
                $handler->handleError($this->request, $e);
                $this->debug('Finished rendering exception-handler');

-                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasRewrite() === true) {
+                if (isset($this->loadedExceptionHandlers[$key]) === false && $this->request->hasPendingRewrite() === true) {
                    $this->loadedExceptionHandlers[$key] = $handler;

                    $this->debug('Exception handler contains rewrite, reloading routes');

-                    return $this->routeRequest(true);
+                    $this->fireEvents(EventHandler::EVENT_REWRITE, [
+                        'rewriteUrl'   => $this->request->getRewriteUrl(),
+                        'rewriteRoute' => $this->request->getRewriteRoute(),
+                    ]);
+
+                    return $this->routeRequest();
                }

            } catch (\Exception $e) {
@@ -429,22 +533,6 @@ class Router
        throw $e;
    }

-    public function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
-    {
-        if (\count($getParams) !== 0) {
-
-            if ($includeEmpty === false) {
-                $getParams = array_filter($getParams, function ($item) {
-                    return (trim($item) !== '');
-                });
-            }
-
-            return '?' . http_build_query($getParams);
-        }
-
-        return '';
-    }
-
    /**
     * Find route by alias, class, callback or method.
     *
@@ -453,9 +541,12 @@ class Router
     */
    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) {

@@ -485,10 +576,11 @@ class Router
            }

            /* Check if callback matches (if it's not a function) */
-            if (\is_string($name) === true && \is_string($route->getCallback()) && strpos($name, '@') !== false && strpos($route->getCallback(), '@') !== false && \is_callable($route->getCallback()) === false) {
+            $callback = $route->getCallback();
+            if (\is_string($name) === true && \is_string($callback) === true && strpos($name, '@') !== false && strpos($callback, '@') !== false && \is_callable($callback) === false) {

                /* Check if the entire callback is matching */
-                if (strpos($route->getCallback(), $name) === 0 || strtolower($route->getCallback()) === strtolower($name)) {
+                if (strpos($callback, $name) === 0 || strtolower($callback) === strtolower($name)) {
                    $this->debug('Found route "%s" by callback "%s"', $route->getUrl(), $name);

                    return $route;
@@ -523,19 +615,26 @@ class Router
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
+     * @return Url
     * @throws InvalidArgumentException
-     * @return string
+     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
-    public function getUrl(?string $name = null, $parameters = null, $getParams = null): string
+    public function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
    {
        $this->debug('Finding url', \func_get_args());

+        $this->fireEvents(EventHandler::EVENT_GET_URL, [
+            '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 '/';
+            return new Url('/');
        }

        /* Only merge $_GET when all parameters are null */
@@ -547,21 +646,29 @@ class Router

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

        $loadedRoute = $this->request->getLoadedRoute();

        /* If nothing is defined and a route is loaded we use that */
        if ($name === null && $loadedRoute !== null) {
-            return $loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($loadedRoute->findUrl($loadedRoute->getMethod(), $parameters, $name))
+                ->setParams($getParams);
        }

        /* We try to find a match on the given name */
        $route = $this->findRoute($name);

        if ($route !== null) {
-            return $route->findUrl($route->getMethod(), $parameters, $name) . $this->arrayToParams($getParams);
+            return $this->request
+                ->getUrlCopy()
+                ->setPath($route->findUrl($route->getMethod(), $parameters, $name))
+                ->setParams($getParams);
        }

        /* Using @ is most definitely a controller@method or alias@method */
@@ -575,12 +682,18 @@ class Router

                /* Check if the route contains the name/alias */
                if ($route->hasName($controller) === true) {
-                    return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
                }

                /* Check if the route controller is equal to the name */
                if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($controller)) {
-                    return $route->findUrl($method, $parameters, $name) . $this->arrayToParams($getParams);
+                    return $this->request
+                        ->getUrlCopy()
+                        ->setPath($route->findUrl($method, $parameters, $name))
+                        ->setParams($getParams);
                }

            }
@@ -588,8 +701,12 @@ class Router

        /* No result so we assume that someone is using a hardcoded url and join everything together. */
        $url = trim(implode('/', array_merge((array)$name, (array)$parameters)), '/');
+        $url = (($url === '') ? '/' : '/' . $url . '/');

-        return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
+        return $this->request
+            ->getUrlCopy()
+            ->setPath($url)
+            ->setParams($getParams);
    }

    /**
@@ -603,20 +720,28 @@ class Router

    /**
     * Set BootManagers
+     *
     * @param array $bootManagers
+     * @return static
     */
-    public function setBootManagers(array $bootManagers): void
+    public function setBootManagers(array $bootManagers): self
    {
        $this->bootManagers = $bootManagers;
+
+        return $this;
    }

    /**
     * Add BootManager
+     *
     * @param IRouterBootManager $bootManager
+     * @return static
     */
-    public function addBootManager(IRouterBootManager $bootManager): void
+    public function addBootManager(IRouterBootManager $bootManager): self
    {
        $this->bootManagers[] = $bootManager;
+
+        return $this;
    }

    /**
@@ -675,13 +800,77 @@ class Router
     * @param BaseCsrfVerifier $csrfVerifier
     * @return static
     */
-    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier)
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier): self
    {
        $this->csrfVerifier = $csrfVerifier;

        return $this;
    }

+    /**
+     * Set class loader
+     *
+     * @param IClassLoader $loader
+     * @return static
+     */
+    public function setClassLoader(IClassLoader $loader)
+    {
+        $this->classLoader = $loader;
+
+        return $this;
+    }
+
+    /**
+     * Get class loader
+     *
+     * @return ClassLoader
+     */
+    public function getClassLoader(): IClassLoader
+    {
+        return $this->classLoader;
+    }
+
+    /**
+     * Register event handler
+     *
+     * @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
@@ -704,15 +893,14 @@ class Router
    /**
     * Enable or disables debugging
     *
-     * @param bool $boolean
+     * @param bool $enabled
+     * @return static
     */
-    public function setDebugEnabled(bool $boolean): void
+    public function setDebugEnabled(bool $enabled): self
    {
-        if ($boolean === true) {
-            $this->debugStartTime = microtime(true);
-        }
+        $this->debugEnabled = $enabled;

-        $this->debugEnabled = $boolean;
+        return $this;
    }

    /**
@@ -10,12 +10,17 @@

 namespace Pecee\SimpleRouter;

+use DI\Container;
 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\CallbackExceptionHandler;
+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;
@@ -48,20 +53,20 @@ class SimpleRouter
    /**
     * Start routing
     *
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
     * @throws HttpException
     * @throws \Exception
     */
    public static function start(): void
    {
-        echo static::router()->routeRequest();
+        echo static::router()->start();
    }

    /**
     * Start the routing an return array with debugging-information
     *
     * @return array
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function startDebug(): array
    {
@@ -94,19 +99,23 @@ class SimpleRouter
            }
        }

+        $request = static::request();
+        $router = static::router();
+
        return [
-            'url'             => static::request()->getUrl(),
-            'method'          => static::request()->getMethod(),
-            'host'            => static::request()->getHost(),
-            'loaded_routes'   => static::request()->getLoadedRoutes(),
-            'all_routes'      => static::router()->getRoutes(),
-            'boot_managers'   => static::router()->getBootManagers(),
-            'csrf_verifier'   => static::router()->getCsrfVerifier(),
-            'log'             => static::router()->getDebugLog(),
+            'url'             => $request->getUrl(),
+            'method'          => $request->getMethod(),
+            'host'            => $request->getHost(),
+            'loaded_routes'   => $request->getLoadedRoutes(),
+            'all_routes'      => $router->getRoutes(),
+            'boot_managers'   => $router->getBootManagers(),
+            'csrf_verifier'   => $router->getCsrfVerifier(),
+            'log'             => $router->getDebugLog(),
+            'event_handlers'  => $router->getEventHandlers(),
            'router_output'   => $routerOutput,
            'library_version' => $version,
            'php_version'     => PHP_VERSION,
-            'server_params'   => static::request()->getHeaders(),
+            'server_params'   => $request->getHeaders(),
        ];
    }

@@ -124,19 +133,27 @@ class SimpleRouter
     * Base CSRF verifier
     *
     * @param BaseCsrfVerifier $baseCsrfVerifier
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
    {
        static::router()->setCsrfVerifier($baseCsrfVerifier);
    }

+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }
+
    /**
     * Boot managers allows you to alter the routes before the routing occurs.
     * Perfect if you want to load pretty-urls from a file or database.
     *
     * @param IRouterBootManager $bootManager
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function addBootManager(IRouterBootManager $bootManager): void
    {
@@ -151,7 +168,6 @@ class SimpleRouter
     * @param array|null $settings
     *
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function get(string $url, $callback, array $settings = null): IRoute
    {
@@ -165,7 +181,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function post(string $url, $callback, array $settings = null): IRoute
    {
@@ -179,7 +194,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function put(string $url, $callback, array $settings = null): IRoute
    {
@@ -193,7 +207,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function patch(string $url, $callback, array $settings = null): IRoute
    {
@@ -207,7 +220,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function options(string $url, $callback, array $settings = null): IRoute
    {
@@ -221,7 +233,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function delete(string $url, $callback, array $settings = null): IRoute
    {
@@ -234,7 +245,6 @@ class SimpleRouter
     * @param array $settings
     * @param \Closure $callback
     * @return RouteGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws InvalidArgumentException
     */
    public static function group(array $settings = [], \Closure $callback): IGroupRoute
@@ -260,7 +270,6 @@ class SimpleRouter
     * @param \Closure $callback
     * @param array $settings
     * @return RoutePartialGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws InvalidArgumentException
     */
    public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
@@ -288,7 +297,6 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function basic(string $url, $callback, array $settings = null): IRoute
    {
@@ -304,7 +312,6 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function form(string $url, $callback, array $settings = null): IRoute
    {
@@ -319,7 +326,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
    {
@@ -343,7 +349,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function all(string $url, $callback, array $settings = null)
    {
@@ -366,7 +371,6 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteController|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function controller(string $url, $controller, array $settings = null)
    {
@@ -389,7 +393,6 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteResource|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function resource(string $url, $controller, array $settings = null)
    {
@@ -410,7 +413,6 @@ class SimpleRouter
     *
     * @param \Closure $callback
     * @return CallbackExceptionHandler $callbackHandler
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function error(\Closure $callback): CallbackExceptionHandler
    {
@@ -443,20 +445,28 @@ class SimpleRouter
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
-     * @throws \Pecee\Exceptions\InvalidArgumentException
-     * @return string
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @return Url
     */
-    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): string
+    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): Url
    {
-        return static::router()->getUrl($name, $parameters, $getParams);
+        try {
+            return static::router()->getUrl($name, $parameters, $getParams);
+        } catch (\Exception $e) {
+            try {
+                return new Url('/');
+            } catch (MalformedUrlException $e) {
+
+            }
+        }
+
+        // This will never happen...
+        return null;
    }

    /**
     * Get the request
     *
     * @return \Pecee\Http\Request
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function request(): Request
    {
@@ -467,7 +477,6 @@ class SimpleRouter
     * Get the response object
     *
     * @return Response
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function response(): Response
    {
@@ -482,7 +491,6 @@ class SimpleRouter
     * Returns the router instance
     *
     * @return Router
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function router(): Router
    {
@@ -524,6 +532,20 @@ class SimpleRouter
        return $route;
    }

+    /**
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
+     */
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
    /**
     * Get default namespace
     * @return string|null
@@ -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);
+    }
+}
@@ -1,6 +1,6 @@
 <?php

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

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

-		$request->setUrl('/');
+		$request->setUrl(new \Pecee\Http\Url('/'));
 	}

 }
@@ -1,13 +1,13 @@
 <?php

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

-        $request->setUrl('/');
+        $request->setUrl(new \Pecee\Http\Url('/'));
 	}

 }
@@ -1,6 +1,6 @@
 <?php

-class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerThird implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
@@ -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);
+            }
+
+        }
+    }
+}
@@ -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;
+    }
+}
@@ -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);
+    }
+
+}
@@ -5,14 +5,13 @@ require_once 'Dummy/DummyController.php';

 class GroupTest extends \PHPUnit\Framework\TestCase
 {
-    protected $result;

    public function testGroupLoad()
    {
-        $this->result = false;
+        $result = false;

-        TestRouter::group(['prefix' => '/group'], function () {
-            $this->result = true;
+        TestRouter::group(['prefix' => '/group'], function () use(&$result) {
+            $result = true;
        });

        try {
@@ -20,7 +19,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
        } catch(\Exception $e) {

        }
-        $this->assertTrue($this->result);
+        $this->assertTrue($result);
    }

    public function testNestedGroup()
@@ -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);
+    }
+
+}
@@ -6,21 +6,20 @@ require_once 'Dummy/Exception/ExceptionHandlerException.php';

 class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
-    protected $result = false;
-
    public function testMultiParam()
    {
-        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {
+        $result = false;
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use(&$result) {

            if ($param1 === 'param1' && $param2 === 'param2') {
-                $this->result = true;
+                $result = true;
            }

        });

        TestRouter::debug('/test-param1-param2', 'get');

-        $this->assertTrue($this->result);
+        $this->assertTrue($result);

    }

@@ -92,37 +91,37 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase

    public function testDomainAllowedRoute()
    {
-        $this->result = false;
+        $result = false;
+        TestRouter::request()->setHost('hello.world.com');

-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            TestRouter::get('/test', function ($subdomain = null) {
-                $this->result = ($subdomain === 'hello');
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
            });
        });

-        TestRouter::request()->setHost('hello.world.com');
+
        TestRouter::debug('/test', 'get');

-        $this->assertTrue($this->result);
+        $this->assertTrue($result);

    }

    public function testDomainNotAllowedRoute()
    {
-        $this->result = false;
+        TestRouter::request()->setHost('other.world.com');

-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () {
-            TestRouter::get('/test', function ($subdomain = null) {
-                $this->result = ($subdomain === 'hello');
+        $result = false;
+
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+                $result = ($subdomain === 'hello');
            });
        });

-        TestRouter::request()->setHost('other.world.com');
-
-
        TestRouter::debug('/test', 'get');

-        $this->assertFalse($this->result);
+        $this->assertFalse($result);

    }

@@ -5,8 +5,10 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter

    public static function debugNoReset($testUrl, $testMethod = 'get')
    {
-        static::request()->setUrl($testUrl);
-        static::request()->setMethod($testMethod);
+        $request = static::request();
+
+        $request->setUrl((new \Pecee\Http\Url($testUrl))->setHost('local.unitTest'));
+        $request->setMethod($testMethod);

        static::start();
    }
Author	SHA1	Message	Date
Simon Sessingø	87e1fa3775	Merge pull request #391 from skipperbent/v4-development Bugfixes	2018-03-29 22:18:26 +02:00
Simon Sessingø	a11595fb86	Bugfixes - Fixed `$methods` argument not properly passed in `InputHandler` class. - Updated helpers.php with latest changes.	2018-03-29 22:17:53 +02:00
Simon Sessingø	555afd04f1	Merge pull request #390 from skipperbent/v4-development Fixed defaultValue issue in `getValue` method in `InputHandler` class.	2018-03-29 21:45:26 +02:00
Simon Sessingø	e6db83c97a	Fixed defaultValue issue in `getValue` method in `InputHandler` class.	2018-03-29 21:44:41 +02:00
Simon Sessingø	32e5dd623c	Merge pull request #389 from skipperbent/v4-development Version 4.0.0.1	2018-03-29 21:26:37 +02:00
Simon Sessingø	8eded4a619	Updated documentation.	2018-03-29 21:19:52 +02:00
Simon Sessingø	af2ac6031d	Development - Added dependency injection support. - Added php-di composer dependency. - Added `ClassLoader` class. - Added `IClassLoader` interface. - Added unit-tests for dependency injection. - Updated documentation to reflect new features.	2018-03-29 21:16:02 +02:00
Simon Sessingø	cca2f5cb88	Added donate option	2018-03-29 19:13:55 +02:00
Simon Sessingø	1a59a659fe	Updated documentation	2018-03-29 19:02:31 +02:00
Simon Sessingø	4c61899560	Updated documentation	2018-03-29 19:00:18 +02:00
Simon Sessingø	931b50098c	Updated documentation	2018-03-29 18:54:03 +02:00
Simon Sessingø	f5a023117a	Development - Added event-arguments data. - Added event-arguments to the event list in documentation. - Fixed missing exceptions thrown in phpDocs. - Added unit-tests for new event functionality.	2018-03-29 18:51:28 +02:00
Simon Sessingø	a9c03f9271	Development - Updated `helpers.php` and helpers example in documentation. - MalformedUrlException is now handled properly by Router to avoid phpStorm syntax highlights in routes. - Added `getUrlCopy` to `Request` class, used to clone the current route (to keep domain etc.) - `setUrl` in `Request` are now strict and requires `Url` object and no longer accepts strings. - Renamed `hasRewrite` property to `hasPendingRewrite` in `Request` class. - Renamed `hasRewrite` and `setHasRewrite` methods to `hasPendingRewrite` and `setHasPendingRewrite` in `Request` class. - Added better usage of `Url` class. When calling `url` you can now use the methods on the `Url` class to filter params, get relative/absolute url etc. See documentation for more info. - Renamed `get` method to `getValue` in `InputHandler` class. - Renamed `getObject` to `get` and removed `$defaultValue` argument in `InputHandler` class. - Optimized `InputHandler` class. - Fixed issue with `$token` not being proper string in `BaseCsrfVerifier` when token is not found. - Added php.ini configuration settings to `setcookie` in `CookieTokenProvider` for improved security. - Added `$router` parameter to `boot` method in `IRouterBootManager` which allows for further manipulation of the router within the bootmanager. - Renamed `$processingRoute` property to `$isProcessingRoute` in `Router` class. - Fixed `reset` method not resetting CSRF-verifier in `Router` class. - Moved `arrayToParams` helper-method from `Router` to `Url` class. - Began to add Event-functionality to router. - Added `addEventHandler` method to `SimpleRouter` class. - Moved `Pecee\SimpleRouter\Handler\CallbackExceptionHandler` to `Pecee\SimpleRouter\Handlers\CallbackExceptionHandler`. - Moved `Pecee\SimpleRouter\Handler\IExceptionHandler` to `Pecee\SimpleRouter\Handlers\IExceptionHandler`. - Added Events section to documentation. - Added more information on url-handling in documentation. - Optimisations.	2018-03-29 18:17:42 +02:00
Simon Sessingø	aa56d45f9c	Updated documentation	2018-03-29 10:13:23 +02:00