Merge pull request #396 from skipperbent/v4-development

Version 4.0.0.9
Bugfixes
2026-06-17 16:57:53 +00:00 · 2018-03-30 05:23:54 +02:00 · 2018-03-30 05:22:41 +02:00 · 2018-03-29 23:48:32 +02:00 · 2018-03-29 23:47:27 +02:00 · 2018-03-29 23:28:47 +02:00
123 changed files with 10142 additions and 3888 deletions
@@ -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/**
@@ -1,4 +1,3 @@
-.idea
 composer.lock
 vendor/
-demo-project/vendor
+tests/tmp/*
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Simon" />
+  </state>
+</component>
@@ -0,0 +1,12 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="simon">
+    <words>
+      <w>bootmanager</w>
+      <w>bootmanagers</w>
+      <w>csrf</w>
+      <w>middlewares</w>
+      <w>pecee</w>
+      <w>urldecode</w>
+    </words>
+  </dictionary>
+</component>
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.25" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
@@ -0,0 +1,3 @@
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/simple-php-router.iml" filepath="$PROJECT_DIR$/.idea/simple-php-router.iml" />
+    </modules>
+  </component>
+</project>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local" version="6.5.7" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
+      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
+      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings load_method="CUSTOM_LOADER" configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" phpunit_phar_path="" use_configuration_file="true" />
+    </phpunit_settings>
+  </component>
+</project>
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/Pecee" isTestSource="false" packagePrefix="Pecee\" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hamcrest/hamcrest-php" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/invoker" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/php-di" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/php-di/phpdoc-reader" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-common" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpdocumentor/type-resolver" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
@@ -0,0 +1,895 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="9860">
+              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+              <folding>
+                <element signature="e#38#84#0#PHP" expanded="true" />
+                <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/helpers.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1420">
+              <caret line="74" selection-end-line="87" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5160">
+              <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+              <folding>
+                <element signature="e#302#319#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="484">
+              <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="20">
+              <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="398">
+              <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="197">
+              <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="IInputItem.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="380">
+              <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>function renderRoute</find>
+      <find>-&gt;renderRoute</find>
+      <find>fireEvent</find>
+      <find>renderRoute</find>
+      <find>findRoute</find>
+      <find>-&gt;fireEvents</find>
+      <find>RENDER_MIDD</find>
+      <find>EVENT_RENDER_CSRF</find>
+      <find>RENDER_ROUTE</find>
+      <find>requirements</find>
+      <find># Advan</find>
+      <find># Feed</find>
+      <find>: void</find>
+      <find>call_user_func_array</find>
+      <find>loadClass</find>
+      <find>$this-&gt;</find>
+      <find>$this-&gt;result</find>
+      <find>$this-&gt;r</find>
+      <find>getInput</find>
+      <find>helpers.php</find>
+      <find>input()-&gt;get</find>
+      <find>getObject</find>
+      <find>helpers</find>
+      <find>group</find>
+      <find>addDefault</find>
+      <find>handleExc</find>
+      <find>function group</find>
+      <find>function parti</find>
+      <find>__toString</find>
+      <find>getValue</find>
+    </findStrings>
+    <dirStrings>
+      <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
+      <dir>D:\Workspace\simple-php-router\src</dir>
+      <dir>D:\Workspace\simple-php-router\tests\Pecee\SimpleRouter\Dummy</dir>
+      <dir>D:\Workspace\simple-php-router</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
+      <dir>E:\Workspace\simple-php-router\tests</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee</dir>
+      <dir>E:\Workspace\simple-php-router</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\src</dir>
+    </dirStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerFirst.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Handler/ExceptionHandlerSecond.php" />
+        <option value="$PROJECT_DIR$/tests/TestRouter.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/IEventArgument.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Security/SilentTokenProvider.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Managers/TestBootManager.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/ITokenProvider.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/DIContainerBuilder.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ContainerInterface.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/composer.json" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/helpers.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsFlowSettings">
+    <service-enabled>false</service-enabled>
+    <exe-path />
+    <annotation-enable>false</annotation-enable>
+    <other-services-enabled>false</other-services-enabled>
+    <auto-save>true</auto-save>
+  </component>
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.2">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
+      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
+      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
+      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+    </include_path>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="106" />
+    <option name="y" value="51" />
+    <option name="width" value="2295" />
+    <option name="height" value="1235" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Input" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="ClassLoader" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Handlers" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dscuz-v1" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.standard" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.standard" value="project" />
+    <property name="node.js.selected.package.eslint" value="" />
+    <property name="node.js.selected.package.standard" value="" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter" />
+      <recent name="D:\Workspace\simple-php-router\tests" />
+      <recent name="D:\Workspace\simple-php-router" />
+      <recent name="D:\Workspace\simple-php-router\test" />
+      <recent name="D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\ClassLoader\Containers" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\ClassLoader" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter" />
+      <recent name="E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Handler" />
+      <recent name="D:\Workspace\simple-php-router\tests" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="PHPUnit.phpunit.xml">
+    <configuration name="RouterUrlTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="RouterUrlTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" scope="Class" />
+    </configuration>
+    <configuration name="phpunit.xml" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml" scope="XML" use_alternative_configuration_file="true" />
+    </configuration>
+    <configuration name="tests" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner directory="$PROJECT_DIR$/tests" />
+    </configuration>
+    <configuration name="debug.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/tests/debug.php" />
+    <list>
+      <item itemvalue="PHPUnit.tests" />
+      <item itemvalue="PHPUnit.RouterUrlTest" />
+      <item itemvalue="PHPUnit.phpunit.xml" />
+      <item itemvalue="PHP Script.debug.php" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="PHPUnit.phpunit.xml" />
+        <item itemvalue="PHPUnit.tests" />
+        <item itemvalue="PHP Script.debug.php" />
+        <item itemvalue="PHPUnit.RouterUrlTest" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="" />
+      <created>1502498236860</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1502498236860</updated>
+      <workItem from="1502498238130" duration="495000" />
+      <workItem from="1502589327470" duration="1325000" />
+      <workItem from="1502643621164" duration="1124000" />
+      <workItem from="1502665379176" duration="1624000" />
+      <workItem from="1502669212357" duration="163000" />
+      <workItem from="1503009054866" duration="109000" />
+      <workItem from="1503143546207" duration="965000" />
+      <workItem from="1503146420259" duration="656000" />
+      <workItem from="1503148077591" duration="1223000" />
+      <workItem from="1503157038418" duration="7000" />
+      <workItem from="1503418539960" duration="475000" />
+      <workItem from="1503499434906" duration="6410000" />
+      <workItem from="1503519096046" duration="649000" />
+      <workItem from="1503520310378" duration="280000" />
+      <workItem from="1503521737747" duration="856000" />
+      <workItem from="1503524427576" duration="2573000" />
+      <workItem from="1503536487719" duration="1589000" />
+      <workItem from="1503542802083" duration="820000" />
+      <workItem from="1503585789014" duration="820000" />
+      <workItem from="1504176764746" duration="658000" />
+      <workItem from="1504283976613" duration="694000" />
+      <workItem from="1504448385820" duration="7834000" />
+      <workItem from="1504459201935" duration="83000" />
+      <workItem from="1504459311471" duration="1376000" />
+      <workItem from="1504486369526" duration="451000" />
+      <workItem from="1504917061077" duration="1291000" />
+      <workItem from="1507375921398" duration="131000" />
+      <workItem from="1508785846050" duration="916000" />
+      <workItem from="1508786969551" duration="615000" />
+      <workItem from="1508787603350" duration="1889000" />
+      <workItem from="1509491007644" duration="14000" />
+      <workItem from="1509491033605" duration="6000" />
+      <workItem from="1510192196700" duration="11000" />
+      <workItem from="1510192217149" duration="152000" />
+      <workItem from="1510193026656" duration="140000" />
+      <workItem from="1511567082879" duration="3024000" />
+      <workItem from="1511629790083" duration="1115000" />
+      <workItem from="1511632906778" duration="6000" />
+      <workItem from="1511709768816" duration="954000" />
+      <workItem from="1511710733832" duration="10000" />
+      <workItem from="1511710754848" duration="6388000" />
+      <workItem from="1511717327384" duration="1762000" />
+      <workItem from="1511736112440" duration="855000" />
+      <workItem from="1511741616771" duration="3149000" />
+      <workItem from="1512583258866" duration="985000" />
+      <workItem from="1512706044104" duration="1603000" />
+      <workItem from="1521506970558" duration="7811000" />
+      <workItem from="1522072655826" duration="1072000" />
+      <workItem from="1522073747209" duration="63000" />
+      <workItem from="1522073847648" duration="23574000" />
+      <workItem from="1522309434425" duration="745000" />
+      <workItem from="1522310203119" duration="120000" />
+      <workItem from="1522310337826" duration="117000" />
+      <workItem from="1522310475899" duration="12840000" />
+      <workItem from="1522325810130" duration="30260000" />
+      <workItem from="1522360506281" duration="168000" />
+      <workItem from="1522378435862" duration="1346000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 47m 20s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 48m 57s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 49m 08s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 04s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 18s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 23s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 21h 12m 55s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 02s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 18s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 37s.xml">
+      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="136391000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info anchor="bottom" id="TODO" order="10" weight="0.32983023" />
+      <window_info anchor="bottom" id="Event Log" order="6" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
+      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" weight="0.28282827" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1923077" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info active="true" anchor="bottom" id="Find" order="1" sideWeight="0.48880896" visible="true" weight="0.3272727" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="8" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection Results" order="12" weight="0.32902184" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="3" />
+    </breakpoint-manager>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="9860">
+          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1420">
+          <caret line="74" selection-end-line="87" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5160">
+          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+          <folding>
+            <element signature="e#302#319#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4460">
+          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/IRouterBootManager.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IGroupRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-288" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="45" column="26" lean-forward="true" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="16" column="36" lean-forward="true" selection-end-line="80" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/ContainerBuilder.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="121" column="21" selection-start-line="121" selection-start-column="21" selection-end-line="121" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/IContainer.php" />
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/Containers/DIContainerBuilder.php" />
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/FactoryInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="14" column="10" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/invoker/src/InvokerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
+    <entry file="file://$PROJECT_DIR$/vendor/mockery/mockery/library/Mockery/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3360">
+          <caret line="26" column="6" selection-start-line="26" selection-start-column="6" selection-end-line="26" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-di/php-di/src/Container.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="266" column="20" selection-start-line="266" selection-start-column="20" selection-end-line="266" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tmp/CompiledContainer.php" />
+    <entry file="file://$PROJECT_DIR$/tests/TestRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="384">
+          <caret line="34" column="47" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="105" column="33" selection-start-line="105" selection-start-column="33" selection-end-line="105" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="696">
+          <caret line="29" column="38" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="223" column="5" selection-start-line="223" selection-start-column="5" selection-end-line="223" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="522">
+            <caret line="286" column="4" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="9860">
+          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1420">
+          <caret line="74" selection-end-line="87" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5160">
+          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+          <folding>
+            <element signature="e#302#319#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="398">
+          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="20">
+          <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
@@ -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
+
@@ -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
@@ -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": {
-		"php": ">=5.4.0"
-    },
-    "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/"
+    }
+  }
+}
@@ -1,100 +0,0 @@
-# Simple PHP router demo project
-
-This project is here to give you a basic understanding of how to setup and using simple-php-router.
-
-Please note that this demo-project only covers how to integrate the `simple-php-router` in a project without a framework. If you are using some sort of PHP framework in your project the implementation might vary.
-
-**What we won't cover:**
-
- How to setup a solution that fits your need. This is a basic demo to help you get started.
- Understanding of MVC; including Controllers, Middlewares or ExceptionHandlers.
- How to integrate into third party frameworks.
-
-**What we cover:**
-
- How to get up and running fast - from scratch.
- How to get ExceptionHandlers, Middlewares and Controllers working.
- How to setup your webservers.
-
-## Installation
-
- Navigate to the `demo-project` folder in terminal and run `composer update` to install the latest version.
- Point your webserver to `demo-project/public`.
-
-### Setting up Nginx
-
-If you are using Nginx please make sure that url-rewriting is enabled.
-
-You can easily enable url-rewriting by adding the following configuration for the Nginx configuration-file for the demo-project.
-
-```
-location / {
-    try_files $uri $uri/ /index.php?$query_string;
-}
-```
-
-### Setting up Apache
-
-Nothing special is required for Apache to work. We've include the `.htaccess` file in the `public` folder. If rewriting is not working for you, please check that the `mod_rewrite` module (htaccess support) is enabled in the Apache configuration.
-
-## Folder structure
-
-| Folder        | Description |
-| ------------- |-------------|
-| app            |Contains projects-specific PHP classes|
-| public         |Public folder which are accessible through the web.|
-
-## Notes
-
-The demo project has it's own `Router` class implementation which extends the `SimpleRouter` class with further functionality. 
-This class can be useful adding additional functionality that are required before and after routing occurs or any extra functionality belonging to the router itself. 
-
-In this project we also use our custom router-class to autoload the `routes.php` file from our custom location (`app/routes.php`).
-
-Please check the `routes.php` file in `demo-project/app` for all the urls/rules available in the project.
-
-### CSRF-verifier
-
-For the purpose of this demo, we've added a custom CSRF-verifier middleware called `CsrfVerifier` and disabled CSRF checks for all calls to `/api/*`. This will ensure that CSRF form-checks are not applied when calling our demo api url.
-
-### Exception handlers
-
-The included `CustomExceptionHandler` class returns a very basic json response for errors received on calls to `/api/*` or otherwise just a simple formatted error response.
-
-### Middlewares
-
-`ApiVerification` class is added to all calls to `/api/*`. This simple class just adds some data to the `Request` object, which is returned in one of the methods in the `ApiController` class. We've added this class to demonstrate that you can use middlewares to ensure that the user has the correct authentication - before router loads the controller itself.
-
-### Urls
-
-Please see `routes.php` for all routes and rules.
-
-| URL        |
-| ------------- |
-| /             |
-| /api/demo       |
-| /companies       |
-| /companies/[id]  |
-| /contact         |
-
-## The MIT License (MIT)
-
-Copyright (c) 2016 Simon Sessingø / simple-php-router
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,16 +0,0 @@
-<?php
-namespace Demo\Controllers;
-
-class ApiController
-{
-	public function index()
-	{
-		// The variable authenticated is set to true in the ApiVerification middleware class.
-		header('content-type: application/json');
-
-		echo json_encode([
-			'authenticated' => request()->authenticated
-		]);
-	}
-
-}
@@ -1,27 +0,0 @@
-<?php
-namespace Demo\Controllers;
-
-class DefaultController
-{
-	public function index()
-	{
-		// implement
-		echo sprintf('DefaultController -> index (?fun=%s)', input()->get('fun'));
-	}
-
-	public function contact()
-	{
-		echo 'DefaultController -> contact';
-	}
-
-	public function companies($id = null)
-	{
-		echo 'DefaultController -> companies -> id: ' . $id;
-	}
-
-	public function notFound()
-	{
-		echo 'Page not found';
-	}
-
-}
@@ -1,34 +0,0 @@
-<?php
-namespace Demo\Handlers;
-
-use Pecee\Handler\IExceptionHandler;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;
-
-class CustomExceptionHandler implements IExceptionHandler
-{
-	public function handleError(Request $request, RouterEntry &$route = null, \Exception $error)
-	{
-		// Return json errors if we encounter an error on /api.
-		if (stripos($request->getUri(), '/api') !== false) {
-			header('content-type: application/json');
-			echo json_encode([
-				'error' => $error->getMessage(),
-				'code' => $error->getCode()
-			]);
-			die();
-		}
-
-		// else we just throw the error
-		if ($error->getCode() == 404) {
-
-			// Return 404 path
-			$request->setUri('/404');
-			return $request;
-
-		}
-
-		throw $error;
-	}
-
-}
@@ -1,18 +0,0 @@
-<?php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;
-
-class ApiVerification implements IMiddleware
-{
-	public function handle(Request $request, RouterEntry &$route)
-	{
-		// Do authentication
-		$request->authenticated = true;
-
-		return $request;
-	}
-
-}
@@ -1,13 +0,0 @@
-<?php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\BaseCsrfVerifier;
-
-class CsrfVerifier extends BaseCsrfVerifier
-{
-	/**
-	 * CSRF validation will be ignored on the following urls.
-	 */
-	protected $except = ['/api/*'];
-
-}
@@ -1,26 +0,0 @@
-<?php
-/**
- * Custom router which handles default middlewares, default exceptions and things
- * that should be happen before and after the router is initialised.
- */
-namespace Demo;
-
-use Pecee\SimpleRouter\SimpleRouter;
-
-class Router extends SimpleRouter
-{
-	public static function start($defaultNamespace = null)
-	{
-		// Load our helpers
-		require_once 'helpers.php';
-
-		// Load our custom routes
-		require_once 'routes.php';
-
-		parent::setDefaultNamespace('\Demo');
-
-		// Do initial stuff
-		parent::start();
-	}
-
-}
@@ -1,44 +0,0 @@
-<?php
-use Pecee\SimpleRouter\SimpleRouter;
-
-function url($controller, $parameters = null, $getParams = null)
-{
-	SimpleRouter::getRoute($controller, $parameters, $getParams);
-}
-
-/**
- * Get current csrf-token
- * @return null|string
- */
-function csrf_token()
-{
-	$token = new \Pecee\CsrfToken();
-	return $token->getToken();
-}
-
-/**
- * Get request object
- * @return \Pecee\Http\Request
- */
-function request()
-{
-	return SimpleRouter::request();
-}
-
-/**
- * Get response object
- * @return \Pecee\Http\Response
- */
-function response()
-{
-	return SimpleRouter::response();
-}
-
-/**
- * Get input class
- * @return \Pecee\Http\Input\Input
- */
-function input()
-{
-	return SimpleRouter::request()->getInput();
-}
@@ -1,23 +0,0 @@
-<?php
-/**
- * This file contains all the routes for the project
- */
-
-use Demo\Router;
-
-Router::csrfVerifier(new \Demo\Middlewares\CsrfVerifier());
-
-Router::group(['exceptionHandler' => 'Demo\Handlers\CustomExceptionHandler'], function () {
-
-	Router::get('/', 'DefaultController@index')->setAlias('home');
-	Router::get('/contact', 'DefaultController@contact')->setAlias('contact');
-	Router::get('/404', 'DefaultController@notFound')->setAlias('404');
-	Router::basic('/companies', 'DefaultController@companies')->setAlias('companies');
-	Router::basic('/companies/{id}', 'DefaultController@companies')->setAlias('companies');
-
-	// Api
-	Router::group(['prefix' => '/api', 'middleware' => 'Demo\Middlewares\ApiVerification'], function () {
-		Router::resource('/demo', 'ApiController');
-	});
-
-});
@@ -1,26 +0,0 @@
-{
- 	"name": "pecee/simple-router-demo",
- 	"description": "Simple router demo project",
- 	"keywords": [
-		"simple-router",
-		"php",
-		"php-simple-router"
-	],
-	"license": "MIT",
-	"type": "project",
-	"require": {
-		"php": ">=5.4.0",
-		"pecee/simple-router": "2.*"
-	},
-	"require-dev": {
-
-	},
-	"config": {
-		"preferred-install": "dist"
-	},
-    "autoload": {
-      "psr-4": {
-        "Demo\\": "app/"
-      }
-    }
-}
@@ -1,5 +0,0 @@
-RewriteEngine on
-RewriteCond %{SCRIPT_FILENAME} !-f
-RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteCond %{SCRIPT_FILENAME} !-l
-RewriteRule ^(.*)$ index.php/$1
@@ -1,7 +0,0 @@
-<?php
-
-// load composer dependencies
-require '../vendor/autoload.php';
-
-// Start the routing
-\Demo\Router::start();
@@ -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;
+}
@@ -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>
@@ -1,46 +0,0 @@
-<?php
-namespace Pecee\Controller;
-
-interface IRestController {
-
-	/**
-	 * @return void
-	 */
-	function index();
-
-	/**
-	 * @param mixed $id
-	 * @return void
-	 */
-	function show($id);
-
-	/**
-	 * @return void
-	 */
-	function store();
-
-	/**
-	 * @return void
-	 */
-	function create();
-
-	/**
-	 * View
-	 * @param mixed $id
-	 * @return void
-	 */
-	function edit($id);
-
-	/**
-	 * @param mixed $id
-	 * @return void
-	 */
-	function update($id);
-
-	/**
-	 * @param mixed $id
-	 * @return void
-	 */
-	function destroy($id);
-
-}
@@ -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;
+
+}
@@ -1,68 +0,0 @@
-<?php
-namespace Pecee;
-
-class CsrfToken
-{
-	const CSRF_KEY = 'XSRF-TOKEN';
-
-	protected $token;
-
-	/**
-	 * 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(static::CSRF_KEY, $token, time() + 60 * 120, '/');
-	}
-
-	/**
-	 * Get csrf token
-	 * @return string|null
-	 */
-	public function getToken()
-	{
-		if ($this->hasToken()) {
-			return $_COOKIE[static::CSRF_KEY];
-		}
-		return null;
-	}
-
-	/**
-	 * Returns whether the csrf token has been defined
-	 * @return bool
-	 */
-	public function hasToken()
-	{
-		return isset($_COOKIE[static::CSRF_KEY]);
-	}
-
-}
@@ -1,6 +0,0 @@
-<?php
-namespace Pecee\Exception;
-
-class RouterException extends \Exception
-{
-}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Exceptions;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+
+}
@@ -1,17 +0,0 @@
-<?php
-namespace Pecee\Handler;
-
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;
-
-interface IExceptionHandler
-{
-	/**
-	 * @param Request $request
-	 * @param RouterEntry|null $route
-	 * @param \Exception $error
-	 * @return Request|null
-	 */
-	public function handleError(Request $request, RouterEntry &$route = null, \Exception $error);
-
-}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Exceptions;
+
+class MalformedUrlException extends \Exception
+{
+
+}
@@ -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(): string;
+
+}
@@ -1,211 +0,0 @@
-<?php
-namespace Pecee\Http\Input;
-
-use Pecee\Http\Request;
-
-class Input
-{
-	/**
-	 * @var \Pecee\Http\Input\InputCollection
-	 */
-	public $get;
-
-	/**
-	 * @var \Pecee\Http\Input\InputCollection
-	 */
-	public $post;
-
-	/**
-	 * @var \Pecee\Http\Input\InputCollection
-	 */
-	public $file;
-
-	/**
-	 * @var Request
-	 */
-	protected $request;
-
-	public function __construct(Request $request)
-	{
-		$this->request = $request;
-		$this->setGet();
-		$this->setPost();
-		$this->setFile();
-	}
-
-	/**
-	 * Get all get/post items
-	 * @param array|null $filter Only take items in filter
-	 * @return array
-	 */
-	public function all(array $filter = null)
-	{
-		$output = $_POST;
-
-		if ($this->request->getMethod() === 'post') {
-
-			$contents = file_get_contents('php://input');
-
-			if (stripos(trim($contents), '{') === 0) {
-				$output = json_decode($contents, true);
-				if ($output === false) {
-					$output = array();
-				}
-			}
-		}
-
-		$output = array_merge($_GET, $output);
-
-		if ($filter !== null) {
-			$output = array_filter($output, function ($key) use ($filter) {
-				if (in_array($key, $filter)) {
-					return true;
-				}
-
-				return false;
-			}, ARRAY_FILTER_USE_KEY);
-		}
-
-		return $output;
-	}
-
-	public function getObject($index, $default = null)
-	{
-		$key = (strpos($index, '[') > -1) ? substr($index, strpos($index, '[') + 1, strpos($index, ']') - strlen($index)) : null;
-		$index = (strpos($index, '[') > -1) ? substr($index, 0, strpos($index, '[')) : $index;
-
-		$element = $this->get->findFirst($index);
-
-		if ($element !== null) {
-			return ($key !== null) ? $element[$key] : $element;
-		}
-
-		if ($this->request->getMethod() !== 'get') {
-
-			$element = $this->post->findFirst($index);
-			if ($element !== null) {
-				return ($key !== null) ? $element[$key] : $element;
-			}
-
-			$element = $this->file->findFirst($index);
-			if ($element !== null) {
-				return ($key !== null) ? $element[$key] : $element;
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Get input element value matching index
-	 * @param string $index
-	 * @param string|null $default
-	 * @return string|null
-	 */
-	public function get($index, $default = null)
-	{
-		$item = $this->getObject($index);
-
-		if ($item !== null) {
-
-			if ($item instanceof InputCollection || $item instanceof InputFile) {
-				return $item;
-			}
-
-			return (trim($item->getValue()) === '') ? $default : $item->getValue();
-		}
-
-		return $default;
-	}
-
-	public function exists($index)
-	{
-		return ($this->getObject($index) !== null);
-	}
-
-	public function setGet()
-	{
-		$this->get = new InputCollection();
-
-		if (count($_GET) > 0) {
-			foreach ($_GET as $key => $get) {
-				if (is_array($get) === false) {
-					$this->get->{$key} = new InputItem($key, $get);
-					continue;
-				}
-
-				$output = new InputCollection();
-
-				foreach ($get as $k => $g) {
-					$output->{$k} = new InputItem($k, $g);
-				}
-
-				$this->get->{$key} = $output;
-			}
-		}
-	}
-
-	public function setPost()
-	{
-		$this->post = new InputCollection();
-
-		$postVars = $_POST;
-
-		if (in_array($this->request->getMethod(), ['put', 'patch', 'delete']) === true) {
-			parse_str(file_get_contents('php://input'), $postVars);
-		}
-
-		if (count($postVars) > 0) {
-
-			foreach ($postVars as $key => $post) {
-				if (is_array($post) === false) {
-					$this->post->{strtolower($key)} = new InputItem($key, $post);
-					continue;
-				}
-
-				$output = new InputCollection();
-
-				foreach ($post as $k => $p) {
-					$output->{$k} = new InputItem($k, $p);
-				}
-
-				$this->post->{strtolower($key)} = $output;
-			}
-		}
-	}
-
-	public function setFile()
-	{
-		$this->file = new InputCollection();
-
-		if (count($_FILES) > 0) {
-			foreach ($_FILES as $key => $values) {
-
-				// Handle array input
-				if (is_array($values['name']) === false && trim($values['error']) !== '4') {
-					$values['index'] = $key;
-					$this->file->{strtolower($key)} = InputFile::createFromArray($values);
-					continue;
-				}
-
-				$output = new InputCollection();
-
-				foreach ($values['name'] as $k => $val) {
-					if (trim($val['error'][$k]) !== '4') {
-						$output->{$k} = InputFile::createFromArray([
-							'index' => $k,
-							'error' => $val['error'][$k],
-							'tmp_name' => $val['tmp_name'][$k],
-							'type' => $val['type'][$k],
-							'size' => $val['size'][$k],
-							'name' => $val['name'][$k]
-						]);
-					}
-				}
-
-				$this->file->{strtolower($key)} = $output;
-			}
-		}
-	}
-
-}
@@ -1,94 +0,0 @@
-<?php
-namespace Pecee\Http\Input;
-
-class InputCollection implements \IteratorAggregate
-{
-	protected $data = array();
-
-	/**
-	 * Search for input element matching index.
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return InputItem|mixed
-	 */
-	public function findFirst($index, $default = null)
-	{
-		if (count($this->data) > 0) {
-
-			if (isset($this->data[$index])) {
-				return $this->data[$index];
-			}
-
-			foreach ($this->data as $key => $input) {
-				if (strtolower($index) === strtolower($key)) {
-					return $input;
-				}
-			}
-		}
-
-		return $default;
-	}
-
-	/**
-	 * Get input element value matching index
-	 *
-	 * @param string $index
-	 * @param string|null $default
-	 * @return string|null
-	 */
-	public function get($index, $default = null)
-	{
-		$input = $this->findFirst($index);
-
-		if($input !== null && trim($input->getValue()) !== '') {
-			return $input->getValue();
-		}
-
-		return $default;
-	}
-
-	public function getValue($index, $default = null) {
-
-	}
-
-	/**
-	 * @param string $index
-	 * @throws \InvalidArgumentException
-	 * @return InputItem
-	 */
-	public function __get($index)
-	{
-		$item = $this->findFirst($index);
-		// Ensure that item are always available
-		if ($item === null) {
-			$this->data[$index] = new InputItem($index, null);
-			return $this->data[$index];
-		}
-
-		return $item;
-	}
-
-	public function __set($index, $value)
-	{
-		$this->data[$index] = $value;
-	}
-
-	public function getData()
-	{
-		return $this->data;
-	}
-
-	/**
-	 * Retrieve an external iterator
-	 * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
-	 * @return \Traversable An instance of an object implementing <b>Iterator</b> or
-	 * <b>Traversable</b>
-	 * @since 5.0.0
-	 */
-	public function getIterator()
-	{
-		return new \ArrayIterator($this->data);
-	}
-
-}
@@ -1,136 +1,292 @@
 <?php
+
 namespace Pecee\Http\Input;

-class InputFile extends InputItem
+use Pecee\Exceptions\InvalidArgumentException;
+
+class InputFile implements IInputItem
 {
-	public $size;
-	public $type;
-	public $error;
-	public $tmpName;
+    public $index;
+    public $name;
+    public $filename;
+    public $size;
+    public $type;
+    public $errors;
+    public $tmpName;

-	/**
-	 * @return string
-	 */
-	public function getSize()
-	{
-		return $this->size;
-	}
+    public function __construct(string $index)
+    {
+        $this->index = $index;

-	/**
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
+        $this->errors = 0;

-	/**
-	 * @return string
-	 */
-	public function getError()
-	{
-		return $this->error;
-	}
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
+    }

-	public function getMime()
-	{
-		return $this->getType();
-	}
+    /**
+     * 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');
+        }

-	/**
-	 * @return string
-	 */
-	public function getTmpName()
-	{
-		return $this->tmpName;
-	}
+        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */

-	public function getExtension()
-	{
-		return pathinfo($this->getName(), PATHINFO_EXTENSION);
-	}
+        $values += [
+            'tmp_name' => null,
+            'type'     => null,
+            'size'     => null,
+            'name'     => null,
+            'error'    => null,
+        ];

-	public function move($destination)
-	{
-		return move_uploaded_file($this->tmpName, $destination);
-	}
+        return (new static($values['index']))
+            ->setSize((int)$values['size'])
+            ->setError($values['error'])
+            ->setType($values['type'])
+            ->setTmpName($values['tmp_name'])
+            ->setFilename($values['name']);

-	public function getContents()
-	{
-		return file_get_contents($this->tmpName);
-	}
+    }

-	/**
-	 * Set file temp. name
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setTmpName($name)
-	{
-		$this->tmpName = $name;
-		return $this;
-	}
+    /**
+     * @return string
+     */
+    public function getIndex(): string
+    {
+        return $this->index;
+    }

-	/**
-	 * Set file size
-	 * @param int $size
-	 * @return static $this
-	 */
-	public function setSize($size)
-	{
-		$this->size = $size;
-		return $this;
-	}
+    /**
+     * Set input index
+     * @param string $index
+     * @return static
+     */
+    public function setIndex(string $index): IInputItem
+    {
+        $this->index = $index;

-	/**
-	 * Set type
-	 * @param string $type
-	 * @return static $this
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-		return $this;
-	}
+        return $this;
+    }

-	/**
-	 * Set error
-	 * @param int $error
-	 * @return static $this
-	 */
-	public function setError($error)
-	{
-		$this->error = $error;
-		return $this;
-	}
+    /**
+     * @return string
+     */
+    public function getSize(): string
+    {
+        return $this->size;
+    }

-	/**
-	 * Create from array
-	 * @param array $values
-	 * @return static
-	 */
-	public static function createFromArray(array $values)
-	{
-		if(!isset($values['index'])) {
-			throw new \InvalidArgumentException('Index key is required');
-		}
+    /**
+     * Set file size
+     * @param int $size
+     * @return static
+     */
+    public function setSize(int $size): IInputItem
+    {
+        $this->size = $size;

-		$input = new static($values['index']);
-		$input->setTmpName((isset($values['error']) ? $values['error'] : null));
-		$input->setName((isset($values['name']) ? $values['name'] : null));
-		$input->setSize((isset($values['size']) ? $values['size'] : null));
-		$input->setType((isset($values['type']) ? $values['type'] : null));
-		$input->setError((isset($values['tmp_name']) ? $values['tmp_name'] : null));
+        return $this;
+    }

-		return $input;
-	}
+    /**
+     * Get mime-type of file
+     * @return string
+     */
+    public function getMime(): string
+    {
+        return $this->getType();
+    }

-	/**
-	 * @return string
-	 */
-	public function getValue()
-	{
-		return $this->tmpName;
-	}
+    /**
+     * @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(): string
+    {
+        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,
+        ];
+    }

 }
@@ -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;
+    }
+
+}
@@ -1,70 +1,80 @@
 <?php
+
 namespace Pecee\Http\Input;

-class InputItem
+class InputItem implements IInputItem
 {
-	public $index;
-	public $name;
-	public $value;
+    public $index;
+    public $name;
+    public $value;

-	public function __construct($index, $value = null)
-	{
-		$this->index = $index;
-		$this->value = $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('_', ' ', $this->index));
-	}
+        // Make the name human friendly, by replace _ with space
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
+    }

-	/**
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
+    /**
+     * @return string
+     */
+    public function getIndex(): string
+    {
+        return $this->index;
+    }

-	/**
-	 * @return string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
+    public function setIndex(string $index): IInputItem
+    {
+        $this->index = $index;

-	/**
-	 * @return string
-	 */
-	public function getIndex()
-	{
-		return $this->index;
-	}
+        return $this;
+    }

-	/**
-	 * Set input name
-	 * @param string $name
-	 * @return static $this
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-		return $this;
-	}
+    /**
+     * @return string
+     */
+    public function getName(): ?string
+    {
+        return $this->name;
+    }

-	/**
-	 * Set input value
-	 * @param string $value
-	 * @return static $this
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-		return $this;
-	}
+    /**
+     * Set input name
+     * @param string $name
+     * @return static
+     */
+    public function setName(string $name): IInputItem
+    {
+        $this->name = $name;

-	public function __toString()
-	{
-		return (string)$this->value;
-	}
+        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(): string
+    {
+        return (string)$this->value;
+    }

 }
@@ -1,95 +1,101 @@
 <?php
+
 namespace Pecee\Http\Middleware;

-use Pecee\CsrfToken;
-use Pecee\Exception\TokenMismatchException;
+use Pecee\Http\Middleware\Exceptions\TokenMismatchException;
 use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;
+use Pecee\Http\Security\CookieTokenProvider;
+use Pecee\Http\Security\ITokenProvider;

 class BaseCsrfVerifier implements IMiddleware
 {
-	const POST_KEY = 'csrf-token';
-	const HEADER_KEY = 'X-CSRF-TOKEN';
+    public const POST_KEY = 'csrf-token';
+    public const HEADER_KEY = 'X-CSRF-TOKEN';

-	protected $except;
-	protected $csrfToken;
-	protected $token;
+    protected $except;
+    protected $tokenProvider;

-	public function __construct()
-	{
-		$this->csrfToken = new CsrfToken();
+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
+    public function __construct()
+    {
+        $this->tokenProvider = new CookieTokenProvider();
+    }

-		// Generate or get the CSRF-Token from Cookie.
-		$this->token = (!$this->hasToken()) ? $this->generateToken() : $this->csrfToken->getToken();
-	}
+    /**
+     * Check if the url matches the urls in the except property
+     * @param Request $request
+     * @return bool
+     */
+    protected function skip(Request $request): bool
+    {
+        if ($this->except === null || \count($this->except) === 0) {
+            return false;
+        }

-	/**
-	 * Check if the url matches the urls in the except property
-	 * @param Request $request
-	 * @return bool
-	 */
-	protected function skip(Request $request)
-	{
-		if ($this->except === null || is_array($this->except) === false) {
-			return false;
-		}
+        $max = \count($this->except) - 1;

-		foreach ($this->except as $url) {
-			$url = rtrim($url, '/');
-			if ($url[strlen($url) - 1] === '*') {
-				$url = rtrim($url, '*');
-				$skip = (stripos($request->getUri(), $url) === 0);
-			} else {
-				$skip = ($url === rtrim($request->getUri(), '/'));
-			}
+        for ($i = $max; $i >= 0; $i--) {
+            $url = $this->except[$i];

-			if ($skip) {
-				return true;
-			}
-		}
+            $url = rtrim($url, '/');
+            if ($url[\strlen($url) - 1] === '*') {
+                $url = rtrim($url, '*');
+                $skip = $request->getUrl()->contains($url);
+            } else {
+                $skip = ($url === $request->getUrl()->getOriginalUrl());
+            }

-		return false;
-	}
+            if ($skip === true) {
+                return true;
+            }
+        }

-	public function handle(Request $request, RouterEntry &$route = null)
-	{
+        return false;
+    }

-		if ($request->getMethod() !== 'get' && !$this->skip($request)) {
+    /**
+     * Handle request
+     *
+     * @param Request $request
+     * @throws TokenMismatchException
+     */
+    public function handle(Request $request): void
+    {

-			$token = $request->getInput()->post->get(static::POST_KEY);
+        if ($this->skip($request) === false && \in_array($request->getMethod(), ['post', 'put', 'delete'], true) === true) {

-			// If the token is not posted, check headers for valid x-csrf-token
-			if ($token === null) {
-				$token = $request->getHeader(static::HEADER_KEY);
-			}
+            $token = $request->getInputHandler()->getValue(
+                static::POST_KEY,
+                $request->getHeader(static::HEADER_KEY),
+                'post'
+            );

-			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 generateToken()
-	{
-		$token = $this->csrfToken->generateToken();
-		$this->csrfToken->setToken($token);
-		return $token;
-	}
+    }

-	public function hasToken()
-	{
-		if ($this->token != null) {
-			return true;
-		}
+    public function getTokenProvider(): ITokenProvider
+    {
+        return $this->tokenProvider;
+    }

-		return $this->csrfToken->hasToken();
-	}
-
-	public function getToken()
-	{
-		return $this->token;
-	}
+    /**
+     * Set token provider
+     * @param ITokenProvider $provider
+     */
+    public function setTokenProvider(ITokenProvider $provider): void
+    {
+        $this->tokenProvider = $provider;
+    }

 }
@@ -1,6 +1,8 @@
 <?php
-namespace Pecee\Exception;
+
+namespace Pecee\Http\Middleware\Exceptions;

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

 use Pecee\Http\Request;
-use Pecee\SimpleRouter\RouterEntry;

 interface IMiddleware
 {
-	/**
-	 * @param Request $request
-	 * @param RouterEntry $route
-	 * @return Request|null
-	 */
-	public function handle(Request $request, RouterEntry &$route);
+    /**
+     * @param Request $request
+     */
+    public function handle(Request $request): void;

 }
@@ -1,206 +1,428 @@
 <?php
+
 namespace Pecee\Http;

-use Pecee\Http\Input\Input;
+use Pecee\Http\Exceptions\MalformedUrlException;
+use Pecee\Http\Input\InputHandler;
+use Pecee\SimpleRouter\Route\ILoadableRoute;
+use Pecee\SimpleRouter\Route\RouteUrl;
+use Pecee\SimpleRouter\SimpleRouter;

 class Request
 {
-	protected $data = array();
-	protected $headers;
-	protected $host;
-	protected $uri;
-	protected $method;
-	protected $input;
+    /**
+     * Additional data
+     *
+     * @var array
+     */
+    private $data = [];

-	public function __construct()
-	{
-		$this->parseHeaders();
-		$this->input = new Input($this);
-		$this->host = $this->getHeader('http-host');;
-		$this->uri = $this->getHeader('request-uri');
-		$this->method = strtolower($this->input->post->findFirst('_method', $this->getHeader('request-method')));
-	}
+    /**
+     * Server headers
+     * @var array
+     */
+    protected $headers = [];

-	protected function parseHeaders()
-	{
-		$this->headers = array();
+    /**
+     * Request host
+     * @var string
+     */
+    protected $host;

-		foreach ($_SERVER as $name => $value) {
-			$this->headers[strtolower($name)] = $value;
-			$this->headers[strtolower(str_replace('_', '-', $name))] = $value;
-		}
-	}
+    /**
+     * Current request url
+     * @var Url
+     */
+    protected $url;

-	public function isSecure()
-	{
-		if ($this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443) {
-			return true;
-		}
+    /**
+     * Request method
+     * @var string
+     */
+    protected $method;

-		return false;
-	}
+    /**
+     * Input handler
+     * @var InputHandler
+     */
+    protected $inputHandler;

-	/**
-	 * @return string
-	 */
-	public function getUri()
-	{
-		return $this->uri;
-	}
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;

-	/**
-	 * @return string
-	 */
-	public function getHost()
-	{
-		return $this->host;
-	}
+    /**
+     * @var ILoadableRoute|null
+     */
+    protected $rewriteRoute;

-	/**
-	 * @return string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
+    /**
+     * Rewrite url
+     * @var string|null
+     */
+    protected $rewriteUrl;

-	/**
-	 * Get http basic auth user
-	 * @return string|null
-	 */
-	public function getUser()
-	{
-		return $this->getHeader('php-auth-user');
-	}
+    /**
+     * @var array
+     */
+    protected $loadedRoutes = [];

-	/**
-	 * Get http basic auth password
-	 * @return string|null
-	 */
-	public function getPassword()
-	{
-		return $this->getHeader('php-auth-pw');
-	}
+    /**
+     * Request constructor.
+     * @throws MalformedUrlException
+     */
+    public function __construct()
+    {
+        foreach ($_SERVER as $key => $value) {
+            $this->headers[strtolower($key)] = $value;
+            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
+        }

-	/**
-	 * Get all headers
-	 * @return array
-	 */
-	public function getHeaders()
-	{
-		return $this->headers;
-	}
+        $this->setHost($this->getHeader('http-host'));

-	/**
-	 * Get id address
-	 * @return string
-	 */
-	public function getIp()
-	{
-		if ($this->getHeader('http-cf-connecting-ip') !== null) {
-			return $this->getHeader('http-cf-connecting-ip');
-		}
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));

-		if ($this->getHeader('http-x-forwarded-for') !== null && strlen($this->getHeader('http-x-forwarded-for'))) {
-			return $this->getHeader('http-x-forwarded_for');
-		}
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->getValue('_method', $this->getHeader('request-method')));
+    }

-		return $this->getHeader('remote-addr');
-	}
+    public function isSecure(): bool
+    {
+        return $this->getHeader('http-x-forwarded-proto') === 'https' || $this->getHeader('https') !== null || $this->getHeader('server-port') === 443;
+    }

-	/**
-	 * Get referer
-	 * @return string
-	 */
-	public function getReferer()
-	{
-		return $this->getHeader('http-referer');
-	}
+    /**
+     * @return Url
+     */
+    public function getUrl(): Url
+    {
+        return $this->url;
+    }

-	/**
-	 * Get user agent
-	 * @return string
-	 */
-	public function getUserAgent()
-	{
-		return $this->getHeader('http-user-agent');
-	}
+    /**
+     * Copy url object
+     *
+     * @return Url
+     */
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }

-	/**
-	 * Get header value by name
-	 *
-	 * @param string $name
-	 * @param object|null $defaultValue
-	 *
-	 * @return string|null
-	 */
-	public function getHeader($name, $defaultValue = null)
-	{
-		return isset($this->headers[strtolower($name)]) ? $this->headers[strtolower($name)] : $defaultValue;
-	}
+    /**
+     * @return string|null
+     */
+    public function getHost(): ?string
+    {
+        return $this->host;
+    }

-	/**
-	 * Get input class
-	 * @return Input
-	 */
-	public function getInput()
-	{
-		return $this->input;
-	}
+    /**
+     * @return string|null
+     */
+    public function getMethod(): ?string
+    {
+        return $this->method;
+    }

-	/**
-	 * Is format accepted
-	 *
-	 * @param string $format
-	 *
-	 * @return bool
-	 */
-	public function isFormatAccepted($format)
-	{
-		return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
-	}
+    /**
+     * Get http basic auth user
+     * @return string|null
+     */
+    public function getUser(): ?string
+    {
+        return $this->getHeader('php-auth-user');
+    }

-	/**
-	 * Get accept formats
-	 * @return array
-	 */
-	public function getAcceptFormats()
-	{
-		return explode(',', $this->getHeader('http-accept'));
-	}
+    /**
+     * Get http basic auth password
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        return $this->getHeader('php-auth-pw');
+    }

-	/**
-	 * @param string $uri
-	 */
-	public function setUri($uri)
-	{
-		$this->uri = $uri;
-	}
+    /**
+     * Get all headers
+     * @return array
+     */
+    public function getHeaders(): array
+    {
+        return $this->headers;
+    }

-	/**
-	 * @param string $host
-	 */
-	public function setHost($host)
-	{
-		$this->host = $host;
-	}
+    /**
+     * Get id address
+     * @return string|null
+     */
+    public function getIp(): ?string
+    {
+        if ($this->getHeader('http-cf-connecting-ip') !== null) {
+            return $this->getHeader('http-cf-connecting-ip');
+        }

-	/**
-	 * @param string $method
-	 */
-	public function setMethod($method)
-	{
-		$this->method = $method;
-	}
+        if ($this->getHeader('http-x-forwarded-for') !== null) {
+            return $this->getHeader('http-x-forwarded_for');
+        }

-	public function __set($name, $value = null)
-	{
-		$this->data[$name] = $value;
-	}
+        return $this->getHeader('remote-addr');
+    }

-	public function __get($name)
-	{
-		return isset($this->data[$name]) ? $this->data[$name] : null;
-	}
+    /**
+     * Get remote address/ip
+     *
+     * @alias static::getIp
+     * @return string|null
+     */
+    public function getRemoteAddr(): ?string
+    {
+        return $this->getIp();
+    }
+
+    /**
+     * Get referer
+     * @return string|null
+     */
+    public function getReferer(): ?string
+    {
+        return $this->getHeader('http-referer');
+    }
+
+    /**
+     * Get user agent
+     * @return string|null
+     */
+    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, $defaultValue = null): ?string
+    {
+        return $this->headers[strtolower($name)] ?? $defaultValue;
+    }
+
+    /**
+     * Get input class
+     * @return InputHandler
+     */
+    public function getInputHandler(): InputHandler
+    {
+        return $this->inputHandler;
+    }
+
+    /**
+     * 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 $this->data[$name] ?? null;
+    }

 }
@@ -1,118 +1,130 @@
 <?php
+
 namespace Pecee\Http;

+use Pecee\Exceptions\InvalidArgumentException;
+
 class Response
 {
-	protected $request;
+    protected $request;

-	public function __construct(Request $request)
-	{
-		$this->request = $request;
-	}
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }

-	/**
-	 * Set the http status code
-	 *
-	 * @param int $code
-	 * @return static
-	 */
-	public function httpCode($code)
-	{
-		http_response_code($code);
-		return $this;
-	}
+    /**
+     * Set the http status code
+     *
+     * @param int $code
+     * @return static
+     */
+    public function httpCode(int $code): self
+    {
+        http_response_code($code);

-	/**
-	 * Redirect the response
-	 *
-	 * @param string $url
-	 * @param int $httpCode
-	 */
-	public function redirect($url, $httpCode = null)
-	{
-		if ($httpCode !== null) {
-			$this->httpCode($httpCode);
-		}
+        return $this;
+    }

-		$this->header('location: ' . $url);
-		die();
-	}
+    /**
+     * Redirect the response
+     *
+     * @param string $url
+     * @param int $httpCode
+     */
+    public function redirect(string $url, ?int $httpCode = null): void
+    {
+        if ($httpCode !== null) {
+            $this->httpCode($httpCode);
+        }

-	public function refresh()
-	{
-		$this->redirect($this->request->getUri());
-	}
+        $this->header('location: ' . $url);
+        exit(0);
+    }

-	/**
-	 * Add http authorisation
-	 * @param string $name
-	 * @return static
-	 */
-	public function auth($name = '')
-	{
-		$this->headers([
-			'WWW-Authenticate: Basic realm="' . $name . '"',
-			'HTTP/1.0 401 Unauthorized'
-		]);
-		return $this;
-	}
+    public function refresh(): void
+    {
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
+    }

-	public function cache($eTag, $lastModified = 2592000)
-	{
+    /**
+     * Add http authorisation
+     * @param string $name
+     * @return static
+     */
+    public function auth(string $name = ''): self
+    {
+        $this->headers([
+            'WWW-Authenticate: Basic realm="' . $name . '"',
+            'HTTP/1.0 401 Unauthorized',
+        ]);

-		$this->headers([
-			'Cache-Control: public',
-			'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
-			'Etag: ' . $eTag
-		]);
+        return $this;
+    }

-		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
-		) {
+    public function cache(string $eTag, int $lastModifiedTime = 2592000): self
+    {

-			$this->headers([
-				'HTTP/1.1 304 Not Modified'
-			]);
+        $this->headers([
+            'Cache-Control: public',
+            sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $lastModifiedTime)),
+            sprintf('Etag: %s', $eTag),
+        ]);

-			exit();
-		}
+        $httpModified = $this->request->getHeader('http-if-modified-since');
+        $httpIfNoneMatch = $this->request->getHeader('http-if-none-match');

-		return $this;
-	}
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModifiedTime)) {

-	/**
-	 * Json encode array
-	 * @param array $value
-	 */
-	public function json(array $value)
-	{
-		$this->header('Content-type: application/json');
-		echo json_encode($value);
-		die();
-	}
+            $this->header('HTTP/1.1 304 Not Modified');
+            exit(0);
+        }

-	/**
-	 * Add header to response
-	 * @param string $value
-	 * @return static
-	 */
-	public function header($value)
-	{
-		header($value);
-		return $this;
-	}
+        return $this;
+    }

-	/**
-	 * Add multiple headers to response
-	 * @param array $headers
-	 * @return static
-	 */
-	public function headers(array $headers)
-	{
-		foreach ($headers as $header) {
-			header($header);
-		}
-		return $this;
-	}
+    /**
+     * 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($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 static
+     */
+    public function header(string $value): self
+    {
+        header($value);
+
+        return $this;
+    }
+
+    /**
+     * Add multiple headers to response
+     * @param array $headers
+     * @return static
+     */
+    public function headers(array $headers): self
+    {
+        foreach ($headers as $header) {
+            $this->header($header);
+        }
+
+        return $this;
+    }

 }
@@ -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;
+    }
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Security\Exceptions;
+
+class SecurityException extends \Exception
+{
+
+}
@@ -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;
+
+}
@@ -0,0 +1,461 @@
+<?php
+
+namespace Pecee\Http;
+
+use Pecee\Http\Exceptions\MalformedUrlException;
+
+class Url implements \JsonSerializable
+{
+    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();
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    public function jsonSerialize(): string
+    {
+        return $this->getRelativeUrl();
+    }
+
+    public function __toString(): string
+    {
+        return $this->getRelativeUrl();
+    }
+
+}
@@ -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;
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Exceptions;
+
+class HttpException extends \Exception
+{
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Exceptions;
+
+class NotFoundHttpException extends HttpException
+{
+
+}
@@ -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
+        );
+    }
+}
@@ -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;
+
+}
@@ -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;
+
+}
@@ -1,13 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-interface IControllerRoute
-{
-	public function getController();
-
-	public function setController($controller);
-
-	public function getMethod();
-
-	public function setMethod($method);
-}
@@ -1,9 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-interface ILoadableRoute
-{
-	public function getUrl();
-
-	public function setUrl($url);
-}
@@ -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;
+}
@@ -1,97 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-abstract class LoadableRoute extends RouterEntry implements ILoadableRoute
-{
-	const PARAMETERS_REGEX_MATCH = '%s([\w\-\_]*?)\%s{0,1}%s';
-	const PARAMETER_MODIFIERS = '{}';
-	const PARAMETER_OPTIONAL_SYMBOL = '?';
-
-	protected $url;
-	protected $alias;
-
-	public function getUrl()
-	{
-		return $this->url;
-	}
-
-	/**
-	 * Set url
-	 *
-	 * @param string $url
-	 * @return static
-	 */
-	public function setUrl($url)
-	{
-		$this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
-		$regex = sprintf(static::PARAMETERS_REGEX_MATCH, static::PARAMETER_MODIFIERS[0], static::PARAMETER_OPTIONAL_SYMBOL, static::PARAMETER_MODIFIERS[1]);
-
-		if (preg_match_all('/' . $regex . '/is', $this->url, $matches)) {
-			foreach ($matches[1] as $key) {
-				$this->parameters[$key] = null;
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get alias for the url which can be used when getting the url route.
-	 * @return string|array
-	 */
-	public function getAlias()
-	{
-		return $this->alias;
-	}
-
-	/**
-	 * Check if route has given alias.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasAlias($name)
-	{
-		if ($this->getAlias() !== null) {
-			if (is_array($this->getAlias()) === true) {
-				foreach ($this->getAlias() as $alias) {
-					if (strtolower($alias) === strtolower($name)) {
-						return true;
-					}
-				}
-			}
-			return strtolower($this->getAlias()) === strtolower($name);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set the url alias for easier getting the url route.
-	 * @param string|array $alias
-	 * @return static
-	 */
-	public function setAlias($alias)
-	{
-		$this->alias = $alias;
-		return $this;
-	}
-
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @return static
-	 */
-	public function merge(array $values)
-	{
-		// Change as to alias
-		if (isset($values['as'])) {
-			$this->setAlias($values['as']);
-		}
-
-		parent::merge($values);
-		return $this;
-	}
-
-}
@@ -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;
+
+}
@@ -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;
+}
@@ -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;
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\SimpleRouter\Route;
+
+interface IPartialGroupRoute
+{
+
+}
@@ -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;
+
+}
@@ -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;
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -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());
+    }
+
+}
@@ -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);
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -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;
+    }
+
+}
@@ -1,558 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Exception\RouterException;
-use Pecee\Handler\IExceptionHandler;
-use Pecee\Http\Middleware\BaseCsrfVerifier;
-use Pecee\Http\Request;
-use Pecee\Http\Response;
-
-class RouterBase
-{
-
-	/**
-	 * @var static
-	 */
-	protected static $instance;
-
-	/**
-	 * Current request
-	 * @var Request
-	 */
-	protected $request;
-
-	/**
-	 * Response
-	 * @var Response
-	 */
-	protected $response;
-
-	/**
-	 * Used to keep track of whether or not a should should be added to
-	 * the backstack-list for group-processing or not.
-	 * @var bool
-	 */
-	protected $processingRoute;
-
-	/**
-	 * All added routes
-	 * @var array
-	 */
-	protected $routes;
-
-	/**
-	 * List of
-	 * @var array
-	 */
-	protected $controllerUrlMap;
-
-	/**
-	 * Backstack array used to keep track of sub-routes
-	 * @var array
-	 */
-	protected $backStack;
-
-	/**
-	 * List of added bootmanagers
-	 * @var array
-	 */
-	protected $bootManagers;
-
-	/**
-	 * Csrf verifier class
-	 * @var BaseCsrfVerifier
-	 */
-	protected $csrfVerifier;
-
-	/**
-	 * Get exception handlers
-	 * @var array
-	 */
-	protected $exceptionHandlers;
-
-	/**
-	 * The current loaded route
-	 * @var RouterRoute|null
-	 */
-	protected $loadedRoute;
-
-	/**
-	 * List over route changes (to avoid endless-looping)
-	 * @var array
-	 */
-	protected $routeRewrites = [];
-
-	/**
-	 * If the route has been rewritten/changed this property will contain the original url.
-	 * @var string
-	 */
-	protected $originalUrl;
-
-	/**
-	 * Get current router instance
-	 * @return static
-	 */
-	public static function getInstance()
-	{
-		if (static::$instance === null) {
-			static::$instance = new static();
-		}
-
-		return static::$instance;
-	}
-
-	public function __construct()
-	{
-		$this->reset();
-	}
-
-	public function reset()
-	{
-		$this->processingRoute = false;
-		$this->request = new Request();
-		$this->response = new Response($this->request);
-		$this->routes = array();
-		$this->bootManagers = array();
-		$this->backStack = array();
-		$this->controllerUrlMap = array();
-		$this->exceptionHandlers = array();
-	}
-
-	/**
-	 * Add route
-	 * @param RouterEntry $route
-	 * @return RouterEntry
-	 */
-	public function addRoute(RouterEntry $route)
-	{
-		if ($this->processingRoute) {
-			$this->backStack[] = $route;
-		} else {
-			$this->routes[] = $route;
-		}
-
-		return $route;
-	}
-
-	protected function processRoutes(array $routes, array $settings = array(), array $prefixes = array(), RouterEntry $parent = null)
-	{
-		// Loop through each route-request
-		/* @var $route RouterEntry */
-		foreach ($routes as $route) {
-
-			$newPrefixes = $prefixes;
-			$newSettings = $settings;
-
-			if ($parent !== null) {
-				$route->setParent($parent);
-			}
-
-			if (count($settings)) {
-				$route->merge($settings);
-			}
-
-			if ($route instanceof RouterGroup) {
-
-				if ($route->getCallback() !== null && is_callable($route->getCallback())) {
-
-					$this->processingRoute = true;
-					$route->renderRoute($this->request);
-					$this->processingRoute = false;
-
-					if ($route->matchRoute($this->request)) {
-						// Add ExceptionHandler
-						if (count($route->getExceptionHandlers()) > 0) {
-							$this->exceptionHandlers = array_merge($route->getExceptionHandlers(), $this->exceptionHandlers);
-						}
-					}
-				}
-
-				$newPrefixes[] = trim($route->getPrefix(), '/');
-				$newSettings = array_merge($settings, $route->toArray());
-
-			}
-
-			if ($route instanceof ILoadableRoute) {
-
-				if (count($prefixes)) {
-					$route->setUrl(trim(join('/', $prefixes) . $route->getUrl(), '/'));
-				}
-
-				$this->controllerUrlMap[] = $route;
-			}
-
-			if (count($this->backStack) > 0) {
-				$backStack = $this->backStack;
-				$this->backStack = [];
-
-				// Route any routes added to the backstack
-				$this->processRoutes($backStack, $newSettings, $newPrefixes, $route);
-			}
-		}
-	}
-
-	public function routeRequest($rewrite = false)
-	{
-		$this->loadedRoute = null;
-		$routeNotAllowed = false;
-
-		try {
-
-			// Initialize boot-managers
-			if (count($this->bootManagers) > 0) {
-				/* @var $manager RouterBootManager */
-				foreach ($this->bootManagers as $manager) {
-					$this->request = $manager->boot($this->request);
-
-					if (!($this->request instanceof Request)) {
-						throw new RouterException('Custom router bootmanager "' . get_class($manager) . '" must return instance of Request.');
-					}
-				}
-			}
-
-			if ($rewrite === false) {
-
-				// Loop through each route-request
-				$this->processRoutes($this->routes);
-
-				if ($this->csrfVerifier !== null) {
-
-					// Verify csrf token for request
-					$this->csrfVerifier->handle($this->request);
-				}
-
-				$this->originalUrl = $this->request->getUri();
-			}
-
-			/* @var $route RouterEntry */
-			foreach ($this->controllerUrlMap as $route) {
-
-				if ($route->matchRoute($this->request)) {
-
-					if (count($route->getRequestMethods()) > 0 && !in_array($this->request->getMethod(), $route->getRequestMethods())) {
-						$routeNotAllowed = true;
-						continue;
-					}
-
-					$this->loadedRoute = $route;
-					$this->loadedRoute->loadMiddleware($this->request, $this->loadedRoute);
-
-					if ($this->request->getUri() !== $this->originalUrl && !in_array($this->request->getUri(), $this->routeRewrites)) {
-						$this->routeRewrites[] = $this->request->getUri();
-						$this->routeRequest(true);
-						return;
-					}
-
-					$routeNotAllowed = false;
-					$this->request->setUri($this->originalUrl);
-					$this->loadedRoute->renderRoute($this->request);
-
-					break;
-				}
-			}
-
-		} catch (\Exception $e) {
-			$this->handleException($e);
-		}
-
-		if ($routeNotAllowed) {
-			$this->handleException(new RouterException('Route or method not allowed', 403));
-		}
-
-		if ($this->loadedRoute === null) {
-			$this->handleException(new RouterException(sprintf('Route not found: %s', $this->request->getUri()), 404));
-		}
-	}
-
-	protected function handleException(\Exception $e)
-	{
-		/* @var $handler IExceptionHandler */
-		foreach ($this->exceptionHandlers as $handler) {
-
-			$handler = new $handler();
-
-			if (!($handler instanceof IExceptionHandler)) {
-				throw new RouterException('Exception handler must implement the IExceptionHandler interface.');
-			}
-
-			$request = $handler->handleError($this->request, $this->loadedRoute, $e);
-
-			if ($request !== null && $request->getUri() !== $this->originalUrl && !in_array($request->getUri(), $this->routeRewrites)) {
-				$this->routeRewrites[] = $request->getUri();
-				$this->routeRequest(true);
-				return;
-			}
-
-		}
-
-		throw $e;
-	}
-
-	public function arrayToParams(array $getParams = null, $includeEmpty = true)
-	{
-		if (is_array($getParams) === true && count($getParams) > 0) {
-
-			if ($includeEmpty === false) {
-				$getParams = array_filter($getParams, function ($item) {
-					return (!empty($item));
-				});
-			}
-
-			return '?' . http_build_query($getParams);
-		}
-
-		return '';
-	}
-
-	protected function processUrl(LoadableRoute $route, $method = null, $parameters = null, $getParams = null)
-	{
-		$domain = '';
-		$parent = $route->getParent();
-
-		$parameters = (array)$parameters;
-
-		if ($parent !== null && $parent instanceof RouterGroup && count($parent->getDomains()) > 0) {
-			$domain = $parent->getDomains();
-			$domain = '//' . $domain[0];
-		}
-
-		$url = $domain . '/' . trim($route->getUrl(), '/');
-
-		if ($route instanceof IControllerRoute && $method !== null) {
-
-			$url .= '/' . $method . '/';
-
-			if (count($parameters) > 0) {
-				$url .= join('/', (array)$parameters);
-			}
-
-		} else {
-
-			if ($parameters !== null && count($parameters) > 0) {
-				$params = array_merge($route->getParameters(), (array)$parameters);
-			} else {
-				$params = $route->getParameters();
-			}
-
-			$otherParams = array();
-
-			foreach ($params as $param => $value) {
-				$value = (isset($parameters[$param])) ? $parameters[$param] : $value;
-
-				$param1 = LoadableRoute::PARAMETER_MODIFIERS[0] . $param . LoadableRoute::PARAMETER_MODIFIERS[1];
-				$param2 = LoadableRoute::PARAMETER_MODIFIERS[0] . $param . LoadableRoute::PARAMETER_OPTIONAL_SYMBOL . LoadableRoute::PARAMETER_MODIFIERS[1];
-
-				if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
-					$url = str_ireplace([$param1, $param2], $value, $url);
-				} else {
-					$otherParams[$param] = $value;
-				}
-			}
-
-			$url = rtrim($url, '/') . '/' . join('/', $otherParams);
-		}
-
-		$url = rtrim($url, '/') . '/';
-
-		if ($getParams !== null) {
-			$url .= $this->arrayToParams($getParams);
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Find route by alias, class, callback or method.
-	 *
-	 * @param string $query
-	 * @return LoadableRoute|null
-	 */
-	public function findRoute($query)
-	{
-		/* @var $route LoadableRoute */
-		foreach ($this->controllerUrlMap as $route) {
-
-			// Check an alias exist, if the matches - use it
-			// Matches either Router alias or controller alias.
-			if ($route->hasAlias($query)) {
-				return $route;
-			}
-
-			// Direct match to controller
-			if ($route instanceof IControllerRoute) {
-				if (strtolower($route->getController()) === strtolower($query)) {
-					return $route;
-				}
-			}
-
-			// Using @ is most definitely a controller@method or alias@method
-			if (strpos($query, '@') !== false) {
-				list($controller, $method) = array_map('strtolower', explode('@', $query));
-
-				if ($controller === strtolower($route->getClass()) && $method === strtolower($route->getMethod())) {
-					return $route;
-				}
-			}
-
-			// Use callback if it's not a function
-			if (strpos($query, '@') !== false && strpos($route->getCallback(), '@') !== false && !is_callable($route->getCallback())) {
-
-				if (strtolower($query) === strtolower($route->getClass())) {
-					return $route;
-				}
-
-				if (strtolower($route->getCallback()) === strtolower($query) || strpos($route->getCallback(), $query) === 0) {
-					return $route;
-				}
-
-			}
-		}
-
-		return null;
-	}
-
-	public function getRoute($controller = null, $parameters = null, $getParams = null)
-	{
-		if ($getParams !== null && is_array($getParams) === false) {
-			throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
-		}
-
-		// Return current route if no options has been specified
-		if ($controller === null && $parameters === null) {
-
-			$getParams = ($getParams !== null) ? $getParams : $_GET;
-			$url = parse_url($this->request->getUri(), PHP_URL_PATH) . $this->arrayToParams($getParams);
-
-			return $url;
-		}
-
-		// If nothing is defined and a route is loaded we use that
-		if ($controller === null && $this->loadedRoute !== null) {
-			return $this->processUrl($this->loadedRoute, $this->loadedRoute->getMethod(), $parameters, $getParams);
-		}
-
-		$route = $this->findRoute($controller);
-
-		if ($route !== null) {
-			return $this->processUrl($route, $route->getMethod(), $parameters, $getParams);
-		}
-
-		// Using @ is most definitely a controller@method or alias@method
-		if (stripos($controller, '@') !== false) {
-			list($controller, $method) = explode('@', $controller);
-
-			/* @var $route LoadableRoute */
-			foreach ($this->controllerUrlMap as $route) {
-
-				if ($route->hasAlias($controller)) {
-					return $this->processUrl($route, $method, $parameters, $getParams);
-				}
-
-				// Match controllers either by: "alias @ method" or "controller@method"
-				if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($controller)) {
-					return $this->processUrl($route, $method, $parameters, $getParams);
-				}
-
-			}
-		}
-
-		$url = [($controller === null) ? '/' : $controller];
-
-		if ($parameters !== null && count($parameters) > 0) {
-			$url = array_merge($url, (array)$parameters);
-		}
-
-		$url = '/' . trim(join('/', $url), '/') . '/';
-
-		if ($getParams !== null) {
-			$url .= $this->arrayToParams($getParams);
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Get bootmanagers
-	 * @return array
-	 */
-	public function getBootManagers()
-	{
-		return $this->bootManagers;
-	}
-
-	/**
-	 * Set bootmanagers
-	 * @param array $bootManagers
-	 */
-	public function setBootManagers(array $bootManagers)
-	{
-		$this->bootManagers = $bootManagers;
-	}
-
-	/**
-	 * Add bootmanager
-	 * @param RouterBootManager $bootManager
-	 */
-	public function addBootManager(RouterBootManager $bootManager)
-	{
-		$this->bootManagers[] = $bootManager;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getRoutes()
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * Get current request
-	 *
-	 * @return Request
-	 */
-	public function getRequest()
-	{
-		return $this->request;
-	}
-
-	/**
-	 * Get response
-	 * @return Response
-	 */
-	public function getResponse()
-	{
-		return $this->response;
-	}
-
-	/**
-	 * Get csrf verifier class
-	 * @return BaseCsrfVerifier
-	 */
-	public function getCsrfVerifier()
-	{
-		return $this->csrfVerifier;
-	}
-
-	/**
-	 * Set csrf verifier class
-	 *
-	 * @param BaseCsrfVerifier $csrfVerifier
-	 * @return static
-	 */
-	public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier)
-	{
-		$this->csrfVerifier = $csrfVerifier;
-		return $this;
-	}
-
-	/**
-	 * Get loaded route
-	 * @return RouterRoute|null
-	 */
-	public function getLoadedRoute()
-	{
-		return $this->loadedRoute;
-	}
-
-}
@@ -1,9 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-abstract class RouterBootManager
-{
-	abstract public function boot(Request $request);
-}
@@ -1,110 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Exception\RouterException;
-use Pecee\Http\Request;
-
-class RouterController extends LoadableRoute implements IControllerRoute
-{
-	protected $defaultMethod = 'index';
-	protected $controller;
-	protected $method;
-
-	public function __construct($url, $controller)
-	{
-		$this->setUrl($url);
-		$this->controller = $controller;
-	}
-
-	public function renderRoute(Request $request)
-	{
-		if ($this->getCallback() !== null && 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(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
-
-		if (strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
-
-			$strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
-
-			$path = explode('/', $strippedUrl);
-
-			if (count($path) > 0) {
-
-				$method = (!isset($path[0]) || trim($path[0]) === '') ? $this->defaultMethod : $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 getController()
-	{
-		return $this->controller;
-	}
-
-	/**
-	 * @param string $controller
-	 * @return static
-	 */
-	public function setController($controller)
-	{
-		$this->controller = $controller;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * @param string $method
-	 * @return static
-	 */
-	public function setMethod($method)
-	{
-		$this->method = $method;
-		return $this;
-	}
-
-}
@@ -1,442 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Exception\RouterException;
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-abstract class RouterEntry
-{
-	const REQUEST_TYPE_GET = 'get';
-	const REQUEST_TYPE_POST = 'post';
-	const REQUEST_TYPE_PUT = 'put';
-	const REQUEST_TYPE_PATCH = 'patch';
-	const REQUEST_TYPE_OPTIONS = 'options';
-	const REQUEST_TYPE_DELETE = 'delete';
-
-	public 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,
-	];
-
-	protected $parent;
-	protected $callback;
-
-	protected $namespace;
-	protected $defaultNamespace;
-	protected $regex;
-	protected $requestMethods = array();
-	protected $where = array();
-	protected $parameters = array();
-	protected $middlewares = array();
-
-	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 = '[\w]+')
-	{
-		$parameterNames = array();
-		$regex = '';
-		$lastCharacter = '';
-		$isParameter = false;
-		$parameter = '';
-
-		$routeLength = strlen($route);
-		for ($i = 0; $i < $routeLength; $i++) {
-
-			$character = $route[$i];
-
-			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 and use custom parameter regex if it exists
-				if (is_array($this->where) === true && isset($this->where[$parameter])) {
-					$parameterRegex = $this->where[$parameter];
-				}
-
-				if ($lastCharacter === '?') {
-					$parameter = substr($parameter, 0, strlen($parameter) - 1);
-					$regex .= '(?:\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?)?';
-					$required = false;
-				} else {
-					$regex .= '\/?(?P<' . $parameter . '>' . $parameterRegex . ')[^\/]?';
-				}
-
-				$parameterNames[] = [
-					'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();
-
-			foreach ($parameterNames as $name) {
-				$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
-
-				if ($name['required'] && $parameterValue === null) {
-					throw new RouterException('Missing required parameter ' . $name['name'], 404);
-				}
-
-				if ($name['required'] === false && $parameterValue === null) {
-					continue;
-				}
-
-				$parameters[$name['name']] = $parameterValue;
-			}
-
-			return $parameters;
-		}
-
-		return null;
-	}
-
-	public function loadMiddleware(Request $request, RouterEntry &$route)
-	{
-		if (count($this->getMiddlewares()) > 0) {
-			foreach ($this->getMiddlewares() 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, $route);
-
-			}
-		}
-	}
-
-	public function renderRoute(Request $request)
-	{
-		if ($this->getCallback() !== null && 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);
-			}
-
-			$parameters = array_filter($this->getParameters(), function ($var) {
-				return ($var !== null);
-			});
-
-			call_user_func_array(array($class, $method), $parameters);
-
-			return $class;
-		}
-
-		return null;
-	}
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * Set allowed request methods
-	 *
-	 * @param array $methods
-	 * @return static $this
-	 */
-	public function setRequestMethods(array $methods)
-	{
-		$this->requestMethods = $methods;
-		return $this;
-	}
-
-	/**
-	 * Get allowed request methods
-	 * @return array
-	 */
-	public function getRequestMethods()
-	{
-		return $this->requestMethods;
-	}
-
-	/**
-	 * @return RouterEntry
-	 */
-	public function getParent()
-	{
-		return $this->parent;
-	}
-
-	/**
-	 * Set parent route
-	 *
-	 * @param RouterEntry $parent
-	 * @return static $this
-	 */
-	public function setParent(RouterEntry $parent)
-	{
-		$this->parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * @param string $callback
-	 * @return static
-	 */
-	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;
-	}
-
-	public function setMethod($method)
-	{
-		$this->callback = sprintf('%s@%s', $this->getClass(), $method);
-		return $this;
-	}
-
-	public function setClass($class)
-	{
-		$this->callback = sprintf('%s@%s', $class, $this->getMethod());
-		return $this;
-	}
-
-	/**
-	 * @param string $middleware
-	 * @return static
-	 */
-	public function setMiddleware($middleware)
-	{
-		$this->middlewares[] = $middleware;
-		return $this;
-	}
-
-	public function setMiddlewares(array $middlewares)
-	{
-		$this->middlewares = $middlewares;
-		return $this;
-	}
-
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setNamespace($namespace)
-	{
-		$this->namespace = $namespace;
-		return $this;
-	}
-
-	/**
-	 * @param string $namespace
-	 * @return static $this
-	 */
-	public function setDefaultNamespace($namespace) {
-		$this->defaultNamespace = $namespace;
-		return $this;
-	}
-
-	public function getDefaultNamespace() {
-		return $this->defaultNamespace;
-	}
-
-	/**
-	 * @return string|array
-	 */
-	public function getMiddlewares()
-	{
-		return $this->middlewares;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getNamespace()
-	{
-		return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getParameters()
-	{
-		return $this->parameters;
-	}
-
-	/**
-	 * @param mixed $parameters
-	 * @return static
-	 */
-	public function setParameters($parameters)
-	{
-		$this->parameters = $parameters;
-		return $this;
-	}
-
-	/**
-	 * Add regular expression parameter match
-	 *
-	 * @param array $options
-	 * @return static
-	 */
-	public function where(array $options)
-	{
-		$this->where = $options;
-		return $this;
-	}
-
-	/**
-	 * Add regular expression match for url
-	 *
-	 * @param string $regex
-	 * @return static
-	 */
-	public function match($regex)
-	{
-		$this->regex = $regex;
-		return $this;
-	}
-
-	/**
-	 * Export route settings to array so they can be merged with another route.
-	 *
-	 * @return array
-	 */
-	public function toArray()
-	{
-		$values = array();
-
-		if ($this->namespace !== null) {
-			$values['namespace'] = $this->namespace;
-		}
-
-		if (count($this->middlewares) > 0) {
-			$values['middleware'] = $this->middlewares;
-		}
-
-		if (count($this->where) > 0) {
-			$values['where'] = $this->where;
-		}
-
-		if (count($this->requestMethods) > 0) {
-			$values['method'] = $this->requestMethods;
-		}
-
-		if (count($this->parameters) > 0) {
-			$values['parameters'] = $this->parameters;
-		}
-
-		return $values;
-	}
-
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @return static $this
-	 */
-	public function merge(array $values)
-	{
-		if (isset($values['namespace'])) {
-			$this->setNamespace($values['namespace']);
-		}
-
-		// Push middleware if multiple
-		if (isset($values['middleware'])) {
-			$this->middlewares = array_merge((array)$values['middleware'], $this->middlewares);
-		}
-
-		if (isset($values['method'])) {
-			$this->setRequestMethods((array)$values['method']);
-		}
-
-		if (isset($values['where'])) {
-			$this->where($values['where']);
-		}
-
-		if (isset($values['parameters'])) {
-			$this->setParameters($values['parameters']);
-		}
-
-		return $this;
-	}
-
-	abstract function matchRoute(Request $request);
-
-}
@@ -1,106 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterGroup extends RouterEntry
-{
-	protected $prefix;
-	protected $domains = array();
-	protected $exceptionHandlers = array();
-
-	public function matchDomain(Request $request)
-	{
-		if (count($this->domains) > 0) {
-			foreach ($this->domains as $domain) {
-
-				$parameters = $this->parseParameters($domain, $request->getHost(), '.*');
-
-				if ($parameters !== null) {
-					$this->parameters = $parameters;
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-
-	public function matchRoute(Request $request)
-	{
-		// Skip if prefix doesn't match
-		if ($this->prefix !== null && stripos($request->getUri(), $this->prefix) === false) {
-			return false;
-		}
-
-		return $this->matchDomain($request);
-	}
-
-	public function setExceptionHandlers(array $handlers)
-	{
-		$this->exceptionHandlers = $handlers;
-		return $this;
-	}
-
-	public function getExceptionHandlers()
-	{
-		return $this->exceptionHandlers;
-	}
-
-	public function getDomains()
-	{
-		return $this->domains;
-	}
-
-	public function setDomains(array $domains)
-	{
-		$this->domains = $domains;
-		return $this;
-	}
-
-	/**
-	 * @param string $prefix
-	 * @return static
-	 */
-	public function setPrefix($prefix)
-	{
-		$this->prefix = '/' . trim($prefix, '/');
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrefix()
-	{
-		return $this->prefix;
-	}
-
-	/**
-	 * Merge with information from another route.
-	 *
-	 * @param array $values
-	 * @return static
-	 */
-	public function merge(array $values)
-	{
-		if (isset($values['prefix'])) {
-			$this->setPrefix($values['prefix']);
-		}
-
-		if (isset($values['exceptionHandler'])) {
-			$this->setExceptionHandlers((array)$values['exceptionHandler']);
-		}
-
-		if (isset($values['domain'])) {
-			$this->setDomains((array)$values['domain']);
-		}
-
-		parent::merge($values);
-
-		return $this;
-	}
-
-}
@@ -1,123 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Exception\RouterException;
-use Pecee\Http\Request;
-
-class RouterResource extends LoadableRoute implements IControllerRoute
-{
-	protected $controller;
-
-	public function __construct($url, $controller)
-	{
-		$this->setUrl($url);
-		$this->controller = $controller;
-	}
-
-	public function renderRoute(Request $request)
-	{
-		if ($this->getCallback() !== null && 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([$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(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
-
-		$route = rtrim($this->url, '/') . '/{id?}/{action?}';
-
-		$parameters = $this->parseParameters($route, $url);
-
-		if ($parameters !== null) {
-
-			$parameters = array_merge($this->parameters, (array)$parameters);
-
-			$action = isset($parameters['action']) ? $parameters['action'] : null;
-			unset($parameters['action']);
-
-			$method = request()->getMethod();
-
-			// Delete
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_DELETE) {
-				return $this->call('destroy', $parameters);
-			}
-
-			// Update
-			if (isset($parameters['id']) && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT])) {
-				return $this->call('update', $parameters);
-			}
-
-			// Edit
-			if (isset($parameters['id']) && strtolower($action) === 'edit' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('edit', $parameters);
-			}
-
-			// Create
-			if (strtolower($action) === 'create' && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('create', $parameters);
-			}
-
-			// Save
-			if ($method === static::REQUEST_TYPE_POST) {
-				return $this->call('store', $parameters);
-			}
-
-			// Show
-			if (isset($parameters['id']) && $method === static::REQUEST_TYPE_GET) {
-				return $this->call('show', $parameters);
-			}
-
-			// Index
-			return $this->call('index', $parameters);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getController()
-	{
-		return $this->controller;
-	}
-
-	/**
-	 * @param string $controller
-	 * @return static
-	 */
-	public function setController($controller)
-	{
-		$this->controller = $controller;
-
-		return $this;
-	}
-
-}
@@ -1,42 +0,0 @@
-<?php
-namespace Pecee\SimpleRouter;
-
-use Pecee\Http\Request;
-
-class RouterRoute extends LoadableRoute
-{
-	public function __construct($url, $callback)
-	{
-		$this->setUrl($url);
-		$this->setCallback($callback);
-	}
-
-	public function matchRoute(Request $request)
-	{
-		$url = parse_url(urldecode($request->getUri()), PHP_URL_PATH);
-		$url = rtrim($url, '/') . '/';
-
-		// Match on custom defined regular expression
-		if ($this->regex !== null) {
-			$parameters = array();
-			if (preg_match('/(' . $this->regex . ')/is', $request->getHost() . $url, $parameters)) {
-				$this->parameters = (array)$parameters[0];
-				return true;
-			}
-			return null;
-		}
-
-		// Make regular expression based on route
-		$route = rtrim($this->url, '/') . '/';
-
-		$parameters = $this->parseParameters($route, $url);
-
-		if ($parameters !== null) {
-			$this->parameters = array_merge($this->parameters, $parameters);
-			return true;
-		}
-
-		return null;
-	}
-
-}
@@ -3,341 +3,556 @@
 * ---------------------------
 * 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 Pecee\Exception\RouterException;
+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
 {
-	protected static $defaultNamespace;
+    /**
+     * Default namespace added to all routes
+     * @var string|null
+     */
+    protected static $defaultNamespace;

-	/**
-	 * Start/route request
-	 *
-	 * @throws \Pecee\Exception\RouterException
-	 */
-	public static function start()
-	{
-		static::router()->routeRequest();
-	}
+    /**
+     * The response object
+     * @var Response
+     */
+    protected static $response;

-	/**
-	 * Set default namespace which will be prepended to all routes.
-	 *
-	 * @param string $defaultNamespace
-	 */
-	public static function setDefaultNamespace($defaultNamespace)
-	{
-		static::$defaultNamespace = $defaultNamespace;
-	}
+    /**
+     * Router instance
+     * @var Router
+     */
+    protected static $router;

-	/**
-	 * Base CSRF verifier
-	 *
-	 * @param BaseCsrfVerifier $baseCsrfVerifier
-	 */
-	public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
-	{
-		static::router()->setCsrfVerifier($baseCsrfVerifier);
-	}
+    /**
+     * 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();
+    }

-	/**
-	 * 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 RouterBootManager $bootManager
-	 */
-	public static function addBootManager(RouterBootManager $bootManager)
-	{
-		static::router()->addBootManager($bootManager);
-	}
+    /**
+     * Start the routing an return array with debugging-information
+     *
+     * @return array
+     */
+    public static function startDebug(): array
+    {
+        $routerOutput = null;

-	/**
-	 * Route the given url to your callback on GET request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouterRoute
-	 */
-	public static function get($url, $callback, array $settings = null)
-	{
-		return static::match(['get'], $url, $callback, $settings);
-	}
+        try {
+            ob_start();
+            static::router()->setDebugEnabled(true);
+            static::start();
+            $routerOutput = ob_get_contents();
+            ob_end_clean();
+        } catch (\Exception $e) {

-	/**
-	 * Route the given url to your callback on POST request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouterRoute
-	 */
-	public static function post($url, $callback, array $settings = null)
-	{
-		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 RouterRoute
-	 */
-	public static function put($url, $callback, array $settings = null)
-	{
-		return static::match(['put'], $url, $callback, $settings);
-	}
+        // Try to parse library version
+        $composerFile = \dirname(__DIR__, 3) . '/composer.lock';
+        $version = false;

-	/**
-	 * Route the given url to your callback on PATCH request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouterRoute
-	 */
-	public static function patch($url, $callback, array $settings = null)
-	{
-		return static::match(['patch'], $url, $callback, $settings);
-	}
+        if (is_file($composerFile) === true) {
+            $composerInfo = json_decode(file_get_contents($composerFile), true);

-	/**
-	 * Route the given url to your callback on OPTIONS request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouterRoute
-	 */
-	public static function options($url, $callback, array $settings = null)
-	{
-		return static::match(['options'], $url, $callback, $settings);
-	}
+            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;
+                    }
+                }
+            }
+        }

-	/**
-	 * Route the given url to your callback on DELETE request method.
-	 *
-	 * @param string $url
-	 * @param string|\Closure $callback
-	 * @param array|null $settings
-	 * @return RouterRoute
-	 */
-	public static function delete($url, $callback, array $settings = null)
-	{
-		return static::match(['delete'], $url, $callback, $settings);
-	}
+        $request = static::request();
+        $router = static::router();

-	/**
-	 * Groups allows for encapsulating routes with special settings.
-	 *
-	 * @param array $settings
-	 * @param \Closure $callback
-	 * @throws RouterException
-	 * @return RouterGroup
-	 */
-	public static function group(array $settings = array(), \Closure $callback)
-	{
-		$group = new RouterGroup();
-		$group->setCallback($callback);
-		$group->merge($settings);
+        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(),
+        ];
+    }

-		if (is_callable($callback) === false) {
-			throw new RouterException('Invalid callback provided. Only functions or methods supported');
-		}
+    /**
+     * Set default namespace which will be prepended to all routes.
+     *
+     * @param string $defaultNamespace
+     */
+    public static function setDefaultNamespace(string $defaultNamespace): void
+    {
+        static::$defaultNamespace = $defaultNamespace;
+    }

-		static::router()->addRoute($group);
+    /**
+     * Base CSRF verifier
+     *
+     * @param BaseCsrfVerifier $baseCsrfVerifier
+     */
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
+    {
+        static::router()->setCsrfVerifier($baseCsrfVerifier);
+    }

-		return $group;
-	}
+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }

-	/**
-	 * Alias for the form method
-	 *
-	 * @param string $url
-	 * @param callable $callback
-	 * @param array|null $settings
-	 * @see SimpleRouter::form
-	 * @return RouterRoute
-	 */
-	public static function basic($url, $callback, array $settings = null)
-	{
-		return static::match(['get', 'post'], $url, $callback, $settings);
-	}
+    /**
+     * 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);
+    }

-	/**
-	 * 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 RouterRoute
-	 */
-	public static function form($url, $callback, array $settings = null)
-	{
-		return static::match(['get', 'post'], $url, $callback, $settings);
-	}
+    /**
+     * 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);
+    }

-	/**
-	 * 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 RouterEntry|RouterRoute
-	 */
-	public static function match(array $requestMethods, $url, $callback, array $settings = null)
-	{
-		$route = new RouterRoute($url, $callback);
-		$route->setRequestMethods($requestMethods);
-		$route = static::addDefaultNamespace($route);
+    /**
+     * 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);
+    }

-		if ($settings !== null) {
-			$route->merge($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);
+    }

-		static::router()->addRoute($route);
+    /**
+     * 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);
+    }

-		return $route;
-	}
+    /**
+     * 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);
+    }

-	/**
-	 * 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 RouterRoute
-	 */
-	public static function all($url, $callback, array $settings = null)
-	{
-		$route = new RouterRoute($url, $callback);
+    /**
+     * 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);
+    }

-		$route = static::addDefaultNamespace($route);
+    /**
+     * 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');
+        }

-		if ($settings !== null) {
-			$route->merge($settings);
-		}
+        $group = new RouteGroup();
+        $group->setCallback($callback);
+        $group->setSettings($settings);

-		static::router()->addRoute($route);
+        static::router()->addRoute($group);

-		return $route;
-	}
+        return $group;
+    }

-	/**
-	 * This route will route request from the given url to the controller.
-	 *
-	 * @param string $url
-	 * @param string $controller
-	 * @param array|null $settings
-	 * @return RouterController
-	 */
-	public static function controller($url, $controller, array $settings = null)
-	{
-		$route = new RouterController($url, $controller);
+    /**
+     * 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');
+        }

-		$route = static::addDefaultNamespace($route);
+        $settings['prefix'] = $url;

-		if ($settings !== null) {
-			$route->merge($settings);
-		}
+        $group = new RoutePartialGroup();
+        $group->setSettings($settings);
+        $group->setCallback($callback);

-		static::router()->addRoute($route);
+        static::router()->addRoute($group);

-		return $route;
-	}
+        return $group;
+    }

-	/**
-	 * 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 RouterResource
-	 */
-	public static function resource($url, $controller, array $settings = null)
-	{
-		$route = new RouterResource($url, $controller);
+    /**
+     * 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);
+    }

-		if ($settings !== null) {
-			$route->merge($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);
+    }

-		static::router()->addRoute($route);
+    /**
+     * 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 = static::addDefaultNamespace($route);

-		return $route;
-	}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }

-	/**
-	 * Get url by controller or alias.
-	 *
-	 * @param string $controller
-	 * @param array|null $parameters
-	 * @param array|null $getParams
-	 * @return string
-	 */
-	public static function getRoute($controller = null, $parameters = null, $getParams = null)
-	{
-		return static::router()->getRoute($controller, $parameters, $getParams);
-	}
+        static::router()->addRoute($route);

-	/**
-	 * Get the request
-	 *
-	 * @return \Pecee\Http\Request
-	 */
-	public static function request()
-	{
-		return static::router()->getRequest();
-	}
+        return $route;
+    }

-	/**
-	 * Get the response object
-	 *
-	 * @return \Pecee\Http\Response
-	 */
-	public static function response()
-	{
-		return static::router()->getResponse();
-	}
+    /**
+     * 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);

-	/**
-	 * Returns the router instance
-	 *
-	 * @return RouterBase
-	 */
-	public static function router()
-	{
-		return RouterBase::getInstance();
-	}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }

-	/**
-	 * Prepends the default namespace to all new routes added.
-	 *
-	 * @param RouterEntry $route
-	 * @return RouterEntry
-	 */
-	protected static function addDefaultNamespace(RouterEntry $route)
-	{
-		if (static::$defaultNamespace !== null) {
-			$namespace = static::$defaultNamespace;
+        static::router()->addRoute($route);

-			if ($route->getNamespace() !== null) {
-				$namespace .= '\\' . $route->getNamespace();
-			}
+        return $route;
+    }

-			$route->setDefaultNamespace($namespace);
-		}
+    /**
+     * 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);

-		return $route;
-	}
+        if ($settings !== null) {
+            $route->setSettings($settings);
+        }
+
+        static::router()->addRoute($route);
+
+        return $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;
+    }
+
+    /**
+     * 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) {
+
+            $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;
+    }

 }
@@ -1,25 +0,0 @@
-<?php
-
-class DummyController
-{
-	public function start()
-	{
-		echo static::class . '@' . 'start() OK';
-	}
-
-	public function param($params = null)
-	{
-		$params = func_get_args();
-		echo 'Params: ' . join(', ', $params);
-	}
-
-	public function notFound()
-	{
-		echo 'not found';
-	}
-
-	public function silent() {
-
-	}
-
-}
@@ -1,14 +0,0 @@
-<?php
-require_once 'Exceptions/MiddlewareLoadedException.php';
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-class DummyMiddleware implements IMiddleware
-{
-	public function handle(Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null)
-	{
-		throw new MiddlewareLoadedException('Middleware loaded!');
-	}
-
-}
@@ -1,10 +0,0 @@
-<?php
-
-class ExceptionHandler implements \Pecee\Handler\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null, \Exception $error)
-	{
-		throw $error;
-	}
-
-}
@@ -1,92 +0,0 @@
-<?php
-
-require_once 'Dummy/DummyMiddleware.php';
-require_once 'Dummy/DummyController.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-
-class GroupTest extends PHPUnit_Framework_TestCase
-{
-	protected $result;
-
-	public function testGroupLoad()
-	{
-		$this->result = false;
-
-		SimpleRouter::group(['prefix' => '/group'], function () {
-			$this->result = true;
-		});
-
-		try {
-			SimpleRouter::start();
-		} catch (Exception $e) {
-			// ignore RouteNotFound exception
-		}
-
-		$this->assertTrue($this->result);
-	}
-
-	public function testNestedGroup()
-	{
-
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/api/v1/test');
-		SimpleRouter::request()->setMethod('get');
-
-		SimpleRouter::group(['prefix' => '/api'], function () {
-
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
-
-		});
-
-		SimpleRouter::start();
-	}
-
-	public function testManyRoutes()
-	{
-
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/match');
-		SimpleRouter::request()->setMethod('get');
-
-		SimpleRouter::group(['prefix' => '/api'], function () {
-
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/test', 'DummyController@start');
-			});
-
-		});
-
-		SimpleRouter::get('/my/match', 'DummyController@start');
-
-		SimpleRouter::group(['prefix' => '/service'], function () {
-
-			SimpleRouter::group(['prefix' => '/v1'], function () {
-				SimpleRouter::get('/no-match', 'DummyController@start');
-			});
-
-		});
-
-		SimpleRouter::start();
-	}
-
-	public function testUrls()
-	{
-
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/fancy/url/1');
-		SimpleRouter::request()->setMethod('get');
-
-		SimpleRouter::get('/my/fancy/url/1', 'DummyController@start', ['as' => 'fancy1']);
-		SimpleRouter::get('/my/fancy/url/2', 'DummyController@start')->setAlias('fancy2');
-
-		SimpleRouter::start();
-
-		$this->assertTrue((SimpleRouter::getRoute('fancy1') === '/my/fancy/url/1/'));
-		$this->assertTrue((SimpleRouter::getRoute('fancy2') === '/my/fancy/url/2/'));
-
-	}
-
-}
@@ -1,32 +0,0 @@
-<?php
-
-require_once 'Dummy/DummyMiddleware.php';
-require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-
-class MiddlewareTest extends PHPUnit_Framework_TestCase
-{
-	public function testMiddlewareFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/my/test/url');
-
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/my/test/url', 'DummyController@start', ['middleware' => 'DummyMiddleware']);
-		});
-
-		$found = false;
-
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof MiddlewareLoadedException);
-		}
-
-		$this->assertTrue($found);
-	}
-
-}
@@ -1,140 +0,0 @@
-<?php
-
-require_once 'Dummy/DummyMiddleware.php';
-require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-
-class RouterRouteTest extends PHPUnit_Framework_TestCase
-{
-	protected $result = false;
-
-	public function testNotFound()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
-
-		SimpleRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
-			SimpleRouter::get('/non-existing-path', 'DummyController@start');
-		});
-
-		$found = false;
-
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$found = ($e instanceof \Pecee\Exception\RouterException && $e->getCode() == 404);
-		}
-
-		$this->assertTrue($found);
-	}
-
-	public function testGet()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('get');
-
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
-
-	public function testPost()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
-
-		SimpleRouter::post('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
-
-	public function testPut()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('put');
-
-		SimpleRouter::put('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
-
-	public function testDelete()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('delete');
-
-		SimpleRouter::delete('/my/test/url', 'DummyController@start');
-		SimpleRouter::start();
-	}
-
-	public function testMethodNotAllowed()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setUri('/my/test/url');
-		SimpleRouter::request()->setMethod('post');
-
-		SimpleRouter::get('/my/test/url', 'DummyController@start');
-
-		try {
-			SimpleRouter::start();
-		} catch (\Exception $e) {
-			$this->assertEquals(403, $e->getCode());
-		}
-	}
-
-	public function testSimpleParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1');
-
-		SimpleRouter::get('/test-{param1}', 'DummyController@param');
-		SimpleRouter::start();
-	}
-
-	public function testMultiParam()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test-param1-param2');
-
-		SimpleRouter::get('/test-{param1}-{param2}', 'DummyController@param');
-		SimpleRouter::start();
-	}
-
-	public function testPathParamRegex()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test/path/123123');
-
-		SimpleRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
-		SimpleRouter::start();
-	}
-
-	public function testDomainRoute()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/test');
-		SimpleRouter::request()->setHost('hello.world.com');
-
-		$this->result = false;
-
-		SimpleRouter::group(['domain' => '{subdomain}.world.com'], function () {
-			SimpleRouter::get('/test', function ($subdomain = null) {
-				$this->result = ($subdomain === 'hello');
-			});
-		});
-
-		SimpleRouter::start();
-
-		$this->assertTrue($this->result);
-
-	}
-
-}
@@ -1,83 +0,0 @@
-<?php
-
-require_once 'Dummy/DummyMiddleware.php';
-require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
-
-use Pecee\SimpleRouter\SimpleRouter as SimpleRouter;
-
-class RouterUrlTest extends PHPUnit_Framework_TestCase
-{
-	protected $result = false;
-
-	protected function getUrl($controller = null, $parameters = null, $getParams = null) {
-		return SimpleRouter::getRoute($controller, $parameters, $getParams);
-	}
-
-	public function testUrls()
-	{
-		SimpleRouter::router()->reset();
-		SimpleRouter::request()->setMethod('get');
-		SimpleRouter::request()->setUri('/');
-
-		// Match normal route on alias
-		SimpleRouter::get('/', 'DummyController@silent', ['as' => 'home']);
-
-		SimpleRouter::group(['prefix' => '/admin'], function() {
-
-			// Match route with prefix on alias
-			SimpleRouter::get('/{id?}', 'DummyController@start', ['as' => 'admin.home']);
-
-			// Match controller with prefix and alias
-			SimpleRouter::controller('/users', 'DummyController', ['as' => 'admin.users']);
-
-			// Match controller with prefix and NO alias
-			SimpleRouter::controller('/pages', 'DummyController');
-
-		});
-
-		// Match controller with no prefix and no alias
-		SimpleRouter::controller('/cats', 'CatsController');
-
-		// Pretend to load page
-		SimpleRouter::start();
-
-		// Should match /
-		$this->assertEquals($this->getUrl('home'), '/');
-
-		// Should match /admin/
-		$this->assertEquals($this->getUrl('DummyController@start'), '/admin/');
-
-		// Should match /admin/
-		$this->assertEquals($this->getUrl('admin.home'), '/admin/');
-
-		// Should match /admin/2/
-		$this->assertEquals($this->getUrl('admin.home', ['id' => 2]), '/admin/2/');
-
-		// Should match /admin/users/
-		$this->assertEquals($this->getUrl('admin.users'), '/admin/users/');
-
-		// Should match /admin/users/home/
-		$this->assertEquals($this->getUrl('admin.users@home'), '/admin/users/home/');
-
-		// Should match /cats/
-		$this->assertEquals($this->getUrl('CatsController'), '/cats/');
-
-		// Should match /cats/view/
-		$this->assertEquals($this->getUrl('CatsController', 'view'), '/cats/view/');
-
-		// Should match /cats/view/
-		$this->assertEquals($this->getUrl('CatsController', ['view']), '/cats/view/');
-
-		// Should match /cats/view/666
-		$this->assertEquals($this->getUrl('CatsController@view', ['666']), '/cats/view/666/');
-
-		// Should match /funny/man/
-		$this->assertEquals($this->getUrl('/funny/man'), '/funny/man/');
-
-		// Should match /?jackdaniels=true
-		$this->assertEquals($this->getUrl('home', null, ['jackdaniels' => 'true']), '/?jackdaniels=true');
-
-	}
-
-}
@@ -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);
+    }
+}
@@ -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';
+    }
+
+}
@@ -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!');
+	}
+
+}
@@ -0,0 +1,5 @@
+<?php
+
+class ExceptionHandlerException extends \Exception
+{
+}
--- a/Show More
+++ b/Show More