Merge pull request #434 from skipperbent/v4-development

Version 4.2.0.6
Bugfixes and optimisations.
2026-06-18 17:26:28 +00:00 · 2018-11-25 00:47:02 +01:00 · 2018-11-25 00:44:20 +01:00 · 2018-11-25 00:27:54 +01:00 · 2018-11-25 00:27:30 +01:00 · 2018-11-10 22:17:08 -02:00
97 changed files with 6715 additions and 1805 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,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
@@ -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,53 @@
+<?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/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" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+    </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,50 @@
+<?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/symfony/yaml" />
+      <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,939 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" line="221" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" 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="FavoritesManager">
+    <favorites_list name="simple-php-router" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="363">
+              <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file 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="396">
+              <caret line="190" column="12" selection-start-line="190" selection-start-column="12" selection-end-line="190" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file 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="294">
+              <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+              <folding>
+                <element signature="e#36#82#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="265">
+              <caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="94" column="49" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" />
+              <folding>
+                <element signature="e#44#82#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="20" column="7" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="42">
+              <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="206">
+                <caret line="849" column="50" selection-start-line="849" selection-start-column="50" selection-end-line="849" selection-end-column="50" />
+              </first_editor>
+              <second_editor>
+                <markdownNavigatorState />
+              </second_editor>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>options</find>
+      <find>parent::set</find>
+      <find>parseParameters</find>
+      <find>stripos</find>
+      <find>setPrefix</find>
+      <find>var_dum</find>
+      <find>parse</find>
+      <find>getParams</find>
+      <find>setQuery</find>
+      <find>contains</find>
+      <find>matchRoute</find>
+      <find>-&gt;getValue</find>
+      <find>-&gt;find</find>
+      <find>function find</find>
+      <find>Req</find>
+      <find>value(</find>
+      <find>file(</find>
+      <find>setUrl</find>
+      <find>TODO</find>
+      <find>input()-&gt;get</find>
+      <find>function get</find>
+      <find>REQUEST_TYPE_</find>
+      <find>or method</find>
+      <find>setDebugEnabled</find>
+      <find>debugEnabled</find>
+      <find>optiona</find>
+      <find>\/</find>
+      <find>requirements</find>
+      <find>ler = new I</find>
+      <find>csrf_token</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\tests</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee</dir>
+      <dir>E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter</dir>
+      <dir>E:\Workspace\simple-php-router\src</dir>
+      <dir>E:\Workspace\simple-php-router</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$/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/Security/ITokenProvider.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.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/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/ClassLoader/ClassLoader.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
+        <option value="$PROJECT_DIR$/helpers.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" />
+        <option value="$PROJECT_DIR$/composer.json" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+      </list>
+    </option>
+  </component>
+  <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="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.1">
+    <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/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" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
+    </include_path>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-10" />
+    <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="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+              <item name="Http" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+              <item name="SimpleRouter" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+              <item name="SimpleRouter" type="462c0819:PsiDirectoryNode" />
+              <item name="Route" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+              <item name="SimpleRouter" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pecee-pixie" />
+    <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="preferences.pluginManager" />
+  </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.tests">
+    <configuration name="EventHandlerTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="EventHandlerTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" scope="Class" />
+      <method v="2" />
+    </configuration>
+    <configuration name="RouterRouteTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="RouterRouteTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" scope="Class" />
+      <method v="2" />
+    </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" />
+      <method v="2" />
+    </configuration>
+    <configuration name="tests" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner directory="$PROJECT_DIR$/tests" />
+      <method v="2" />
+    </configuration>
+    <configuration name="debug.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/tests/debug.php">
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="PHP Script.debug.php" />
+      <item itemvalue="PHPUnit.tests" />
+      <item itemvalue="PHPUnit.phpunit.xml" />
+      <item itemvalue="PHPUnit.EventHandlerTest" />
+      <item itemvalue="PHPUnit.RouterRouteTest" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="PHPUnit.tests" />
+        <item itemvalue="PHPUnit.RouterRouteTest" />
+        <item itemvalue="PHPUnit.phpunit.xml" />
+        <item itemvalue="PHP Script.debug.php" />
+        <item itemvalue="PHPUnit.EventHandlerTest" />
+      </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="2772000" />
+      <workItem from="1522385007533" duration="313000" />
+      <workItem from="1522507670882" duration="309000" />
+      <workItem from="1522508007514" duration="2427000" />
+      <workItem from="1522530661439" duration="3502000" />
+      <workItem from="1522668357317" duration="4847000" />
+      <workItem from="1523014652739" duration="16240000" />
+      <workItem from="1523035686391" duration="174000" />
+      <workItem from="1523035884787" duration="1022000" />
+      <workItem from="1523038029219" duration="56000" />
+      <workItem from="1535121332253" duration="2346000" />
+      <workItem from="1535671881115" duration="506000" />
+      <workItem from="1535806837271" duration="204000" />
+      <workItem from="1543101575756" duration="1207000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="tests - 2018.08.24 at 17h 12m 28s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.24 at 17h 12m 29s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.24 at 17h 12m 31s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.24 at 17h 12m 32s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.24 at 17h 12m 33s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.24 at 17h 13m 32s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.31 at 01h 36m 24s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.31 at 01h 36m 28s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.08.31 at 01h 36m 29s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests - 2018.11.25 at 00h 37m 03s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="171000000" />
+  </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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21878122" />
+      <window_info id="Structure" order="1" weight="0.24975026" />
+      <window_info id="Favorites" order="2" weight="0.32967034" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.32696176" />
+      <window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.4935065" visible="true" weight="0.28169015" />
+      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.49080735" weight="0.32595575" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="REST Client" order="6" weight="0.32929292" />
+      <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Command Line Tools Console" order="9" weight="0.32928804" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
+      <window_info anchor="bottom" id="TODO" order="11" weight="0.32897383" />
+      <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="13" weight="0.3279678" />
+      <window_info anchor="bottom" id="Inspection Results" order="14" weight="0.32696176" />
+      <window_info anchor="bottom" id="Event Log" order="15" sideWeight="0.5064935" weight="0.28169015" />
+      <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="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Database" order="3" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <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/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$/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/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$/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/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/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/InputItem.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+        </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="180">
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        </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="540">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+        </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="1860">
+          <caret line="94" column="24" selection-start-line="94" selection-start-column="24" selection-end-line="94" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IPartialGroupRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Response.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2096" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/phpunit/phpunit/src/Framework/TestCase.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-687">
+          <caret line="100" column="15" selection-start-line="100" selection-start-column="15" selection-end-line="100" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/MiddlewareTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="6" column="53" lean-forward="true" selection-start-line="6" selection-start-column="53" selection-end-line="6" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1640">
+          <caret line="85" selection-start-line="85" selection-end-line="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/phpunit/phpunit/src/Framework/Assert.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="333">
+          <caret line="1197" column="27" selection-start-line="1197" selection-start-column="27" selection-end-line="1197" selection-end-column="27" />
+        </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="86">
+          <caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="716">
+          <caret line="55" column="45" selection-start-line="55" selection-start-column="45" selection-end-line="55" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/TestRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="20">
+          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+        </state>
+      </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="640">
+          <caret line="32" column="36" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="960">
+          <caret line="51" column="59" selection-start-line="51" selection-start-column="59" selection-end-line="51" selection-end-column="59" />
+        </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="405">
+          <caret line="81" column="60" selection-start-line="81" selection-start-column="60" selection-end-line="81" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+        </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="280">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="65" column="87" selection-start-line="65" selection-start-column="87" selection-end-line="65" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="538">
+          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+        </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="243">
+          <caret line="263" column="48" lean-forward="true" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
+        </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="120">
+          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        </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="363">
+          <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+        </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="396">
+          <caret line="190" column="12" selection-start-line="190" selection-start-column="12" selection-end-line="190" selection-end-column="12" />
+        </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="294">
+          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+          <folding>
+            <element signature="e#36#82#0#PHP" expanded="true" />
+          </folding>
+        </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="265">
+          <caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
+        </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="172">
+          <caret line="94" column="49" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" />
+          <folding>
+            <element signature="e#44#82#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="206">
+            <caret line="849" column="50" selection-start-line="849" selection-start-column="50" selection-end-line="849" selection-end-column="50" />
+          </first_editor>
+          <second_editor>
+            <markdownNavigatorState />
+          </second_editor>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="20" column="7" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </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
@@ -2,11 +2,19 @@
  "name": "pecee/simple-router",
  "description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.",
  "keywords": [
+    "router",
    "router",
    "routing",
+    "route",
+    "simple-php-router",
    "laravel",
    "pecee",
-    "route"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
  ],
  "license": "MIT",
  "support": {
@@ -19,14 +27,17 @@
    }
  ],
  "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.1",
+    "ext-json": "*",
+    "php-di/php-di": "^6.0"
  },
  "require-dev": {
-    "phpunit/phpunit": "4.7.7"
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
  },
  "autoload": {
    "psr-4": {
      "Pecee\\": "src/Pecee/"
    }
  }
-}
+}
@@ -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|array|string|null
+ */
+function input($index = null, $defaultValue = null, ...$methods)
+{
+    if ($index !== null) {
+        return request()->getInputHandler()->value($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,47 +1,48 @@
 <?php
+
 namespace Pecee\Controllers;

 interface IResourceController
 {

    /**
-     * @return void
+     * @return string|null
     */
-    public function index();
+    public function index(): ?string;

    /**
     * @param mixed $id
-     * @return void
+     * @return string|null
     */
-    public function show($id);
+    public function show($id): ?string;

    /**
-     * @return void
+     * @return string|null
     */
-    public function store();
+    public function store(): ?string;

    /**
-     * @return void
+     * @return string|null
     */
-    public function create();
+    public function create(): ?string;

    /**
     * View
     * @param mixed $id
-     * @return void
+     * @return string|null
     */
-    public function edit($id);
+    public function edit($id): ?string;

    /**
     * @param mixed $id
-     * @return void
+     * @return string|null
     */
-    public function update($id);
+    public function update($id): ?string;

    /**
     * @param mixed $id
-     * @return void
+     * @return string|null
     */
-    public function destroy($id);
+    public function destroy($id): ?string;

 }
@@ -1,71 +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('random_bytes')) {
-            return bin2hex(random_bytes(32));
-        }
-
-        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]);
-    }
-
-}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Exceptions;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Pecee\Http\Exceptions;
+
+class MalformedUrlException extends \Exception
+{
+
+}
@@ -1,19 +1,22 @@
 <?php
+
 namespace Pecee\Http\Input;

 interface IInputItem
 {

-    public function getIndex();
+    public function getIndex(): string;

-    public function setIndex($index);
+    public function setIndex(string $index): self;

-    public function getName();
+    public function getName(): ?string;

-    public function setName($name);
+    public function setName(string $name): self;

-    public function getValue();
+    public function getValue(): ?string;

-    public function __toString();
+    public function setValue(string $value): self;
+
+    public function __toString(): string;

 }
@@ -1,297 +0,0 @@
-<?php
-namespace Pecee\Http\Input;
-
-use Pecee\Http\Request;
-
-class Input
-{
-    /**
-     * @var array
-     */
-    public $get = [];
-
-    /**
-     * @var array
-     */
-    public $post = [];
-
-    /**
-     * @var array
-     */
-    public $file = [];
-
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-
-        $this->parseInputs();
-    }
-
-    public function parseInputs()
-    {
-        /* 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();
-        }
-    }
-
-    public function parseFiles()
-    {
-        $list = [];
-
-        foreach ($_FILES as $key => $value) {
-
-            // Handle array input
-            if (is_array($value['name']) === false) {
-                $values['index'] = $key;
-                $list[$key] = InputFile::createFromArray(array_merge($value, $values));
-                continue;
-            }
-
-            $keys = [];
-
-            $files = $this->rearrangeFiles($value['name'], $keys, $value);
-
-            if (isset($list[$key])) {
-                $list[$key][] = $files;
-            } else {
-                $list[$key] = $files;
-            }
-
-        }
-
-        return $list;
-    }
-
-    protected function rearrangeFiles(array $values, &$index, $original)
-    {
-
-        $output = [];
-
-        $getItem = function ($key, $property = 'name') use ($original, $index) {
-
-            $path = $original[$property];
-
-            $fileValues = array_values($index);
-
-            foreach ($fileValues as $i) {
-                $path = $path[$i];
-            }
-
-            return $path[$key];
-        };
-
-        foreach ($values as $key => $value) {
-
-            if (is_array($getItem($key)) === false) {
-
-                $file = InputFile::createFromArray([
-                    'index'    => $key,
-                    'error'    => $getItem($key, 'error'),
-                    'tmp_name' => $getItem($key, 'tmp_name'),
-                    'type'     => $getItem($key, 'type'),
-                    'size'     => $getItem($key, 'size'),
-                    'filename' => $getItem($key, 'name'),
-                ]);
-
-                if (isset($output[$key])) {
-                    $output[$key][] = $file;
-                } else {
-                    $output[$key] = $file;
-                }
-
-                continue;
-            }
-
-            $index[] = $key;
-
-            $files = $this->rearrangeFiles($value, $index, $original);
-
-            if (isset($output[$key])) {
-                $output[$key][] = $files;
-            } else {
-                $output[$key] = $files;
-            }
-
-        }
-
-        return $output;
-    }
-
-    protected function handleGetPost(array $array)
-    {
-        $list = [];
-
-        $max = count($array) - 1;
-        $keys = array_keys($array);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $value = $array[$key];
-
-            // 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($index, $defaultValue = null)
-    {
-        return isset($this->post[$index]) ? $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($index, $defaultValue = null)
-    {
-        return isset($this->file[$index]) ? $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($index, $defaultValue = null)
-    {
-        return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
-    }
-
-    /**
-     * Get input object
-     *
-     * @param string $index
-     * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return IInputItem|string
-     */
-    public function getObject($index, $defaultValue = null, $methods = null)
-    {
-        if ($methods !== null && is_string($methods) === true) {
-            $methods = [$methods];
-        }
-
-        $element = null;
-
-        if ($methods === null || in_array('get', $methods)) {
-            $element = $this->findGet($index);
-        }
-
-        if (($element === null && $methods === null) || ($methods !== null && in_array('post', $methods))) {
-            $element = $this->findPost($index);
-        }
-
-        if (($element === null && $methods === null) || ($methods !== null && in_array('file', $methods))) {
-            $element = $this->findFile($index);
-        }
-
-        return ($element !== null) ? $element : $defaultValue;
-    }
-
-    /**
-     * Get input element value matching index
-     *
-     * @param string $index
-     * @param string|null $defaultValue
-     * @param array|string|null $methods
-     * @return InputItem|string
-     */
-    public function get($index, $defaultValue = null, $methods = null)
-    {
-        $input = $this->getObject($index, $defaultValue, $methods);
-
-        if ($input instanceof InputItem) {
-            return (trim($input->getValue()) === '') ? $defaultValue : $input->getValue();
-        }
-
-        return $input;
-    }
-
-    /**
-     * Check if a input-item exist
-     *
-     * @param string $index
-     * @return bool
-     */
-    public function exists($index)
-    {
-        return ($this->getObject($index) !== null);
-    }
-
-    /**
-     * 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 (strpos(trim($contents), '{') === 0) {
-                $output = json_decode($contents, true);
-                if ($output === false) {
-                    $output = [];
-                }
-            }
-        }
-
-        $output = array_merge($_GET, $output);
-
-        if ($filter !== null) {
-            $output = array_filter($output, function ($key) use ($filter) {
-                return (in_array($key, $filter) === true);
-            }, ARRAY_FILTER_USE_KEY);
-        }
-
-        return $output;
-    }
-
-}
@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http\Input;

+use Pecee\Exceptions\InvalidArgumentException;
+
 class InputFile implements IInputItem
 {
    public $index;
@@ -8,43 +11,45 @@ class InputFile implements IInputItem
    public $filename;
    public $size;
    public $type;
-    public $error;
+    public $errors;
    public $tmpName;

-    public function __construct($index)
+    public function __construct(string $index)
    {
        $this->index = $index;

+        $this->errors = 0;
+
        // Make the name human friendly, by replace _ with space
-        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
    }

    /**
     * Create from array
     *
     * @param array $values
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
     * @return static
     */
-    public static function createFromArray(array $values)
+    public static function createFromArray(array $values): self
    {
-        if (!isset($values['index'])) {
-            throw new \InvalidArgumentException('Index key is required');
+        if (isset($values['index']) === false) {
+            throw new InvalidArgumentException('Index key is required');
        }

        /* Easy way of ensuring that all indexes-are set and not filling the screen with isset() */

-        $values = array_merge([
+        $values += [
            'tmp_name' => null,
            'type'     => null,
            'size'     => null,
            'name'     => null,
            'error'    => null,
-        ], $values);
+        ];

        return (new static($values['index']))
-            ->setSize($values['size'])
-            ->setError($values['error'])
+            ->setSize((int)$values['size'])
+            ->setError((int)$values['error'])
            ->setType($values['type'])
            ->setTmpName($values['tmp_name'])
            ->setFilename($values['name']);
@@ -54,7 +59,7 @@ class InputFile implements IInputItem
    /**
     * @return string
     */
-    public function getIndex()
+    public function getIndex(): string
    {
        return $this->index;
    }
@@ -62,9 +67,9 @@ class InputFile implements IInputItem
    /**
     * Set input index
     * @param string $index
-     * @return static $this
+     * @return static
     */
-    public function setIndex($index)
+    public function setIndex(string $index): IInputItem
    {
        $this->index = $index;

@@ -74,7 +79,7 @@ class InputFile implements IInputItem
    /**
     * @return string
     */
-    public function getSize()
+    public function getSize(): string
    {
        return $this->size;
    }
@@ -82,9 +87,9 @@ class InputFile implements IInputItem
    /**
     * Set file size
     * @param int $size
-     * @return static $this
+     * @return static
     */
-    public function setSize($size)
+    public function setSize(int $size): IInputItem
    {
        $this->size = $size;

@@ -95,7 +100,7 @@ class InputFile implements IInputItem
     * Get mime-type of file
     * @return string
     */
-    public function getMime()
+    public function getMime(): string
    {
        return $this->getType();
    }
@@ -103,7 +108,7 @@ class InputFile implements IInputItem
    /**
     * @return string
     */
-    public function getType()
+    public function getType(): string
    {
        return $this->type;
    }
@@ -111,9 +116,9 @@ class InputFile implements IInputItem
    /**
     * Set type
     * @param string $type
-     * @return static $this
+     * @return static
     */
-    public function setType($type)
+    public function setType(string $type): IInputItem
    {
        $this->type = $type;

@@ -125,7 +130,7 @@ class InputFile implements IInputItem
     *
     * @return string
     */
-    public function getExtension()
+    public function getExtension(): string
    {
        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
    }
@@ -135,7 +140,7 @@ class InputFile implements IInputItem
     *
     * @return string
     */
-    public function getName()
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -145,9 +150,9 @@ class InputFile implements IInputItem
     * Useful for adding validation etc.
     *
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setName($name)
+    public function setName(string $name): IInputItem
    {
        $this->name = $name;

@@ -158,9 +163,9 @@ class InputFile implements IInputItem
     * Set filename
     *
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setFilename($name)
+    public function setFilename($name): IInputItem
    {
        $this->filename = $name;

@@ -172,7 +177,7 @@ class InputFile implements IInputItem
     *
     * @return string mixed
     */
-    public function getFilename()
+    public function getFilename(): ?string
    {
        return $this->filename;
    }
@@ -183,7 +188,7 @@ class InputFile implements IInputItem
     * @param string $destination
     * @return bool
     */
-    public function move($destination)
+    public function move($destination): bool
    {
        return move_uploaded_file($this->tmpName, $destination);
    }
@@ -193,7 +198,7 @@ class InputFile implements IInputItem
     *
     * @return string
     */
-    public function getContents()
+    public function getContents(): string
    {
        return file_get_contents($this->tmpName);
    }
@@ -203,7 +208,7 @@ class InputFile implements IInputItem
     *
     * @return bool
     */
-    public function hasError()
+    public function hasError(): bool
    {
        return ($this->getError() !== 0);
    }
@@ -211,22 +216,22 @@ class InputFile implements IInputItem
    /**
     * Get upload-error code.
     *
-     * @return string
+     * @return int
     */
-    public function getError()
+    public function getError(): int
    {
-        return $this->error;
+        return (int)$this->errors;
    }

    /**
     * Set error
     *
     * @param int $error
-     * @return static $this
+     * @return static
     */
-    public function setError($error)
+    public function setError($error): IInputItem
    {
-        $this->error = (int)$error;
+        $this->errors = (int)$error;

        return $this;
    }
@@ -234,7 +239,7 @@ class InputFile implements IInputItem
    /**
     * @return string
     */
-    public function getTmpName()
+    public function getTmpName(): string
    {
        return $this->tmpName;
    }
@@ -242,33 +247,45 @@ class InputFile implements IInputItem
    /**
     * Set file temp. name
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setTmpName($name)
+    public function setTmpName($name): IInputItem
    {
        $this->tmpName = $name;

        return $this;
    }

-    public function __toString()
+    public function __toString(): string
    {
        return $this->getTmpName();
    }

-    public function getValue()
+    public function getValue(): ?string
    {
        return $this->getFilename();
    }

-    public function toArray()
+    /**
+     * @param string $value
+     * @return static
+     */
+    public function setValue(string $value): IInputItem
+    {
+        $this->filename = $value;
+
+        return $this;
+    }
+
+    public function toArray(): array
    {
        return [
            'tmp_name' => $this->tmpName,
            'type'     => $this->type,
            'size'     => $this->size,
-            'name'     => $this->filename,
-            'error'    => $this->error,
+            'name'     => $this->name,
+            'error'    => $this->errors,
+            'filename' => $this->filename,
        ];
    }

@@ -0,0 +1,348 @@
+<?php
+
+namespace Pecee\Http\Input;
+
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Request;
+
+class InputHandler
+{
+    /**
+     * @var array
+     */
+    protected $get = [];
+
+    /**
+     * @var array
+     */
+    protected $post = [];
+
+    /**
+     * @var array
+     */
+    protected $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->parseInputItem($_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->parseInputItem($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->rearrangeFile($value['name'], $keys, $value);
+
+            if (isset($list[$key]) === true) {
+                $list[$key][] = $files;
+            } else {
+                $list[$key] = $files;
+            }
+
+        }
+
+        return $list;
+    }
+
+    /**
+     * Rearrange multi-dimensional file object created by PHP.
+     *
+     * @param array $values
+     * @param array $index
+     * @param array|null $original
+     * @return array
+     */
+    protected function rearrangeFile(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->rearrangeFile($value, $index, $original);
+
+            if (isset($output[$key]) === true) {
+                $output[$key][] = $files;
+            } else {
+                $output[$key] = $files;
+            }
+
+        }
+
+        return $output;
+    }
+
+    /**
+     * Parse input item from array
+     *
+     * @param array $array
+     * @return array
+     */
+    protected function parseInputItem(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->parseInputItem($value);
+
+            $list[$key] = $output;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Find input object
+     *
+     * @param string $index
+     * @param array ...$methods
+     * @return IInputItem|array|null
+     */
+    public function find(string $index, ...$methods)
+    {
+        $element = null;
+
+        if (\count($methods) === 0 || \in_array('get', $methods, true) === true) {
+            $element = $this->get($index);
+        }
+
+        if (($element === null && \count($methods) === 0) || (\count($methods) !== 0 && \in_array('post', $methods, true) === true)) {
+            $element = $this->post($index);
+        }
+
+        if (($element === null && \count($methods) === 0) || (\count($methods) !== 0 && \in_array('file', $methods, true) === true)) {
+            $element = $this->file($index);
+        }
+
+        return $element;
+    }
+
+    /**
+     * Get input element value matching index
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @param array ...$methods
+     * @return string|array
+     */
+    public function value(string $index, ?string $defaultValue = null, ...$methods)
+    {
+        $input = $this->find($index, ...$methods);
+
+        $output = [];
+
+        /* Handle collection */
+        if (\is_array($input) === true) {
+            /* @var $item InputItem */
+            foreach ($input as $item) {
+                $output[] = $item->getValue();
+            }
+
+            return (\count($output) === 0) ? $defaultValue : $output;
+        }
+
+        return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
+    }
+
+    /**
+     * Check if a input-item exist
+     *
+     * @param string $index
+     * @param array ...$methods
+     * @return bool
+     */
+    public function exists(string $index, ...$methods): bool
+    {
+        return $this->value($index, null, ...$methods) !== null;
+    }
+
+    /**
+     * Find post-value by index or return default value.
+     *
+     * @param string $index
+     * @param string|null $defaultValue
+     * @return InputItem|array|string|null
+     */
+    public function post(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|array|string|null
+     */
+    public function file(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|array|string|null
+     */
+    public function get(string $index, ?string $defaultValue = null)
+    {
+        return $this->get[$index] ?? $defaultValue;
+    }
+
+    /**
+     * Get all get/post items
+     * @param array $filter Only take items in filter
+     * @return array
+     */
+    public function all(array $filter = []): 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 (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
+    }
+
+    /**
+     * Add GET parameter
+     *
+     * @param string $key
+     * @param InputItem $item
+     */
+    public function addGet(string $key, InputItem $item): void
+    {
+        $this->get[$key] = $item;
+    }
+
+    /**
+     * Add POST parameter
+     *
+     * @param string $key
+     * @param InputItem $item
+     */
+    public function addPost(string $key, InputItem $item): void
+    {
+        $this->post[$key] = $item;
+    }
+
+    /**
+     * Add FILE parameter
+     *
+     * @param string $key
+     * @param InputFile $item
+     */
+    public function addFile(string $key, InputFile $item): void
+    {
+        $this->file[$key] = $item;
+    }
+
+}
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Input;

 class InputItem implements IInputItem
@@ -7,24 +8,24 @@ class InputItem implements IInputItem
    public $name;
    public $value;

-    public function __construct($index, $value = null)
+    public function __construct(string $index, ?string $value = null)
    {
        $this->index = $index;
        $this->value = $value;

        // Make the name human friendly, by replace _ with space
-        $this->name = ucfirst(str_replace('_', ' ', $this->index));
+        $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
    }

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

-    public function setIndex($index)
+    public function setIndex(string $index): IInputItem
    {
        $this->index = $index;

@@ -34,7 +35,7 @@ class InputItem implements IInputItem
    /**
     * @return string
     */
-    public function getName()
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -42,9 +43,9 @@ class InputItem implements IInputItem
    /**
     * Set input name
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setName($name)
+    public function setName(string $name): IInputItem
    {
        $this->name = $name;

@@ -54,7 +55,7 @@ class InputItem implements IInputItem
    /**
     * @return string
     */
-    public function getValue()
+    public function getValue(): ?string
    {
        return $this->value;
    }
@@ -62,16 +63,16 @@ class InputItem implements IInputItem
    /**
     * Set input value
     * @param string $value
-     * @return static $this
+     * @return static
     */
-    public function setValue($value)
+    public function setValue(string $value): IInputItem
    {
        $this->value = $value;

        return $this;
    }

-    public function __toString()
+    public function __toString(): string
    {
        return (string)$this->value;
    }
@@ -1,25 +1,27 @@
 <?php
+
 namespace Pecee\Http\Middleware;

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

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

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

+    /**
+     * BaseCsrfVerifier constructor.
+     * @throws \Pecee\Http\Security\Exceptions\SecurityException
+     */
    public function __construct()
    {
-        $this->csrfToken = new CsrfToken();
-
-        // Generate or get the CSRF-Token from Cookie.
-        $this->token = ($this->hasToken() === false) ? $this->generateToken() : $this->csrfToken->getToken();
+        $this->tokenProvider = new CookieTokenProvider();
    }

    /**
@@ -27,23 +29,23 @@ class BaseCsrfVerifier implements IMiddleware
     * @param Request $request
     * @return bool
     */
-    protected function skip(Request $request)
+    protected function skip(Request $request): bool
    {
-        if ($this->except === null || is_array($this->except) === false) {
+        if ($this->except === null || \count($this->except) === 0) {
            return false;
        }

-        $max = count($this->except) - 1;
+        $max = \count($this->except) - 1;

        for ($i = $max; $i >= 0; $i--) {
            $url = $this->except[$i];

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

            if ($skip === true) {
@@ -54,46 +56,46 @@ class BaseCsrfVerifier implements IMiddleware
        return false;
    }

-    public function handle(Request $request)
+    /**
+     * Handle request
+     *
+     * @param Request $request
+     * @throws TokenMismatchException
+     */
+    public function handle(Request $request): void
    {

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

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

-            // If the token is not posted, check headers for valid x-csrf-token
-            if ($token === null) {
-                $token = $request->getHeader(static::HEADER_KEY);
-            }
-
-            if ($this->csrfToken->validate($token) === false) {
-                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()
+    public function getTokenProvider(): ITokenProvider
    {
-        $token = CsrfToken::generateToken();
-        $this->csrfToken->setToken($token);
-
-        return $token;
+        return $this->tokenProvider;
    }

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

 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\Http\Middleware\Exceptions;

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

 use Pecee\Http\Request;
@@ -7,8 +8,7 @@ interface IMiddleware
 {
    /**
     * @param Request $request
-     * @return Request|null
     */
-    public function handle(Request $request);
+    public function handle(Request $request): void;

 }
@@ -1,82 +1,130 @@
 <?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 = [];
-    protected $headers;
+    /**
+     * Additional data
+     *
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * Server headers
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Request host
+     * @var string
+     */
    protected $host;
-    protected $uri;
+
+    /**
+     * Current request url
+     * @var Url
+     */
+    protected $url;
+
+    /**
+     * Request method
+     * @var string
+     */
    protected $method;
-    protected $input;
+
+    /**
+     * Input handler
+     * @var InputHandler
+     */
+    protected $inputHandler;
+
+    /**
+     * Defines if request has pending rewrite
+     * @var bool
+     */
+    protected $hasPendingRewrite = false;

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

    /**
-     * @var ILoadableRoute|null
+     * @var array
     */
-    protected $loadedRoute;
+    protected $loadedRoutes = [];

+    /**
+     * Request constructor.
+     * @throws MalformedUrlException
+     */
    public function __construct()
    {
-        $this->parseHeaders();
-        $this->host = $this->getHeader('http-host');
-        $this->uri = $this->getHeader('request-uri');
-        $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
-    }
-
-    protected function parseHeaders()
-    {
-        $this->headers = [];
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-            $key = $keys[$i];
-            $value = $_SERVER[$key];
-
+        foreach ($_SERVER as $key => $value) {
            $this->headers[strtolower($key)] = $value;
            $this->headers[strtolower(str_replace('_', '-', $key))] = $value;
        }

+        $this->setHost($this->getHeader('http-host'));
+
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
+        
+        $this->method = strtolower($this->getHeader('request-method'));
+        $this->inputHandler = new InputHandler($this);
+        $this->method = strtolower($this->inputHandler->value('_method', $this->getHeader('request-method')));
    }

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

    /**
-     * @return string
+     * @return Url
     */
-    public function getUri()
+    public function getUrl(): Url
    {
-        return $this->uri;
+        return $this->url;
    }

    /**
-     * @return string
+     * Copy url object
+     *
+     * @return Url
     */
-    public function getHost()
+    public function getUrlCopy(): Url
+    {
+        return clone $this->url;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getHost(): ?string
    {
        return $this->host;
    }

    /**
-     * @return string
+     * @return string|null
     */
-    public function getMethod()
+    public function getMethod(): ?string
    {
        return $this->method;
    }
@@ -85,7 +133,7 @@ class Request
     * Get http basic auth user
     * @return string|null
     */
-    public function getUser()
+    public function getUser(): ?string
    {
        return $this->getHeader('php-auth-user');
    }
@@ -94,7 +142,7 @@ class Request
     * Get http basic auth password
     * @return string|null
     */
-    public function getPassword()
+    public function getPassword(): ?string
    {
        return $this->getHeader('php-auth-pw');
    }
@@ -103,16 +151,16 @@ class Request
     * Get all headers
     * @return array
     */
-    public function getHeaders()
+    public function getHeaders(): array
    {
        return $this->headers;
    }

    /**
     * Get id address
-     * @return string
+     * @return string|null
     */
-    public function getIp()
+    public function getIp(): ?string
    {
        if ($this->getHeader('http-cf-connecting-ip') !== null) {
            return $this->getHeader('http-cf-connecting-ip');
@@ -129,27 +177,27 @@ class Request
     * Get remote address/ip
     *
     * @alias static::getIp
-     * @return string
+     * @return string|null
     */
-    public function getRemoteAddr()
+    public function getRemoteAddr(): ?string
    {
        return $this->getIp();
    }

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

    /**
     * Get user agent
-     * @return string
+     * @return string|null
     */
-    public function getUserAgent()
+    public function getUserAgent(): ?string
    {
        return $this->getHeader('http-user-agent');
    }
@@ -162,35 +210,18 @@ class Request
     *
     * @return string|null
     */
-    public function getHeader($name, $defaultValue = null)
+    public function getHeader($name, $defaultValue = null): ?string
    {
-        if (isset($this->headers[strtolower($name)])) {
-            return $this->headers[strtolower($name)];
-        }
-
-        $max = count($_SERVER) - 1;
-        $keys = array_keys($_SERVER);
-
-        for ($i = $max; $i >= 0; $i--) {
-
-            $key = $keys[$i];
-            $name = $_SERVER[$key];
-
-            if ($key === $name) {
-                return $name;
-            }
-        }
-
-        return $defaultValue;
+        return $this->headers[strtolower($name)] ?? $defaultValue;
    }

    /**
     * Get input class
-     * @return Input
+     * @return InputHandler
     */
-    public function getInput()
+    public function getInputHandler(): InputHandler
    {
-        return $this->input;
+        return $this->inputHandler;
    }

    /**
@@ -200,32 +231,46 @@ class Request
     *
     * @return bool
     */
-    public function isFormatAccepted($format)
+    public function isFormatAccepted($format): bool
    {
-        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) > -1);
+        return ($this->getHeader('http-accept') !== null && stripos($this->getHeader('http-accept'), $format) !== false);
+    }
+
+    /**
+     * Returns true if the request is made through Ajax
+     *
+     * @return bool
+     */
+    public function isAjax(): bool
+    {
+        return (strtolower($this->getHeader('http-x-requested-with')) === 'xmlhttprequest');
    }

    /**
     * Get accept formats
     * @return array
     */
-    public function getAcceptFormats()
+    public function getAcceptFormats(): array
    {
        return explode(',', $this->getHeader('http-accept'));
    }

    /**
-     * @param string $uri
+     * @param Url $url
     */
-    public function setUri($uri)
+    public function setUrl(Url $url): void
    {
-        $this->uri = $uri;
+        $this->url = $url;
+
+        if ($this->url->getHost() === null) {
+            $this->url->setHost((string)$this->getHost());
+        }
    }

    /**
-     * @param string $host
+     * @param string|null $host
     */
-    public function setHost($host)
+    public function setHost(?string $host): void
    {
        $this->host = $host;
    }
@@ -233,9 +278,9 @@ class Request
    /**
     * @param string $method
     */
-    public function setMethod($method)
+    public function setMethod(string $method): void
    {
-        $this->method = $method;
+        $this->method = strtolower($method);
    }

    /**
@@ -244,28 +289,10 @@ class Request
     * @param ILoadableRoute $route
     * @return static
     */
-    public function setRewriteRoute(ILoadableRoute $route)
+    public function setRewriteRoute(ILoadableRoute $route): self
    {
-        $this->rewriteRoute = $route;
-
-        $callback = $route->getCallback();
-
-        /* Only add default namespace on relative callbacks */
-        if ($callback === null || $callback[0] !== '\\') {
-
-            $namespace = SimpleRouter::getDefaultNamespace();
-
-            if ($namespace !== null) {
-
-                if ($this->rewriteRoute->getNamespace() !== null) {
-                    $namespace .= '\\' . $this->rewriteRoute->getNamespace();
-                }
-
-                $this->rewriteRoute->setDefaultNamespace($namespace);
-
-            }
-
-        }
+        $this->hasPendingRewrite = true;
+        $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);

        return $this;
    }
@@ -275,7 +302,7 @@ class Request
     *
     * @return ILoadableRoute|null
     */
-    public function getRewriteRoute()
+    public function getRewriteRoute(): ?ILoadableRoute
    {
        return $this->rewriteRoute;
    }
@@ -283,9 +310,9 @@ class Request
    /**
     * Get rewrite url
     *
-     * @return string
+     * @return string|null
     */
-    public function getRewriteUrl()
+    public function getRewriteUrl(): ?string
    {
        return $this->rewriteUrl;
    }
@@ -296,48 +323,97 @@ class Request
     * @param string $rewriteUrl
     * @return static
     */
-    public function setRewriteUrl($rewriteUrl)
+    public function setRewriteUrl(string $rewriteUrl): self
    {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasPendingRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';

        return $this;
    }

    /**
     * Set rewrite callback
-     * @param string $callback
+     * @param string|\Closure $callback
     * @return static
     */
-    public function setRewriteCallback($callback)
+    public function setRewriteCallback($callback): self
    {
-        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+        $this->hasPendingRewrite = true;
+
+        return $this->setRewriteRoute(new RouteUrl($this->getUrl()->getPath(), $callback));
    }

    /**
     * Get loaded route
     * @return ILoadableRoute|null
     */
-    public function getLoadedRoute()
+    public function getLoadedRoute(): ?ILoadableRoute
    {
-        return $this->loadedRoute;
+        return (\count($this->loadedRoutes) > 0) ? end($this->loadedRoutes) : null;
    }

    /**
-     * Set loaded route
+     * Get all loaded routes
+     *
+     * @return array
+     */
+    public function getLoadedRoutes(): array
+    {
+        return $this->loadedRoutes;
+    }
+
+    /**
+     * Set loaded routes
+     *
+     * @param array $routes
+     * @return static
+     */
+    public function setLoadedRoutes(array $routes): self
+    {
+        $this->loadedRoutes = $routes;
+
+        return $this;
+    }
+
+    /**
+     * Added loaded route
     *
     * @param ILoadableRoute $route
     * @return static
     */
-    public function setLoadedRoute(ILoadableRoute $route)
+    public function addLoadedRoute(ILoadableRoute $route): self
    {
-        $this->loadedRoute = $route;
+        $this->loadedRoutes[] = $route;
+
+        return $this;
+    }
+
+    /**
+     * Returns true if the request contains a rewrite
+     *
+     * @return bool
+     */
+    public function hasPendingRewrite(): bool
+    {
+        return $this->hasPendingRewrite;
+    }
+
+    /**
+     * Defines if the current request contains a rewrite.
+     *
+     * @param bool $boolean
+     * @return Request
+     */
+    public function setHasPendingRewrite(bool $boolean): self
+    {
+        $this->hasPendingRewrite = $boolean;

        return $this;
    }

    public function __isset($name)
    {
-        return array_key_exists($name, $this->data);
+        return array_key_exists($name, $this->data) === true;
    }

    public function __set($name, $value = null)
@@ -347,7 +423,7 @@ class Request

    public function __get($name)
    {
-        return isset($this->data[$name]) ? $this->data[$name] : null;
+        return $this->data[$name] ?? null;
    }

-}
+}
@@ -1,6 +1,9 @@
 <?php
+
 namespace Pecee\Http;

+use Pecee\Exceptions\InvalidArgumentException;
+
 class Response
 {
    protected $request;
@@ -16,7 +19,7 @@ class Response
     * @param int $code
     * @return static
     */
-    public function httpCode($code)
+    public function httpCode(int $code): self
    {
        http_response_code($code);

@@ -29,19 +32,19 @@ class Response
     * @param string $url
     * @param int $httpCode
     */
-    public function redirect($url, $httpCode = null)
+    public function redirect(string $url, ?int $httpCode = null): void
    {
        if ($httpCode !== null) {
            $this->httpCode($httpCode);
        }

        $this->header('location: ' . $url);
-        die();
+        exit(0);
    }

-    public function refresh()
+    public function refresh(): void
    {
-        $this->redirect($this->request->getUri());
+        $this->redirect($this->request->getUrl()->getOriginalUrl());
    }

    /**
@@ -49,7 +52,7 @@ class Response
     * @param string $name
     * @return static
     */
-    public function auth($name = '')
+    public function auth(string $name = ''): self
    {
        $this->headers([
            'WWW-Authenticate: Basic realm="' . $name . '"',
@@ -59,37 +62,43 @@ class Response
        return $this;
    }

-    public function cache($eTag, $lastModified = 2592000)
+    public function cache(string $eTag, int $lastModifiedTime = 2592000): self
    {

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

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

-        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModified)) {
+        if (($httpIfNoneMatch !== null && $httpIfNoneMatch === $eTag) || ($httpModified !== null && strtotime($httpModified) === $lastModifiedTime)) {

            $this->header('HTTP/1.1 304 Not Modified');
-
-            exit();
+            exit(0);
        }

        return $this;
    }

    /**
-     * Json encode array
-     * @param array $value
+     * Json encode
+     * @param array|\JsonSerializable $value
+     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
+     * @param int $dept JSON debt.
+     * @throws InvalidArgumentException
     */
-    public function json(array $value)
+    public function json($value, ?int $options = null, int $dept = 512): void
    {
-        $this->header('Content-Type: application/json');
-        echo json_encode($value);
-        die();
+        if (($value instanceof \JsonSerializable) === false && \is_array($value) === false) {
+            throw new InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
+        }
+
+        $this->header('Content-Type: application/json; charset=utf-8');
+        echo json_encode($value, $options, $dept);
+        exit(0);
    }

    /**
@@ -97,7 +106,7 @@ class Response
     * @param string $value
     * @return static
     */
-    public function header($value)
+    public function header(string $value): self
    {
        header($value);

@@ -109,7 +118,7 @@ class Response
     * @param array $headers
     * @return static
     */
-    public function headers(array $headers)
+    public function headers(array $headers): self
    {
        foreach ($headers as $header) {
            $this->header($header);
@@ -0,0 +1,118 @@
+<?php
+
+namespace Pecee\Http\Security;
+
+use Pecee\Http\Security\Exceptions\SecurityException;
+
+class CookieTokenProvider implements ITokenProvider
+{
+    public const CSRF_KEY = 'CSRF-TOKEN';
+
+    protected $token;
+    protected $cookieTimeoutMinutes = 120;
+
+    /**
+     * CookieTokenProvider constructor.
+     * @throws SecurityException
+     */
+    public function __construct()
+    {
+        $this->token = $this->getToken();
+
+        if ($this->token === null) {
+            $this->token = $this->generateToken();
+        }
+    }
+
+    /**
+     * Generate random identifier for CSRF token
+     *
+     * @return string
+     * @throws SecurityException
+     */
+    public function generateToken(): string
+    {
+        try {
+            return bin2hex(random_bytes(32));
+        } catch (\Exception $e) {
+            throw new SecurityException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
+        }
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        if ($this->getToken() !== null) {
+            return hash_equals($token, $this->getToken());
+        }
+
+        return false;
+    }
+
+    /**
+     * Set csrf token cookie
+     * Overwrite this method to save the token to another storage like session etc.
+     *
+     * @param string $token
+     */
+    public function setToken(string $token): void
+    {
+        $this->token = $token;
+        setcookie(static::CSRF_KEY, $token, (time() + 60) * $this->cookieTimeoutMinutes, '/', 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,476 @@
+<?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) {
+                $this->setQueryString($data['query']);
+            }
+        }
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Set raw query-string parameters as string
+     *
+     * @param string $queryString
+     * @return static
+     */
+    public function setQueryString(string $queryString): self
+    {
+        $params = [];
+
+        if(parse_str($queryString, $params) !== false) {
+            return $this->setParams($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 array_key_exists($name, $this->getParams());
+    }
+
+    /**
+     * Removes multiple parameters from the query-string
+     *
+     * @param array ...$names
+     * @return static
+     */
+    public function removeParams(...$names): self
+    {
+        $params = array_diff_key($this->getParams(), array_flip($names));
+        $this->setParams($params);
+
+        return $this;
+    }
+
+    /**
+     * Removes parameter from the query-string
+     *
+     * @param string $name
+     * @return static
+     */
+    public function removeParam(string $name): self
+    {
+        $params = $this->getParams();
+        unset($params[$name]);
+        $this->setParams($params);
+
+        return $this;
+    }
+
+    /**
+     * 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
+    {
+        return isset($this->getParams()[$name]) ?? $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;
+
+}
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Exceptions;

 class HttpException extends \Exception
@@ -1,4 +1,5 @@
 <?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,184 @@
+<?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 route is added to the router
+     */
+    public const EVENT_ADD_ROUTE = 'onAddRoute';
+
+    /**
+     * 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_ADD_ROUTE,
+        self::EVENT_REWRITE,
+        self::EVENT_BOOT,
+        self::EVENT_RENDER_BOOTMANAGER,
+        self::EVENT_LOAD_ROUTES,
+        self::EVENT_FIND_ROUTE,
+        self::EVENT_GET_URL,
+        self::EVENT_MATCH_ROUTE,
+        self::EVENT_RENDER_ROUTE,
+        self::EVENT_LOAD_EXCEPTIONS,
+        self::EVENT_RENDER_EXCEPTION,
+        self::EVENT_RENDER_MIDDLEWARES,
+        self::EVENT_RENDER_CSRF,
+    ];
+
+    /**
+     * List of all registered events
+     * @var array
+     */
+    private $registeredEvents = [];
+
+    /**
+     * Register new event
+     *
+     * @param string $name
+     * @param \Closure $callback
+     * @return static
+     */
+    public function register(string $name, \Closure $callback): IEventHandler
+    {
+        if (isset($this->registeredEvents[$name]) === true) {
+            $this->registeredEvents[$name][] = $callback;
+        } else {
+            $this->registeredEvents[$name] = [$callback];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @param array ...$names Add multiple names...
+     * @return array
+     */
+    public function getEvents(?string $name, ...$names): array
+    {
+        if ($name === null) {
+            return $this->registeredEvents;
+        }
+
+        $names[] = $name;
+        $events = [];
+
+        foreach ($names as $eventName) {
+            if (isset($this->registeredEvents[$eventName]) === true) {
+                $events += $this->registeredEvents[$eventName];
+            }
+        }
+
+        return $events;
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
+    {
+        $events = $this->getEvents(static::EVENT_ALL, $name);
+
+        /* @var $event \Closure */
+        foreach ($events as $event) {
+            $event(new EventArgument($name, $router, $eventArgs));
+        }
+    }
+
+}
@@ -0,0 +1,27 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Router;
+
+interface IEventHandler
+{
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array;
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void;
+
+}
@@ -1,5 +1,6 @@
 <?php
-namespace Pecee\Handlers;
+
+namespace Pecee\SimpleRouter\Handlers;

 use Pecee\Http\Request;

@@ -8,8 +9,7 @@ interface IExceptionHandler
    /**
     * @param Request $request
     * @param \Exception $error
-     * @return Request|null
     */
-    public function handleError(Request $request, \Exception $error);
+    public function handleError(Request $request, \Exception $error): void;

 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter;

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

 interface IControllerRoute extends IRoute
@@ -8,7 +9,7 @@ interface IControllerRoute extends IRoute
     *
     * @return string
     */
-    public function getController();
+    public function getController(): string;

    /**
     * Set controller class-name
@@ -16,21 +17,6 @@ interface IControllerRoute extends IRoute
     * @param string $controller
     * @return static
     */
-    public function setController($controller);
-
-    /**
-     * Return active method
-     *
-     * @return string
-     */
-    public function getMethod();
-
-    /**
-     * Set active method
-     *
-     * @param string $method
-     * @return static
-     */
-    public function setMethod($method);
+    public function setController(string $controller): self;

 }
@@ -1,7 +1,9 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

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

 interface IGroupRoute extends IRoute
 {
@@ -11,13 +13,21 @@ interface IGroupRoute extends IRoute
     * @param Request $request
     * @return bool
     */
-    public function matchDomain(Request $request);
+    public function matchDomain(Request $request): bool;
+
+    /**
+     * Add exception handler
+     *
+     * @param IExceptionHandler|string $handler
+     * @return static
+     */
+    public function addExceptionHandler($handler): self;

    /**
     * Set exception-handlers for group
     *
     * @param array $handlers
-     * @return static $this
+     * @return static
     */
    public function setExceptionHandlers(array $handlers);

@@ -26,35 +36,35 @@ interface IGroupRoute extends IRoute
     *
     * @return array
     */
-    public function getExceptionHandlers();
+    public function getExceptionHandlers(): array;

    /**
     * Get domains for domain.
     *
     * @return array
     */
-    public function getDomains();
+    public function getDomains(): array;

    /**
     * Set allowed domains for group.
     *
     * @param array $domains
-     * @return $this
+     * @return static
     */
-    public function setDomains(array $domains);
+    public function setDomains(array $domains): self;

    /**
     * Set prefix that child-routes will inherit.
     *
     * @param string $prefix
-     * @return string
+     * @return static
     */
-    public function setPrefix($prefix);
+    public function setPrefix($prefix): self;

    /**
     * Get prefix.
     *
-     * @return string
+     * @return string|null
     */
-    public function getPrefix();
+    public function getPrefix(): ?string;
 }
@@ -1,7 +1,9 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;

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

    /**
-     * Loads and renders middlewares-classes
+     * Loads and renders middleware-classes
     *
     * @param Request $request
+     * @param Router $router
     */
-    public function loadMiddleware(Request $request);
+    public function loadMiddleware(Request $request, Router $router): void;

-    public function getUrl();
+    /**
+     * Get url
+     * @return string
+     */
+    public function getUrl(): string;

-    public function setUrl($url);
+    /**
+     * Set url
+     * @param string $url
+     * @return static
+     */
+    public function setUrl(string $url): self;
+
+    /**
+     * Prepend url
+     * @param string $url
+     * @return ILoadableRoute
+     */
+    public function prependUrl(string $url): self;

    /**
     * Returns the provided name for the router.
     *
-     * @return string
+     * @return string|null
     */
-    public function getName();
+    public function getName(): ?string;

    /**
     * Check if route has given name.
@@ -40,22 +59,22 @@ interface ILoadableRoute extends IRoute
     * @param string $name
     * @return bool
     */
-    public function hasName($name);
+    public function hasName(string $name): bool;

    /**
     * Sets the router name, which makes it easier to obtain the url or router at a later point.
     *
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setName($name);
+    public function setName(string $name): self;

    /**
     * Get regular expression match used for matching route (if defined).
     *
     * @return string
     */
-    public function getMatch();
+    public function getMatch(): ?string;

    /**
     * Add regular expression match for the entire route.
@@ -63,6 +82,6 @@ interface ILoadableRoute extends IRoute
     * @param string $regex
     * @return static
     */
-    public function setMatch($regex);
+    public function setMatch($regex): self;

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

 use Pecee\Http\Request;
+use Pecee\SimpleRouter\Router;

 interface IRoute
 {
@@ -12,17 +14,18 @@ interface IRoute
     * @param Request $request
     * @return bool
     */
-    public function matchRoute($route, Request $request);
+    public function matchRoute($route, Request $request): bool;

    /**
     * Called when route is matched.
     * Returns class to be rendered.
     *
     * @param Request $request
+     * @param Router $router
     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
-     * @return void
+     * @return string
     */
-    public function renderRoute(Request $request);
+    public function renderRoute(Request $request, Router $router): ?string;

    /**
     * Returns callback name/identifier for the current route based on the callback.
@@ -31,50 +34,50 @@ interface IRoute
     *
     * @return string
     */
-    public function getIdentifier();
+    public function getIdentifier(): string;

    /**
     * Set allowed request methods
     *
     * @param array $methods
-     * @return static $this
+     * @return static
     */
-    public function setRequestMethods(array $methods);
+    public function setRequestMethods(array $methods): self;

    /**
     * Get allowed request methods
     *
     * @return array
     */
-    public function getRequestMethods();
+    public function getRequestMethods(): array;

    /**
     * @return IRoute|null
     */
-    public function getParent();
+    public function getParent(): ?IRoute;

    /**
     * Get the group for the route.
     *
     * @return IGroupRoute|null
     */
-    public function getGroup();
+    public function getGroup(): ?IGroupRoute;

    /**
     * Set group
     *
     * @param IGroupRoute $group
-     * @return static $this
+     * @return static
     */
-    public function setGroup(IGroupRoute $group);
+    public function setGroup(IGroupRoute $group): self;

    /**
     * Set parent route
     *
     * @param IRoute $parent
-     * @return static $this
+     * @return static
     */
-    public function setParent(IRoute $parent);
+    public function setParent(IRoute $parent): self;

    /**
     * Set callback
@@ -82,44 +85,64 @@ interface IRoute
     * @param string $callback
     * @return static
     */
-    public function setCallback($callback);
+    public function setCallback($callback): self;

    /**
-     * @return string
+     * @return string|callable
     */
    public function getCallback();

-    public function getMethod();
+    /**
+     * Return active method
+     *
+     * @return string|null
+     */
+    public function getMethod(): ?string;

-    public function getClass();
+    /**
+     * Set active method
+     *
+     * @param string $method
+     * @return static
+     */
+    public function setMethod(string $method): self;

-    public function setMethod($method);
+    /**
+     * Get class
+     *
+     * @return string|null
+     */
+    public function getClass(): ?string;

    /**
     * @param string $namespace
-     * @return static $this
+     * @return static
     */
-    public function setNamespace($namespace);
+    public function setNamespace(string $namespace): self;

    /**
-     * @return string
+     * @return string|null
     */
-    public function getNamespace();
+    public function getNamespace(): ?string;

    /**
     * @param string $namespace
-     * @return static $this
+     * @return static
     */
-    public function setDefaultNamespace($namespace);
+    public function setDefaultNamespace($namespace): IRoute;

-    public function getDefaultNamespace();
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public function getDefaultNamespace(): ?string;

    /**
     * Get parameter names.
     *
     * @return array
     */
-    public function getWhere();
+    public function getWhere(): array;

    /**
     * Set parameter names.
@@ -127,45 +150,45 @@ interface IRoute
     * @param array $options
     * @return static
     */
-    public function setWhere(array $options);
+    public function setWhere(array $options): self;

    /**
     * Get parameters
     *
     * @return array
     */
-    public function getParameters();
+    public function getParameters(): array;

    /**
     * Get parameters
     *
     * @param array $parameters
-     * @return static $this
+     * @return static
     */
-    public function setParameters(array $parameters);
+    public function setParameters(array $parameters): self;

    /**
     * Merge with information from another route.
     *
     * @param array $settings
     * @param bool $merge
-     * @return static $this
+     * @return static
     */
-    public function setSettings(array $settings, $merge = false);
+    public function setSettings(array $settings, bool $merge = false): self;

    /**
     * Export route settings to array so they can be merged with another route.
     *
     * @return array
     */
-    public function toArray();
+    public function toArray(): array;

    /**
     * Get middlewares array
     *
     * @return array
     */
-    public function getMiddlewares();
+    public function getMiddlewares(): array;

    /**
     * Set middleware class-name
@@ -173,14 +196,14 @@ interface IRoute
     * @param string $middleware
     * @return static
     */
-    public function setMiddleware($middleware);
+    public function addMiddleware($middleware): self;

    /**
     * Set middlewares array
     *
     * @param array $middlewares
-     * @return $this
+     * @return static
     */
-    public function setMiddlewares(array $middlewares);
+    public function setMiddlewares(array $middlewares): self;

 }
@@ -1,9 +1,11 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Router;

 abstract class LoadableRoute extends Route implements ILoadableRoute
 {
@@ -23,30 +25,34 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Loads and renders middlewares-classes
     *
     * @param Request $request
+     * @param Router $router
     * @throws HttpException
     */
-    public function loadMiddleware(Request $request)
+    public function loadMiddleware(Request $request, Router $router): void
    {
-        $max = count($this->getMiddlewares());
+        $router->debug('Loading middlewares');

-        if ($max > 0) {
+        foreach ($this->getMiddlewares() as $middleware) {

-            for ($i = 0; $i < $max; $i++) {
-
-                $middleware = $this->getMiddlewares()[$i];
-
-                $middleware = $this->loadClass($middleware);
-
-                if (($middleware instanceof IMiddleware) === false) {
-                    throw new HttpException($middleware . ' must be instance of Middleware');
-                }
-
-                $middleware->handle($request);
+            if (\is_object($middleware) === false) {
+                $middleware = $router->getClassLoader()->loadClass($middleware);
            }
+
+            if (($middleware instanceof IMiddleware) === false) {
+                throw new HttpException($middleware . ' must be inherit the IMiddleware interface');
+            }
+
+            $className = \get_class($middleware);
+
+            $router->debug('Loading middleware "%s"', $className);
+            $middleware->handle($request);
+            $router->debug('Finished loading middleware "%s"', $className);
        }
+
+        $router->debug('Finished loading middlewares');
    }

-    public function matchRegex(Request $request, $url)
+    public function matchRegex(Request $request, $url): ?bool
    {
        /* Match on custom defined regular expression */

@@ -54,17 +60,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            return null;
        }

-        $parameters = [];
-
-        if (preg_match($this->regex, $request->getHost() . $url, $parameters) > 0) {
-
-            /* Remove global match */
-            $this->parameters = array_slice($parameters, 1);
-
-            return true;
-        }
-
-        return false;
+        return ((bool)preg_match($this->regex, $request->getHost() . $url) !== false);
    }

    /**
@@ -73,15 +69,15 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string $url
     * @return static
     */
-    public function setUrl($url)
+    public function setUrl(string $url): ILoadableRoute
    {
        $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';

        if (strpos($this->url, $this->paramModifiers[0]) !== false) {

-            $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);

-            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
+            if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
                $this->parameters = array_fill_keys($matches[1], null);
            }
        }
@@ -89,7 +85,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        return $this;
    }

-    public function getUrl()
+    /**
+     * Prepend url
+     *
+     * @param string $url
+     * @return ILoadableRoute
+     */
+    public function prependUrl(string $url): ILoadableRoute
+    {
+        return $this->setUrl(rtrim($url, '/') . $this->url);
+    }
+
+    public function getUrl(): string
    {
        return $this->url;
    }
@@ -99,20 +106,19 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Used when calling the url() helper.
     *
     * @param string|null $method
-     * @param array|null $parameters
+     * @param string|array|null $parameters
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = $this->getUrl();

-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
-        }
+        $group = $this->getGroup();

-        /* Contains parameters that aren't recognized and will be appended at the end of the url */
-        $unknownParams = [];
+        if ($group !== null && \count($group->getDomains()) !== 0) {
+            $url = '//' . $group->getDomains()[0] . $url;
+        }

        /* Create the param string - {parameter} */
        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
@@ -123,29 +129,31 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        /* Replace any {parameter} in the url with the correct value */

        $params = $this->getParameters();
-        $max = count($params) - 1;
-        $keys = array_keys($params);

-        for ($i = $max; $i >= 0; $i--) {
-            $param = $keys[$i];
-            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
+        foreach (array_keys($params) as $param) {

-            /* If parameter is specifically set to null - use the original-defined value */
-            if ($value === null && isset($this->originalParameters[$param])) {
-                $value = $this->originalParameters[$param];
+            if ($parameters === '' || (\is_array($parameters) === true && \count($parameters) === 0)) {
+                $value = '';
+            } else {
+                $p = (array)$parameters;
+                $value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
+
+                /* If parameter is specifically set to null - use the original-defined value */
+                if ($value === null && isset($this->originalParameters[$param]) === true) {
+                    $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;
+                /* Parameter aren't recognized and will be appended at the end of the url */
+                $url .= $value . '/';
            }
        }

-        $url .= join('/', $unknownParams);
-
-        return rtrim($url, '/') . '/';
+        return rtrim('/' . ltrim($url, '/'), '/') . '/';
    }

    /**
@@ -153,7 +161,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     *
     * @return string
     */
-    public function getName()
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -164,9 +172,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string $name
     * @return bool
     */
-    public function hasName($name)
+    public function hasName(string $name): bool
    {
-        return (strtolower($this->name) === strtolower($name));
+        return strtolower($this->name) === strtolower($name);
    }

    /**
@@ -175,7 +183,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string $regex
     * @return static
     */
-    public function setMatch($regex)
+    public function setMatch($regex): ILoadableRoute
    {
        $this->regex = $regex;

@@ -187,7 +195,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     *
     * @return string
     */
-    public function getMatch()
+    public function getMatch(): string
    {
        return $this->regex;
    }
@@ -200,7 +208,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string|array $name
     * @return static
     */
-    public function name($name)
+    public function name($name): ILoadableRoute
    {
        return $this->setName($name);
    }
@@ -209,9 +217,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * Sets the router name, which makes it easier to obtain the url or router at a later point.
     *
     * @param string $name
-     * @return static $this
+     * @return static
     */
-    public function setName($name)
+    public function setName(string $name): ILoadableRoute
    {
        $this->name = $name;

@@ -225,23 +233,24 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param bool $merge
     * @return static
     */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
    {
-        if (isset($values['as'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
            if ($this->name !== null && $merge !== false) {
-                $this->setName($values['as'] . '.' . $this->name);
-            } else {
-                $this->setName($values['as']);
+                $name .= '.' . $this->name;
            }
+
+            $this->setName($name);
        }

-        if (isset($values['prefix'])) {
-            $this->setUrl($values['prefix'] . $this->getUrl());
+        if (isset($values['prefix']) === true) {
+            $this->prependUrl($values['prefix']);
        }

-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
    }

 }
@@ -1,19 +1,24 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

+use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Router;

 abstract class Route implements IRoute
 {
-    const PARAMETERS_REGEX_MATCH = '%s([\w]+)(\%s?)%s';
+    protected const PARAMETERS_REGEX_FORMAT = '%s([\w]+)(\%s?)%s';
+    protected const PARAMETERS_DEFAULT_REGEX = '[\w]+';

-    const REQUEST_TYPE_GET = 'get';
-    const REQUEST_TYPE_POST = 'post';
-    const REQUEST_TYPE_PUT = 'put';
-    const REQUEST_TYPE_PATCH = 'patch';
-    const REQUEST_TYPE_OPTIONS = 'options';
-    const REQUEST_TYPE_DELETE = 'delete';
+    public const REQUEST_TYPE_GET = 'get';
+    public const REQUEST_TYPE_POST = 'post';
+    public const REQUEST_TYPE_PUT = 'put';
+    public const REQUEST_TYPE_PATCH = 'patch';
+    public const REQUEST_TYPE_OPTIONS = 'options';
+    public const REQUEST_TYPE_DELETE = 'delete';
+    public const REQUEST_TYPE_HEAD = 'head';

    public static $requestTypes = [
        self::REQUEST_TYPE_GET,
@@ -22,6 +27,7 @@ abstract class Route implements IRoute
        self::REQUEST_TYPE_PATCH,
        self::REQUEST_TYPE_OPTIONS,
        self::REQUEST_TYPE_DELETE,
+        self::REQUEST_TYPE_HEAD,
    ];

    /**
@@ -30,9 +36,16 @@ abstract class Route implements IRoute
     *
     * @var bool
     */
-    protected $filterEmptyParams = false;
+    protected $filterEmptyParams = true;
+
+    /**
+     * Default regular expression used for parsing parameters.
+     * @var string|null
+     */
+    protected $defaultParameterRegex;
    protected $paramModifiers = '{}';
    protected $paramOptionalSymbol = '?';
+    protected $urlRegex = '/^%s\/?$/u';
    protected $group;
    protected $parent;
    protected $callback;
@@ -46,101 +59,130 @@ abstract class Route implements IRoute
    protected $originalParameters = [];
    protected $middlewares = [];

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

-        return new $name();
-    }
-
-    public function renderRoute(Request $request)
-    {
        $callback = $this->getCallback();

-        if ($callback !== null && is_callable($callback)) {
+        if ($callback === null) {
+            return null;
+        }
+
+        $router->debug('Parsing parameters');
+
+        $parameters = $this->getParameters();
+
+        $router->debug('Finished parsing parameters');
+
+        /* Filter parameters with null-value */
+        if ($this->filterEmptyParams === true) {
+            $parameters = array_filter($parameters, function ($var) {
+                return ($var !== null);
+            });
+        }
+
+        /* Render callback function */
+        if (\is_callable($callback) === true) {
+            $router->debug('Executing callback');

            /* When the callback is a function */
-            call_user_func_array($callback, $this->getParameters());

-        } else {
-
-            /* When the callback is a method */
-            $controller = explode('@', $callback);
-
-            $namespace = $this->getNamespace();
-
-            $className = ($namespace !== null && $controller[0][0] !== '\\') ? $namespace . '\\' . $controller[0] : $controller[0];
-
-            $class = $this->loadClass($className);
-            $method = $controller[1];
-
-            if (method_exists($class, $method) === false) {
-                throw new NotFoundHttpException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
-            }
-
-            $parameters = $this->getParameters();
-
-            /* Filter parameters with null-value */
-
-            if ($this->filterEmptyParams === true) {
-                $parameters = array_filter($parameters, function ($var) {
-                    return ($var !== null);
-                });
-            }
-
-            call_user_func_array([$class, $method], $parameters);
+            return $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);
+
+        if (\count($controller) === 1) {
+            $controller[1] = '__invoke';
+        }
+
+        $method = $controller[1];
+
+        if (method_exists($class, $method) === false) {
+            throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
+        }
+
+        $router->debug('Executing callback');
+
+        return \call_user_func_array([$class, $method], $parameters);
    }

-    protected function parseParameters($route, $url, $parameterRegex = '[\w]+')
+    protected function parseParameters($route, $url, $parameterRegex = null)
    {
-        $regex = sprintf(static::PARAMETERS_REGEX_MATCH, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+        $regex = (strpos($route, $this->paramModifiers[0]) === false) ? null :
+            sprintf
+            (
+                static::PARAMETERS_REGEX_FORMAT,
+                $this->paramModifiers[0],
+                $this->paramOptionalSymbol,
+                $this->paramModifiers[1]
+            );

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

-        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+        if ($regex === null || (bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+            $urlRegex = preg_quote($route, '/');
+        } else {

-            $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
-
-            foreach ($urlParts as $key => $t) {
+            foreach (preg_split('/((\-?\/?)\{[^}]+\})/', $route) as $key => $t) {

                $regex = '';

-                if ($key < count($parameters[1])) {
+                if ($key < \count($parameters[1])) {

                    $name = $parameters[1][$key];
-                    $regex = isset($this->where[$name]) ? $this->where[$name] : $parameterRegex;
-                    $regex = sprintf('\-?\/?(?P<%s>%s)', $name, $regex) . $parameters[2][$key];

+                    /* If custom regex is defined, use that */
+                    if (isset($this->where[$name]) === true) {
+                        $regex = $this->where[$name];
+                    } else if ($parameterRegex !== null) {
+                        $regex = $parameterRegex;
+                    } else {
+                        $regex = $this->defaultParameterRegex ?? static::PARAMETERS_DEFAULT_REGEX;
+                    }
+
+                    $regex = sprintf('((\/|\-)(?P<%2$s>%3$s))%1$s', $parameters[2][$key], $name, $regex);
                }

-                $urlParts[$key] = preg_quote($t, '/') . $regex;
+                $urlRegex .= preg_quote($t, '/') . $regex;
            }
-
-            $urlRegex = join('', $urlParts);
-
-        } else {
-            $urlRegex = preg_quote($route, '/');
        }

-        if (preg_match('/^' . $urlRegex . '(\/?)$/', $url, $matches) > 0) {
-
-            $values = [];
-
-            if (isset($parameters[1])) {
-
-                /* Only take matched parameters with name */
-                foreach ($parameters[1] as $name) {
-                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
-                }
-            }
-
-            return $values;
+        if (trim($urlRegex) === '' || (bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+            return null;
        }

-        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]) === true && $matches[$name] !== '') ? $matches[$name] : null;
+            }
+        }
+
+        return $values;
    }

    /**
@@ -150,22 +192,22 @@ abstract class Route implements IRoute
     *
     * @return string
     */
-    public function getIdentifier()
+    public function getIdentifier(): string
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            return $this->callback;
        }

-        return 'function_' . md5($this->callback);
+        return 'function:' . md5($this->callback);
    }

    /**
     * Set allowed request methods
     *
     * @param array $methods
-     * @return static $this
+     * @return static
     */
-    public function setRequestMethods(array $methods)
+    public function setRequestMethods(array $methods): IRoute
    {
        $this->requestMethods = $methods;

@@ -177,7 +219,7 @@ abstract class Route implements IRoute
     *
     * @return array
     */
-    public function getRequestMethods()
+    public function getRequestMethods(): array
    {
        return $this->requestMethods;
    }
@@ -185,7 +227,7 @@ abstract class Route implements IRoute
    /**
     * @return IRoute|null
     */
-    public function getParent()
+    public function getParent(): ?IRoute
    {
        return $this->parent;
    }
@@ -195,7 +237,7 @@ abstract class Route implements IRoute
     *
     * @return IGroupRoute|null
     */
-    public function getGroup()
+    public function getGroup(): ?IGroupRoute
    {
        return $this->group;
    }
@@ -204,22 +246,24 @@ abstract class Route implements IRoute
     * Set group
     *
     * @param IGroupRoute $group
-     * @return static $this
+     * @return static
     */
-    public function setGroup(IGroupRoute $group)
+    public function setGroup(IGroupRoute $group): IRoute
    {
        $this->group = $group;

-        return $this;
+        /* Add/merge parent settings with child */
+
+        return $this->setSettings($group->toArray(), true);
    }

    /**
     * Set parent route
     *
     * @param IRoute $parent
-     * @return static $this
+     * @return static
     */
-    public function setParent(IRoute $parent)
+    public function setParent(IRoute $parent): IRoute
    {
        $this->parent = $parent;

@@ -232,7 +276,7 @@ abstract class Route implements IRoute
     * @param string $callback
     * @return static
     */
-    public function setCallback($callback)
+    public function setCallback($callback): IRoute
    {
        $this->callback = $callback;

@@ -240,16 +284,16 @@ abstract class Route implements IRoute
    }

    /**
-     * @return string
+     * @return string|callable
     */
    public function getCallback()
    {
        return $this->callback;
    }

-    public function getMethod()
+    public function getMethod(): ?string
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            $tmp = explode('@', $this->callback);

            return $tmp[1];
@@ -258,9 +302,9 @@ abstract class Route implements IRoute
        return null;
    }

-    public function getClass()
+    public function getClass(): ?string
    {
-        if (strpos($this->callback, '@') !== false) {
+        if (\is_string($this->callback) === true && strpos($this->callback, '@') !== false) {
            $tmp = explode('@', $this->callback);

            return $tmp[0];
@@ -269,14 +313,14 @@ abstract class Route implements IRoute
        return null;
    }

-    public function setMethod($method)
+    public function setMethod(string $method): IRoute
    {
        $this->callback = sprintf('%s@%s', $this->getClass(), $method);

        return $this;
    }

-    public function setClass($class)
+    public function setClass(string $class): IRoute
    {
        $this->callback = sprintf('%s@%s', $class, $this->getMethod());

@@ -285,9 +329,9 @@ abstract class Route implements IRoute

    /**
     * @param string $namespace
-     * @return static $this
+     * @return static
     */
-    public function setNamespace($namespace)
+    public function setNamespace(string $namespace): IRoute
    {
        $this->namespace = $namespace;

@@ -296,26 +340,26 @@ abstract class Route implements IRoute

    /**
     * @param string $namespace
-     * @return static $this
+     * @return static
     */
-    public function setDefaultNamespace($namespace)
+    public function setDefaultNamespace($namespace): IRoute
    {
        $this->defaultNamespace = $namespace;

        return $this;
    }

-    public function getDefaultNamespace()
+    public function getDefaultNamespace(): ?string
    {
        return $this->defaultNamespace;
    }

    /**
-     * @return string
+     * @return string|null
     */
-    public function getNamespace()
+    public function getNamespace(): ?string
    {
-        return ($this->namespace === null) ? $this->defaultNamespace : $this->namespace;
+        return $this->namespace ?? $this->defaultNamespace;
    }

    /**
@@ -323,7 +367,7 @@ abstract class Route implements IRoute
     *
     * @return array
     */
-    public function toArray()
+    public function toArray(): array
    {
        $values = [];

@@ -331,18 +375,22 @@ abstract class Route implements IRoute
            $values['namespace'] = $this->namespace;
        }

-        if (count($this->requestMethods) > 0) {
+        if (\count($this->requestMethods) !== 0) {
            $values['method'] = $this->requestMethods;
        }

-        if (count($this->where) > 0) {
+        if (\count($this->where) !== 0) {
            $values['where'] = $this->where;
        }

-        if (count($this->middlewares) > 0) {
+        if (\count($this->middlewares) !== 0) {
            $values['middleware'] = $this->middlewares;
        }

+        if ($this->defaultParameterRegex !== null) {
+            $values['defaultParameterRegex'] = $this->defaultParameterRegex;
+        }
+
        return $values;
    }

@@ -351,31 +399,35 @@ abstract class Route implements IRoute
     *
     * @param array $values
     * @param bool $merge
-     * @return static $this
+     * @return static
     */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
    {
-        if ($this->namespace === null && isset($values['namespace'])) {
+        if ($this->namespace === null && isset($values['namespace']) === true) {
            $this->setNamespace($values['namespace']);
        }

-        if (isset($values['method'])) {
+        if (isset($values['method']) === true) {
            $this->setRequestMethods(array_merge($this->requestMethods, (array)$values['method']));
        }

-        if (isset($values['where'])) {
+        if (isset($values['where']) === true) {
            $this->setWhere(array_merge($this->where, (array)$values['where']));
        }

-        if (isset($values['parameters'])) {
+        if (isset($values['parameters']) === true) {
            $this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
        }

        // Push middleware if multiple
-        if (isset($values['middleware'])) {
+        if (isset($values['middleware']) === true) {
            $this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
        }

+        if (isset($values['defaultParameterRegex']) === true) {
+            $this->setDefaultParameterRegex($values['defaultParameterRegex']);
+        }
+
        return $this;
    }

@@ -384,7 +436,7 @@ abstract class Route implements IRoute
     *
     * @return array
     */
-    public function getWhere()
+    public function getWhere(): array
    {
        return $this->where;
    }
@@ -395,7 +447,7 @@ abstract class Route implements IRoute
     * @param array $options
     * @return static
     */
-    public function setWhere(array $options)
+    public function setWhere(array $options): IRoute
    {
        $this->where = $options;

@@ -420,12 +472,12 @@ abstract class Route implements IRoute
     *
     * @return array
     */
-    public function getParameters()
+    public function getParameters(): array
    {
        /* Sort the parameters after the user-defined param order, if any */
        $parameters = [];

-        if (count($this->originalParameters) > 0) {
+        if (\count($this->originalParameters) !== 0) {
            $parameters = $this->originalParameters;
        }

@@ -436,15 +488,15 @@ abstract class Route implements IRoute
     * Get parameters
     *
     * @param array $parameters
-     * @return static $this
+     * @return static
     */
-    public function setParameters(array $parameters)
+    public function setParameters(array $parameters): IRoute
    {
        /*
         * If this is the first time setting parameters we store them so we
         * later can organize the array, in case somebody tried to sort the array.
         */
-        if (count($parameters) > 0 && count($this->originalParameters) === 0) {
+        if (\count($parameters) !== 0 && \count($this->originalParameters) === 0) {
            $this->originalParameters = $parameters;
        }

@@ -454,9 +506,10 @@ abstract class Route implements IRoute
    }

    /**
-     * Set middleware class-name
+     * Add middleware class-name
     *
-     * @param string $middleware
+     * @deprecated This method is deprecated and will be removed in the near future.
+     * @param IMiddleware|string $middleware
     * @return static
     */
    public function setMiddleware($middleware)
@@ -466,13 +519,26 @@ abstract class Route implements IRoute
        return $this;
    }

+    /**
+     * Add middleware class-name
+     *
+     * @param IMiddleware|string $middleware
+     * @return static
+     */
+    public function addMiddleware($middleware): IRoute
+    {
+        $this->middlewares[] = $middleware;
+
+        return $this;
+    }
+
    /**
     * Set middlewares array
     *
     * @param array $middlewares
-     * @return $this
+     * @return static
     */
-    public function setMiddlewares(array $middlewares)
+    public function setMiddlewares(array $middlewares): IRoute
    {
        $this->middlewares = $middlewares;

@@ -480,11 +546,35 @@ abstract class Route implements IRoute
    }

    /**
-     * @return string|array
+     * @return array
     */
-    public function getMiddlewares()
+    public function getMiddlewares(): array
    {
        return $this->middlewares;
    }

+    /**
+     * Set default regular expression used when matching parameters.
+     * This is used when no custom parameter regex is found.
+     *
+     * @param string $regex
+     * @return static
+     */
+    public function setDefaultParameterRegex($regex)
+    {
+        $this->defaultParameterRegex = $regex;
+
+        return $this;
+    }
+
+    /**
+     * Get default regular expression used when matching parameters.
+     *
+     * @return string
+     */
+    public function getDefaultParameterRegex(): string
+    {
+        return $this->defaultParameterRegex;
+    }
+
 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
@@ -23,7 +24,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string $name
     * @return bool
     */
-    public function hasName($name)
+    public function hasName(string $name): bool
    {
        if ($this->name === null) {
            return false;
@@ -34,7 +35,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
            $method = substr($name, strrpos($name, '.') + 1);
            $newName = substr($name, 0, strrpos($name, '.'));

-            if (in_array($method, $this->names, false) === true && strtolower($this->name) === strtolower($newName)) {
+            if (\in_array($method, $this->names, true) === true && strtolower($this->name) === strtolower($newName)) {
                return true;
            }
        }
@@ -48,12 +49,12 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null)
+    public function findUrl(?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 = $found;
+                $method = (string)$found;
            }
        }

@@ -66,7 +67,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
            foreach (static::$requestTypes as $requestType) {

                if (stripos($method, $requestType) === 0) {
-                    $method = substr($method, strlen($requestType));
+                    $method = (string)substr($method, \strlen($requestType));
                    break;
                }
            }
@@ -74,36 +75,39 @@ class RouteController extends LoadableRoute implements IControllerRoute
            $method .= '/';
        }

-        if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+        $group = $this->getGroup();
+
+        if ($group !== null && \count($group->getDomains()) !== 0) {
+            $url .= '//' . $group->getDomains()[0];
        }

-        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . join('/', $parameters);
+        $url .= '/' . trim($this->getUrl(), '/') . '/' . strtolower($method) . implode('/', $parameters);

        return '/' . trim($url, '/') . '/';
    }

-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

-        if ($regexMatch === false || stripos($url, $this->url) !== 0 || strtolower($url) !== strtolower($this->url)) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtoupper($url) !== strtoupper($this->url))) {
            return false;
        }

        $strippedUrl = trim(str_ireplace($this->url, '/', $url), '/');
        $path = explode('/', $strippedUrl);

-        if (count($path) > 0) {
+        if (\count($path) !== 0) {

            $method = (isset($path[0]) === false || trim($path[0]) === '') ? $this->defaultMethod : $path[0];
            $this->method = $request->getMethod() . ucfirst($method);

-            $this->parameters = array_slice($path, 1);
+            $this->parameters = \array_slice($path, 1);

            // Set callback
            $this->setCallback($this->controller . '@' . $this->method);
@@ -119,7 +123,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     *
     * @return string
     */
-    public function getController()
+    public function getController(): string
    {
        return $this->controller;
    }
@@ -130,7 +134,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string $controller
     * @return static
     */
-    public function setController($controller)
+    public function setController(string $controller): IControllerRoute
    {
        $this->controller = $controller;

@@ -140,9 +144,9 @@ class RouteController extends LoadableRoute implements IControllerRoute
    /**
     * Return active method
     *
-     * @return string
+     * @return string|null
     */
-    public function getMethod()
+    public function getMethod(): ?string
    {
        return $this->method;
    }
@@ -153,7 +157,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string $method
     * @return static
     */
-    public function setMethod($method)
+    public function setMethod(string $method): IRoute
    {
        $this->method = $method;

@@ -167,15 +171,13 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param bool $merge
     * @return static
     */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
    {
-        if (isset($values['names'])) {
+        if (isset($values['names']) === true) {
            $this->names = $values['names'];
        }

-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
    }

 }
@@ -1,7 +1,9 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

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

 class RouteGroup extends Route implements IGroupRoute
 {
@@ -16,9 +18,9 @@ class RouteGroup extends Route implements IGroupRoute
     * @param Request $request
     * @return bool
     */
-    public function matchDomain(Request $request)
+    public function matchDomain(Request $request): bool
    {
-        if (count($this->domains) === 0) {
+        if ($this->domains === null || \count($this->domains) === 0) {
            return true;
        }

@@ -26,7 +28,7 @@ class RouteGroup extends Route implements IGroupRoute

            $parameters = $this->parseParameters($domain, $request->getHost(), '.*');

-            if ($parameters !== null && count($parameters) > 0) {
+            if ($parameters !== null && \count($parameters) !== 0) {

                $this->parameters = $parameters;

@@ -44,8 +46,12 @@ class RouteGroup extends Route implements IGroupRoute
     * @param Request $request
     * @return bool
     */
-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
    {
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }
+
        /* Skip if prefix doesn't match */
        if ($this->prefix !== null && stripos($url, $this->prefix) === false) {
            return false;
@@ -54,13 +60,26 @@ class RouteGroup extends Route implements IGroupRoute
        return $this->matchDomain($request);
    }

+    /**
+     * Add exception handler
+     *
+     * @param IExceptionHandler|string $handler
+     * @return static
+     */
+    public function addExceptionHandler($handler): IGroupRoute
+    {
+        $this->exceptionHandlers[] = $handler;
+
+        return $this;
+    }
+
    /**
     * Set exception-handlers for group
     *
     * @param array $handlers
-     * @return static $this
+     * @return static
     */
-    public function setExceptionHandlers(array $handlers)
+    public function setExceptionHandlers(array $handlers): IGroupRoute
    {
        $this->exceptionHandlers = $handlers;

@@ -72,7 +91,7 @@ class RouteGroup extends Route implements IGroupRoute
     *
     * @return array
     */
-    public function getExceptionHandlers()
+    public function getExceptionHandlers(): array
    {
        return $this->exceptionHandlers;
    }
@@ -82,7 +101,7 @@ class RouteGroup extends Route implements IGroupRoute
     *
     * @return array
     */
-    public function getDomains()
+    public function getDomains(): array
    {
        return $this->domains;
    }
@@ -91,9 +110,9 @@ class RouteGroup extends Route implements IGroupRoute
     * Set allowed domains for group.
     *
     * @param array $domains
-     * @return $this
+     * @return static
     */
-    public function setDomains(array $domains)
+    public function setDomains(array $domains): IGroupRoute
    {
        $this->domains = $domains;

@@ -104,7 +123,7 @@ class RouteGroup extends Route implements IGroupRoute
     * @param string $prefix
     * @return static
     */
-    public function setPrefix($prefix)
+    public function setPrefix($prefix): IGroupRoute
    {
        $this->prefix = '/' . trim($prefix, '/');

@@ -114,9 +133,9 @@ class RouteGroup extends Route implements IGroupRoute
    /**
     * Set prefix that child-routes will inherit.
     *
-     * @return string
+     * @return string|null
     */
-    public function getPrefix()
+    public function getPrefix(): ?string
    {
        return $this->prefix;
    }
@@ -128,32 +147,33 @@ class RouteGroup extends Route implements IGroupRoute
     * @param bool $merge
     * @return static
     */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
    {

-        if (isset($values['prefix'])) {
+        if (isset($values['prefix']) === true) {
            $this->setPrefix($values['prefix'] . $this->prefix);
        }

-        if (isset($values['exceptionHandler'])) {
+        if ($merge === false && isset($values['exceptionHandler']) === true) {
            $this->setExceptionHandlers((array)$values['exceptionHandler']);
        }

-        if (isset($values['domain'])) {
+        if ($merge === false && isset($values['domain']) === true) {
            $this->setDomains((array)$values['domain']);
        }

-        if (isset($values['as'])) {
+        if (isset($values['as']) === true) {
+
+            $name = $values['as'];
+
            if ($this->name !== null && $merge !== false) {
-                $this->name = $values['as'] . '.' . $this->name;
-            } else {
-                $this->name = $values['as'];
+                $name .= '.' . $this->name;
            }
+
+            $this->name = $name;
        }

-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
    }

    /**
@@ -161,7 +181,7 @@ class RouteGroup extends Route implements IGroupRoute
     *
     * @return array
     */
-    public function toArray()
+    public function toArray(): array
    {
        $values = [];

@@ -173,7 +193,7 @@ class RouteGroup extends Route implements IGroupRoute
            $values['as'] = $this->name;
        }

-        if (count($this->parameters) > 0) {
+        if (\count($this->parameters) !== 0) {
            $values['parameters'] = $this->parameters;
        }

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

 use Pecee\Http\Request;
@@ -41,7 +42,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     * @param string $name
     * @return bool
     */
-    public function hasName($name)
+    public function hasName(string $name): bool
    {
        if ($this->name === null) {
            return false;
@@ -53,13 +54,19 @@ class RouteResource extends LoadableRoute implements IControllerRoute

        /* Remove method/type */
        if (strpos($name, '.') !== false) {
-            $name = substr($name, 0, strrpos($name, '.'));
+            $name = (string)substr($name, 0, strrpos($name, '.'));
        }

        return (strtolower($this->name) === strtolower($name));
    }

-    public function findUrl($method = null, $parameters = null, $name = null)
+    /**
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = array_search($name, $this->names, false);
        if ($url !== false) {
@@ -76,22 +83,26 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        return true;
    }

-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);

-        if ($regexMatch === false) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtoupper($url) !== strtoupper($this->url))) {
            return false;
        }

        $route = rtrim($this->url, '/') . '/{id?}/{action?}';

+        /* Parse parameters from current route */
        $this->parameters = $this->parseParameters($route, $url);
-        if ($this->parameters === null) {
+
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $this->parameters === null) {
            return false;
        }

@@ -109,7 +120,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        }

        // Update
-        if ($id !== null && in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], false) === true) {
+        if ($id !== null && \in_array($method, [static::REQUEST_TYPE_PATCH, static::REQUEST_TYPE_PUT], true) === true) {
            return $this->call($this->methodNames['update']);
        }

@@ -140,7 +151,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
    /**
     * @return string
     */
-    public function getController()
+    public function getController(): string
    {
        return $this->controller;
    }
@@ -149,14 +160,14 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     * @param string $controller
     * @return static
     */
-    public function setController($controller)
+    public function setController(string $controller): IControllerRoute
    {
        $this->controller = $controller;

        return $this;
    }

-    public function setName($name)
+    public function setName(string $name): ILoadableRoute
    {
        $this->name = $name;

@@ -189,9 +200,9 @@ class RouteResource extends LoadableRoute implements IControllerRoute
    /**
     * Get method names
     *
-     * @return array $this
+     * @return array
     */
-    public function getMethodNames()
+    public function getMethodNames(): array
    {
        return $this->methodNames;
    }
@@ -203,19 +214,17 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     * @param bool $merge
     * @return static
     */
-    public function setSettings(array $values, $merge = false)
+    public function setSettings(array $values, bool $merge = false): IRoute
    {
-        if (isset($values['names'])) {
+        if (isset($values['names']) === true) {
            $this->names = $values['names'];
        }

-        if (isset($values['methods'])) {
+        if (isset($values['methods']) === true) {
            $this->methodNames = $values['methods'];
        }

-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
    }

 }
@@ -1,4 +1,5 @@
 <?php
+
 namespace Pecee\SimpleRouter\Route;

 use Pecee\Http\Request;
@@ -11,24 +12,29 @@ class RouteUrl extends LoadableRoute
        $this->setCallback($callback);
    }

-    public function matchRoute($url, Request $request)
+    public function matchRoute($url, Request $request): bool
    {
-        $url = parse_url(urldecode($url), PHP_URL_PATH);
-        $url = rtrim($url, '/') . '/';
+        if ($this->getGroup() !== null && $this->getGroup()->matchRoute($url, $request) === false) {
+            return false;
+        }

        /* Match global regular-expression for route */
        $regexMatch = $this->matchRegex($request, $url);
+
        if ($regexMatch === false) {
            return false;
        }

-        /* Make regular expression based on route */
+        /* Parse parameters from current route */
        $parameters = $this->parseParameters($this->url, $url);
-        if ($parameters === null) {
+
+        /* If no custom regular expression or parameters was found on this route, we stop */
+        if ($regexMatch === null && $parameters === null) {
            return false;
        }

-        $this->setParameters($parameters);
+        /* Set the parameters */
+        $this->setParameters((array)$parameters);

        return true;
    }
@@ -7,15 +7,26 @@
 * This class is added so calls can be made statically like Router::get() making the code look pretty.
 * It also adds some extra functionality like default-namespace.
 */
+
 namespace Pecee\SimpleRouter;

+use DI\Container;
+use Pecee\Exceptions\InvalidArgumentException;
+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
+use Pecee\Http\Request;
 use Pecee\Http\Response;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
 use Pecee\SimpleRouter\Exceptions\HttpException;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+use Pecee\SimpleRouter\Route\IGroupRoute;
+use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
 use Pecee\SimpleRouter\Route\RouteController;
 use Pecee\SimpleRouter\Route\RouteGroup;
+use Pecee\SimpleRouter\Route\RoutePartialGroup;
 use Pecee\SimpleRouter\Route\RouteResource;
 use Pecee\SimpleRouter\Route\RouteUrl;

@@ -23,7 +34,7 @@ class SimpleRouter
 {
    /**
     * Default namespace added to all routes
-     * @var string
+     * @var string|null
     */
    protected static $defaultNamespace;

@@ -33,17 +44,78 @@ class SimpleRouter
     */
    protected static $response;

+    /**
+     * Router instance
+     * @var Router
+     */
    protected static $router;

    /**
-     * Start/route request
+     * Start routing
     *
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
     * @throws HttpException
-     * @throws NotFoundHttpException
+     * @throws \Exception
     */
-    public static function start()
+    public static function start(): void
    {
-        static::router()->routeRequest();
+        echo static::router()->start();
+    }
+
+    /**
+     * Start the routing an return array with debugging-information
+     *
+     * @return array
+     */
+    public static function startDebug(): array
+    {
+        $routerOutput = null;
+
+        try {
+            ob_start();
+            static::router()->setDebugEnabled(true)->start();
+            $routerOutput = ob_get_contents();
+            ob_end_clean();
+        } catch (\Exception $e) {
+
+        }
+
+        // Try to parse library version
+        $composerFile = \dirname(__DIR__, 3) . '/composer.lock';
+        $version = false;
+
+        if (is_file($composerFile) === true) {
+            $composerInfo = json_decode(file_get_contents($composerFile), true);
+
+            if (isset($composerInfo['packages']) === true && \is_array($composerInfo['packages']) === true) {
+                foreach ($composerInfo['packages'] as $package) {
+                    if (isset($package['name']) === true && strtolower($package['name']) === 'pecee/simple-router') {
+                        $version = $package['version'];
+                        break;
+                    }
+                }
+            }
+        }
+
+        $request = static::request();
+        $router = static::router();
+
+        return [
+            'url'             => $request->getUrl(),
+            'method'          => $request->getMethod(),
+            'host'            => $request->getHost(),
+            'loaded_routes'   => $request->getLoadedRoutes(),
+            'all_routes'      => $router->getRoutes(),
+            'boot_managers'   => $router->getBootManagers(),
+            'csrf_verifier'   => $router->getCsrfVerifier(),
+            'log'             => $router->getDebugLog(),
+            'event_handlers'  => $router->getEventHandlers(),
+            'router_output'   => $routerOutput,
+            'library_version' => $version,
+            'php_version'     => PHP_VERSION,
+            'server_params'   => $request->getHeaders(),
+        ];
    }

    /**
@@ -51,7 +123,7 @@ class SimpleRouter
     *
     * @param string $defaultNamespace
     */
-    public static function setDefaultNamespace($defaultNamespace)
+    public static function setDefaultNamespace(string $defaultNamespace): void
    {
        static::$defaultNamespace = $defaultNamespace;
    }
@@ -61,31 +133,57 @@ class SimpleRouter
     *
     * @param BaseCsrfVerifier $baseCsrfVerifier
     */
-    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier)
+    public static function csrfVerifier(BaseCsrfVerifier $baseCsrfVerifier): void
    {
        static::router()->setCsrfVerifier($baseCsrfVerifier);
    }

+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }
+
    /**
     * Boot managers allows you to alter the routes before the routing occurs.
     * Perfect if you want to load pretty-urls from a file or database.
     *
     * @param IRouterBootManager $bootManager
     */
-    public static function addBootManager(IRouterBootManager $bootManager)
+    public static function addBootManager(IRouterBootManager $bootManager): void
    {
        static::router()->addBootManager($bootManager);
    }

+    /**
+     * Redirect to when route matches.
+     *
+     * @param string $where
+     * @param string $to
+     * @param int $httpCode
+     * @return IRoute
+     */
+    public static function redirect($where, $to, $httpCode = 301): IRoute
+    {
+        return static::get($where, function () use ($to, $httpCode) {
+            static::response()->redirect($to, $httpCode);
+        });
+    }
+
    /**
     * 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($url, $callback, array $settings = null)
+    public static function get(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['get'], $url, $callback, $settings);
    }
@@ -98,7 +196,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl
     */
-    public static function post($url, $callback, array $settings = null)
+    public static function post(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['post'], $url, $callback, $settings);
    }
@@ -111,7 +209,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl
     */
-    public static function put($url, $callback, array $settings = null)
+    public static function put(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['put'], $url, $callback, $settings);
    }
@@ -124,7 +222,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl
     */
-    public static function patch($url, $callback, array $settings = null)
+    public static function patch(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['patch'], $url, $callback, $settings);
    }
@@ -137,7 +235,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl
     */
-    public static function options($url, $callback, array $settings = null)
+    public static function options(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['options'], $url, $callback, $settings);
    }
@@ -150,7 +248,7 @@ class SimpleRouter
     * @param array|null $settings
     * @return RouteUrl
     */
-    public static function delete($url, $callback, array $settings = null)
+    public static function delete(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['delete'], $url, $callback, $settings);
    }
@@ -160,19 +258,46 @@ class SimpleRouter
     *
     * @param array $settings
     * @param \Closure $callback
-     * @throws \InvalidArgumentException
     * @return RouteGroup
+     * @throws InvalidArgumentException
     */
-    public static function group(array $settings = [], \Closure $callback)
+    public static function group(array $settings, \Closure $callback): IGroupRoute
    {
+        if (\is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        }
+
        $group = new RouteGroup();
        $group->setCallback($callback);
        $group->setSettings($settings);

-        if (is_callable($callback) === false) {
-            throw new \InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
+        static::router()->addRoute($group);
+
+        return $group;
+    }
+
+    /**
+     * Special group that has the same benefits as group but supports
+     * parameters and which are only rendered when the url matches.
+     *
+     * @param string $url
+     * @param \Closure $callback
+     * @param array $settings
+     * @return RoutePartialGroup
+     * @throws InvalidArgumentException
+     */
+    public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
+    {
+        if (\is_callable($callback) === false) {
+            throw new InvalidArgumentException('Invalid callback provided. Only functions or methods supported');
        }

+        $settings['prefix'] = $url;
+
+        $group = new RoutePartialGroup();
+        $group->setSettings($settings);
+        $group->setCallback($callback);
+
        static::router()->addRoute($group);

        return $group;
@@ -187,7 +312,7 @@ class SimpleRouter
     * @see SimpleRouter::form
     * @return RouteUrl
     */
-    public static function basic($url, $callback, array $settings = null)
+    public static function basic(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['get', 'post'], $url, $callback, $settings);
    }
@@ -202,7 +327,7 @@ class SimpleRouter
     * @see SimpleRouter::form
     * @return RouteUrl
     */
-    public static function form($url, $callback, array $settings = null)
+    public static function form(string $url, $callback, array $settings = null): IRoute
    {
        return static::match(['get', 'post'], $url, $callback, $settings);
    }
@@ -214,9 +339,9 @@ class SimpleRouter
     * @param string $url
     * @param string|\Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
-    public static function match(array $requestMethods, $url, $callback, array $settings = null)
+    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
    {
        $route = new RouteUrl($url, $callback);
        $route->setRequestMethods($requestMethods);
@@ -226,9 +351,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -237,9 +360,9 @@ class SimpleRouter
     * @param string $url
     * @param string|\Closure $callback
     * @param array|null $settings
-     * @return RouteUrl
+     * @return RouteUrl|IRoute
     */
-    public static function all($url, $callback, array $settings = null)
+    public static function all(string $url, $callback, array $settings = null)
    {
        $route = new RouteUrl($url, $callback);
        $route = static::addDefaultNamespace($route);
@@ -248,9 +371,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -259,9 +380,9 @@ class SimpleRouter
     * @param string $url
     * @param string $controller
     * @param array|null $settings
-     * @return RouteController
+     * @return RouteController|IRoute
     */
-    public static function controller($url, $controller, array $settings = null)
+    public static function controller(string $url, $controller, array $settings = null)
    {
        $route = new RouteController($url, $controller);
        $route = static::addDefaultNamespace($route);
@@ -270,9 +391,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -281,9 +400,9 @@ class SimpleRouter
     * @param string $url
     * @param string $controller
     * @param array|null $settings
-     * @return RouteResource
+     * @return RouteResource|IRoute
     */
-    public static function resource($url, $controller, array $settings = null)
+    public static function resource(string $url, $controller, array $settings = null)
    {
        $route = new RouteResource($url, $controller);
        $route = static::addDefaultNamespace($route);
@@ -292,9 +411,29 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -312,12 +451,22 @@ class SimpleRouter
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
-     * @throws \Exception
-     * @return string
+     * @return Url
     */
-    public static function getUrl($name = null, $parameters = null, $getParams = null)
+    public static function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
    {
-        return static::router()->getUrl($name, $parameters, $getParams);
+        try {
+            return static::router()->getUrl($name, $parameters, $getParams);
+        } catch (\Exception $e) {
+            try {
+                return new Url('/');
+            } catch (MalformedUrlException $e) {
+
+            }
+        }
+
+        // This will never happen...
+        return null;
    }

    /**
@@ -325,7 +474,7 @@ class SimpleRouter
     *
     * @return \Pecee\Http\Request
     */
-    public static function request()
+    public static function request(): Request
    {
        return static::router()->getRequest();
    }
@@ -335,7 +484,7 @@ class SimpleRouter
     *
     * @return Response
     */
-    public static function response()
+    public static function response(): Response
    {
        if (static::$response === null) {
            static::$response = new Response(static::request());
@@ -349,9 +498,9 @@ class SimpleRouter
     *
     * @return Router
     */
-    public static function router()
+    public static function router(): Router
    {
-        if(static::$router === null) {
+        if (static::$router === null) {
            static::$router = new Router();
        }

@@ -364,14 +513,14 @@ class SimpleRouter
     * @param IRoute $route
     * @return IRoute
     */
-    protected static function addDefaultNamespace(IRoute $route)
+    public static function addDefaultNamespace(IRoute $route): IRoute
    {
        if (static::$defaultNamespace !== null) {

            $callback = $route->getCallback();

            /* Only add default namespace on relative callbacks */
-            if ($callback === null || $callback[0] !== '\\') {
+            if ($callback === null || (\is_string($callback) === true && $callback[0] !== '\\')) {

                $namespace = static::$defaultNamespace;

@@ -390,10 +539,24 @@ class SimpleRouter
    }

    /**
-     * Get default namespace
-     * @return string
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
     */
-    public static function getDefaultNamespace()
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
+    /**
+     * Get default namespace
+     * @return string|null
+     */
+    public static function getDefaultNamespace(): ?string
    {
        return static::$defaultNamespace;
    }
@@ -1,20 +0,0 @@
-<?php
-
-class DummyController
-{
-	public function method1()
-	{
-
-	}
-
-    public function method2()
-    {
-
-    }
-
-	public function param($params = null)
-	{
-		echo join(', ', func_get_args());
-	}
-
-}
@@ -1,14 +0,0 @@
-<?php
-
-class ExceptionHandlerFirst implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
-	{
-	    global $stack;
-	    $stack[] = static::class;
-
-		$request->setUri('/');
-		return $request;
-	}
-
-}
@@ -1,14 +0,0 @@
-<?php
-
-class ExceptionHandlerSecond implements \Pecee\Handlers\IExceptionHandler
-{
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
-	{
-        global $stack;
-        $stack[] = static::class;
-
-        $request->setUri('/');
-        return $request;
-	}
-
-}
@@ -1,39 +0,0 @@
-<?php
-class ResourceController implements \Pecee\Controllers\IResourceController
-{
-
-    public function index()
-    {
-        echo 'index';
-    }
-
-    public function show($id)
-    {
-        echo 'show ' . $id;
-    }
-
-    public function store()
-    {
-        echo 'store';
-    }
-
-    public function create()
-    {
-        echo 'create';
-    }
-
-    public function edit($id)
-    {
-        echo 'edit ' . $id;
-    }
-
-    public function update($id)
-    {
-        echo 'update ' . $id;
-    }
-
-    public function destroy($id)
-    {
-        echo 'destroy ' . $id;
-    }
-}
@@ -1,60 +0,0 @@
-<?php
-require_once 'Dummy/Exceptions/ResponseException.php';
-require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
-require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
-require_once 'Dummy/Handler/ExceptionHandlerThird.php';
-require_once 'Helpers/TestRouter.php';
-
-class RouteRewriteTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Redirects to another route through 3 exception handlers.
-     *
-     * You will see "ExceptionHandler 1 loaded" 2 times. This happen because
-     * the exceptionhandler is asking the router to reload.
-     *
-     * That means that the exceptionhandler is loaded again, but this time
-     * the router ignores the same rewrite-route to avoid loop - loads
-     * the second which have same behavior and is also ignored before
-     * throwing the final Exception in ExceptionHandler 3.
-     *
-     * So this tests:
-     * 1. If ExceptionHandlers loads
-     * 2. If ExceptionHandlers load in the correct order
-     * 3. If ExceptionHandlers can rewrite the page on error
-     * 4. If the router can avoid redirect-loop due to developer has started loop.
-     * 5. And finally if we reaches the last exception-handler and that the correct
-     *    exception-type is being thrown.
-     */
-    public function testExceptionHandlerRewrite()
-    {
-        global $stack;
-        $stack = [];
-
-        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
-
-            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
-
-                TestRouter::get('/my-path', 'DummyController@method1');
-
-            });
-        });
-
-        try {
-            TestRouter::debug('/my-non-existing-path', 'get');
-        } catch(\ResponseException $e) {
-
-        }
-
-        $expectedStack = [
-            ExceptionHandlerFirst::class,
-            ExceptionHandlerSecond::class,
-            ExceptionHandlerThird::class,
-        ];
-
-        $this->assertEquals($expectedStack, $stack);
-
-    }
-
-}
@@ -1,93 +0,0 @@
-<?php
-
-require_once 'Dummy/DummyMiddleware.php';
-require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Handler/ExceptionHandler.php';
-require_once 'Helpers/TestRouter.php';
-
-class RouterUrlTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testUrls()
-    {
-        // Match normal route on alias
-        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);
-
-        TestRouter::get('/about', 'DummyController@about');
-
-        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
-
-            // Match route with prefix on alias
-            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);
-
-            // Match controller with prefix and alias
-            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);
-
-            // Match controller with prefix and NO alias
-            TestRouter::controller('/pages', 'DummyController');
-
-        });
-
-        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
-
-            // Match resource controller
-            TestRouter::resource('phones', 'DummyController');
-
-        });
-
-        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
-
-        // Match controller with no prefix and no alias
-        TestRouter::controller('/cats', 'CatsController');
-
-        // Pretend to load page
-        TestRouter::debugNoReset('/', 'get');
-
-        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));
-
-        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));
-
-        // Should match /
-        $this->assertEquals('/', TestRouter::getUrl('home'));
-
-        // Should match /about/
-        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));
-
-        // Should match /admin/
-        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));
-
-        // Should match /admin/
-        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));
-
-        // Should match /admin/2/
-        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
-
-        // Should match /admin/users/
-        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
-
-        // Should match /admin/users/home/
-        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
-
-        // Should match /cats/
-        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
-
-        // Should match /cats/view/
-        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
-
-        // Should match /cats/view/
-        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
-
-        // Should match /cats/view/666
-        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
-
-        // Should match /funny/man/
-        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
-
-        // Should match /?jackdaniels=true&cola=yeah
-        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
-
-        TestRouter::router()->reset();
-
-    }
-
-}
@@ -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';
+    }
+
+}
@@ -1,11 +1,11 @@
 <?php
-require_once 'Exceptions/MiddlewareLoadedException.php';
+require_once 'Exception/MiddlewareLoadedException.php';

 use Pecee\Http\Request;

 class DummyMiddleware implements \Pecee\Http\Middleware\IMiddleware
 {
-	public function handle(Request $request)
+	public function handle(Request $request) : void
 	{
 		throw new MiddlewareLoadedException('Middleware loaded!');
 	}
@@ -1,4 +1,5 @@
 <?php
+
 class ExceptionHandlerException extends \Exception
 {
 }
@@ -1,8 +1,8 @@
 <?php

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

-class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerThird implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
-	public function handleError(\Pecee\Http\Request $request, \Exception $error)
+	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
        global $stack;
        $stack[] = static::class;
@@ -0,0 +1,32 @@
+<?php
+
+class TestBootManager implements \Pecee\SimpleRouter\IRouterBootManager
+{
+
+    protected $routes;
+    protected $aliasUrl;
+
+    public function __construct(array $routes, string $aliasUrl)
+    {
+        $this->routes = $routes;
+        $this->aliasUrl = $aliasUrl;
+    }
+
+    /**
+     * Called when router loads it's routes
+     *
+     * @param \Pecee\SimpleRouter\Router $router
+     * @param \Pecee\Http\Request $request
+     */
+    public function boot(\Pecee\SimpleRouter\Router $router, \Pecee\Http\Request $request): void
+    {
+        foreach ($this->routes as $url) {
+            // If the current url matches the rewrite url, we use our custom route
+
+            if ($request->getUrl()->contains($url) === true) {
+                $request->setRewriteUrl($this->aliasUrl);
+            }
+
+        }
+    }
+}
@@ -0,0 +1,16 @@
+<?php
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class RewriteMiddleware implements IMiddleware {
+
+    public function handle(Request $request)  : void {
+
+        $request->setRewriteCallback(function() {
+            return 'ok';
+        });
+
+    }
+
+}
@@ -0,0 +1,46 @@
+<?php
+class ResourceController implements \Pecee\Controllers\IResourceController
+{
+
+    public function index() : ?string
+    {
+        echo 'index';
+        return null;
+    }
+
+    public function show($id) : ?string
+    {
+        echo 'show ' . $id;
+        return null;
+    }
+
+    public function store() : ?string
+    {
+        echo 'store';
+        return null;
+    }
+
+    public function create() : ?string
+    {
+        echo 'create';
+        return null;
+    }
+
+    public function edit($id) : ?string
+    {
+        echo 'edit ' . $id;
+        return null;
+    }
+
+    public function update($id) : ?string
+    {
+        echo 'update ' . $id;
+        return null;
+    }
+
+    public function destroy($id) : ?string
+    {
+        echo 'destroy ' . $id;
+        return null;
+    }
+}
@@ -0,0 +1,41 @@
+<?php
+
+class SilentTokenProvider implements \Pecee\Http\Security\ITokenProvider {
+
+    protected $token;
+
+    public function __construct()
+    {
+        $this->refresh();
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void
+    {
+        $this->token = uniqid('', false);
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        return ($token === $this->token);
+    }
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string
+    {
+        return $this->token ?? $defaultValue;
+    }
+}
@@ -0,0 +1,107 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+require_once 'Dummy/Security/SilentTokenProvider.php';
+require_once 'Dummy/Managers/TestBootManager.php';
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Handlers\EventHandler;
+
+class EventHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testAllEventTriggered()
+    {
+        $events = EventHandler::$events;
+
+        // Remove the all event
+        unset($events[\array_search(EventHandler::EVENT_ALL, $events, true)]);
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$events) {
+            $key = \array_search($arg->getEventName(), $events, true);
+            unset($events[$key]);
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        // Add rewrite
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
+
+            // Trigger rewrite
+            $request->setRewriteUrl('/');
+
+        });
+
+        TestRouter::get('/', 'DummyController@method1')->name('home');
+
+        // Trigger findRoute
+        TestRouter::router()->findRoute('home');
+
+        // Trigger getUrl
+        TestRouter::router()->getUrl('home');
+
+        // Add csrf-verifier
+        $csrfVerifier = new \Pecee\Http\Middleware\BaseCsrfVerifier();
+        $csrfVerifier->setTokenProvider(new SilentTokenProvider());
+        TestRouter::csrfVerifier($csrfVerifier);
+
+        // Add boot-manager
+        TestRouter::addBootManager(new TestBootManager([
+            '/test',
+        ], '/'));
+
+        // Start router
+        TestRouter::debug('/non-existing');
+
+        $this->assertEquals($events, []);
+    }
+
+    public function testAllEvent()
+    {
+
+        $status = false;
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ALL, function (EventArgument $arg) use (&$status) {
+            $status = true;
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::debug('/');
+
+        // All event should fire for each other event
+        $this->assertEquals(true, $status);
+    }
+
+    public function testPrefixEvent()
+    {
+
+        $eventHandler = new EventHandler();
+        $eventHandler->register(EventHandler::EVENT_ADD_ROUTE, function (EventArgument $arg) use (&$status) {
+
+            if ($arg->route instanceof \Pecee\SimpleRouter\Route\LoadableRoute) {
+                $arg->route->prependUrl('/local-path');
+            }
+
+        });
+
+        TestRouter::addEventHandler($eventHandler);
+
+        $status = false;
+
+        TestRouter::get('/', function () use (&$status) {
+            $status = true;
+        });
+
+        TestRouter::debug('/local-path');
+
+        $this->assertTrue($status);
+
+    }
+
+}
@@ -2,18 +2,16 @@

 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Helpers/TestRouter.php';

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

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

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

        try {
@@ -21,7 +19,7 @@ class GroupTest extends PHPUnit_Framework_TestCase
        } catch(\Exception $e) {

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

    public function testNestedGroup()
@@ -37,6 +35,7 @@ class GroupTest extends PHPUnit_Framework_TestCase

        TestRouter::debug('/api/v1/test', 'get');

+        $this->assertTrue(true);
    }

    public function testMultipleRoutes()
@@ -61,6 +60,8 @@ class GroupTest extends PHPUnit_Framework_TestCase
        });

        TestRouter::debug('/my/match', 'get');
+
+        $this->assertTrue(true);
    }

    public function testUrls()
@@ -0,0 +1,125 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class InputHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testPost()
+    {
+        global $_POST;
+
+        $names = [
+            'Lester',
+            'Michael',
+            'Franklin',
+            'Trevor',
+        ];
+
+        $day = 'monday';
+
+        $_POST = [
+            'names' => $names,
+            'day' => $day,
+        ];
+
+        $router = TestRouter::router();
+        $router->reset();
+        $router->getRequest()->setMethod('post');
+
+        $handler = TestRouter::request()->getInputHandler();
+
+        $this->assertEquals($names, $handler->value('names'));
+        $this->assertEquals($names, $handler->all(['names'])['names']);
+        $this->assertEquals($day, $handler->value('day'));
+        $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $handler->find('day'));
+        $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $handler->post('day'));
+
+        // Check non-existing and wrong request-type
+        $this->assertEmpty($handler->all(['non-existing']));
+        $this->assertNull($handler->value('non-existing'));
+        $this->assertNull($handler->find('non-existing'));
+        $this->assertNull($handler->value('names', null, 'get'));
+        $this->assertNull($handler->find('names', 'get'));
+
+        $objects = $handler->find('names');
+
+        $this->assertCount(4, $objects);
+
+        /* @var $object \Pecee\Http\Input\InputItem */
+        foreach($objects as $i => $object) {
+            $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $object);
+            $this->assertEquals($names[$i], $object->getValue());
+        }
+
+        $_POST = [];
+    }
+
+    public function testGet()
+    {
+        global $_GET;
+
+        $names = [
+            'Lester',
+            'Michael',
+            'Franklin',
+            'Trevor',
+        ];
+
+        $day = 'monday';
+
+        $_GET = [
+            'names' => $names,
+            'day' => $day,
+        ];
+
+        $router = TestRouter::router();
+        $router->reset();
+        $router->getRequest()->setMethod('get');
+
+        $handler = TestRouter::request()->getInputHandler();
+
+        $this->assertEquals($names, $handler->value('names'));
+        $this->assertEquals($names, $handler->all(['names'])['names']);
+        $this->assertEquals($day, $handler->value('day'));
+        $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $handler->find('day'));
+        $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $handler->get('day'));
+
+        // Check non-existing and wrong request-type
+        $this->assertEmpty($handler->all(['non-existing']));
+        $this->assertNull($handler->value('non-existing'));
+        $this->assertNull($handler->find('non-existing'));
+        $this->assertNull($handler->value('names', null, 'post'));
+        $this->assertNull($handler->find('names', 'post'));
+
+        $objects = $handler->find('names');
+
+        $this->assertCount(4, $objects);
+
+        /* @var $object \Pecee\Http\Input\InputItem */
+        foreach($objects as $i => $object) {
+            $this->assertInstanceOf(\Pecee\Http\Input\InputItem::class, $object);
+            $this->assertEquals($names[$i], $object->getValue());
+        }
+
+        $_GET = [];
+    }
+
+    public function testFile()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testFiles()
+    {
+        $this->assertEquals(true, true);
+    }
+
+    public function testAll()
+    {
+        $this->assertEquals(true, true);
+    }
+
+}
@@ -3,13 +3,12 @@
 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
 require_once 'Dummy/Handler/ExceptionHandler.php';
-require_once 'Helpers/TestRouter.php';

-class MiddlewareTest extends PHPUnit_Framework_TestCase
+class MiddlewareTest extends \PHPUnit\Framework\TestCase
 {
    public function testMiddlewareFound()
    {
-        $this->setExpectedException(MiddlewareLoadedException::class);
+        $this->expectException(MiddlewareLoadedException::class);

        TestRouter::group(['exceptionHandler' => 'ExceptionHandler'], function () {
            TestRouter::get('/my/test/url', 'DummyController@method1', ['middleware' => 'DummyMiddleware']);
@@ -29,6 +28,8 @@ class MiddlewareTest extends PHPUnit_Framework_TestCase
        TestRouter::get('/my/test/url', 'DummyController@method1');

        TestRouter::debug('/my/test/url', 'get');
+
+        $this->assertTrue(true);
    }

 }
@@ -0,0 +1,28 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';
+
+class RouterCallbackExceptionHandlerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testCallbackExceptionHandler()
+    {
+        $this->expectException(ExceptionHandlerException::class);
+
+        // Match normal route on alias
+        TestRouter::get('/my-new-url', 'DummyController@method2');
+        TestRouter::get('/my-url', 'DummyController@method1');
+
+        TestRouter::error(function (\Pecee\Http\Request $request, \Exception $exception) {
+            throw new ExceptionHandlerException();
+        });
+
+        TestRouter::debugNoReset('/404-url', 'get');
+        TestRouter::router()->reset();
+
+        $this->assertTrue(true);
+    }
+
+}
@@ -0,0 +1,41 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+
+class RouterControllerTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}
@@ -0,0 +1,28 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterPartialGroupTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testParameters()
+    {
+        $result1 = null;
+        $result2 = null;
+
+        TestRouter::partialGroup('{param1}/{param2}', function ($param1 = null, $param2 = null) use (&$result1, &$result2) {
+            $result1 = $param1;
+            $result2 = $param2;
+
+            TestRouter::get('/', 'DummyController@method1');
+        });
+
+        TestRouter::debug('/param1/param2', 'get');
+
+        $this->assertEquals('param1', $result1);
+        $this->assertEquals('param2', $result2);
+    }
+
+}
@@ -1,9 +1,8 @@
 <?php

 require_once 'Dummy/ResourceController.php';
-require_once 'Helpers/TestRouter.php';

-class RouterResourceTest extends PHPUnit_Framework_TestCase
+class RouterResourceTest extends \PHPUnit\Framework\TestCase
 {

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

 require_once 'Dummy/DummyMiddleware.php';
 require_once 'Dummy/DummyController.php';
-require_once 'Dummy/Exceptions/ExceptionHandlerException.php';
-require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Exception/ExceptionHandlerException.php';

-class RouterRouteTest extends PHPUnit_Framework_TestCase
+class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
-    protected $result = false;
+
+    /**
+     * Issue #421: Incorrectly optional character in route
+     *
+     * @throws Exception
+     */
+    public function testOptionalCharacterRoute()
+    {
+        $result = false;
+        TestRouter::get('/api/v1/users/{userid}/projects/{id}/pages/{pageid?}', function () use (&$result) {
+            $result = true;
+        });
+
+        TestRouter::debug('/api/v1/users/1/projects/8399421535/pages/43/', 'get');
+
+        $this->assertTrue($result);
+    }

    public function testMultiParam()
    {
-        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) {
+        $result = false;
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use (&$result) {

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

        });

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

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

    }

    public function testNotFound()
    {
-        $this->setExpectedException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
+        $this->expectException('\Pecee\SimpleRouter\Exceptions\NotFoundHttpException');
        TestRouter::get('/non-existing-path', 'DummyController@method1');
        TestRouter::debug('/test-param1-param2', 'post');
    }
@@ -36,24 +52,32 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
    {
        TestRouter::get('/my/test/url', 'DummyController@method1');
        TestRouter::debug('/my/test/url', 'get');
+
+        $this->assertTrue(true);
    }

    public function testPost()
    {
        TestRouter::post('/my/test/url', 'DummyController@method1');
        TestRouter::debug('/my/test/url', 'post');
+
+        $this->assertTrue(true);
    }

    public function testPut()
    {
        TestRouter::put('/my/test/url', 'DummyController@method1');
        TestRouter::debug('/my/test/url', 'put');
+
+        $this->assertTrue(true);
    }

    public function testDelete()
    {
        TestRouter::delete('/my/test/url', 'DummyController@method1');
        TestRouter::debug('/my/test/url', 'delete');
+
+        $this->assertTrue(true);
    }

    public function testMethodNotAllowed()
@@ -77,45 +101,44 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase

    public function testPathParamRegex()
    {
-        TestRouter::get('/test/path/{myParam}', 'DummyController@param', ['where' => ['myParam' => '([0-9]+)']]);
-        $response = TestRouter::debugOutput('/test/path/123123', 'get');
+        TestRouter::get('/{lang}/productscategories/{name}', 'DummyController@param', ['where' => ['lang' => '[a-z]+', 'name' => '[A-Za-z0-9\-]+']]);
+        $response = TestRouter::debugOutput('/it/productscategories/system', 'get');

-        $this->assertEquals('123123', $response);
+        $this->assertEquals('it, system', $response);
    }

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

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

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

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

    }

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

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

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

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

    }

@@ -123,6 +146,42 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
    {
        TestRouter::get('/my/{path}', 'DummyController@method1')->where(['path' => '[a-zA-Z\-]+']);
        TestRouter::debug('/my/custom-path', 'get');
+
+        $this->assertTrue(true);
+    }
+
+    public function testParameterDefaultValue()
+    {
+
+        $defaultVariable = null;
+
+        TestRouter::get('/my/{path?}', function ($path = 'working') use (&$defaultVariable) {
+            $defaultVariable = $path;
+        });
+
+        TestRouter::debug('/my/');
+
+        $this->assertEquals('working', $defaultVariable);
+
+    }
+
+    public function testDefaultParameterRegex()
+    {
+        TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
+    }
+
+    public function testDefaultParameterRegexGroup()
+    {
+        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function () {
+            TestRouter::get('/my/{path}', 'DummyController@param');
+        });
+
+        $output = TestRouter::debugOutput('/my/custom-regex', 'get');
+
+        $this->assertEquals('custom-regex', $output);
    }

 }
@@ -0,0 +1,173 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+require_once 'Dummy/DummyController.php';
+require_once 'Dummy/Handler/ExceptionHandler.php';
+
+class RouterUrlTest extends \PHPUnit\Framework\TestCase
+{
+
+    public function testIssue253()
+    {
+        TestRouter::get('/', 'DummyController@method1');
+        TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
+
+        TestRouter::debugNoReset('/page/22', 'get');
+        $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/', 'get');
+        $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUnicodeCharacters()
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::get('/test/{param}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
+        TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
+
+        $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/test/Dermatología');
+        $parameters = TestRouter::request()->getLoadedRoute()->getParameters();
+
+        $this->assertEquals('Dermatología', $parameters['param']);
+
+        // Test danish characters
+        TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+        TestRouter::debugNoReset('/kategori/økse', 'get');
+
+        $this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::router()->reset();
+    }
+
+    public function testOptionalParameters()
+    {
+        TestRouter::get('/aviso/legal', 'DummyController@method1');
+        TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
+        TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
+        TestRouter::get('/{pagina?}', 'DummyController@method1');
+
+        TestRouter::debugNoReset('/aviso/optional', 'get');
+        $this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/pagina/optional', 'get');
+        $this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/optional', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::debugNoReset('/avisolegal', 'get');
+        $this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        TestRouter::router()->reset();
+    }
+
+    public function testSimilarUrls()
+    {
+        // Match normal route on alias
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
+
+        TestRouter::debugNoReset('/url1', 'get');
+
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUrls()
+    {
+        // Match normal route on alias
+        TestRouter::get('/', 'DummyController@method1', ['as' => 'home']);
+
+        TestRouter::get('/about', 'DummyController@about');
+
+        TestRouter::group(['prefix' => '/admin', 'as' => 'admin'], function () {
+
+            // Match route with prefix on alias
+            TestRouter::get('/{id?}', 'DummyController@method2', ['as' => 'home']);
+
+            // Match controller with prefix and alias
+            TestRouter::controller('/users', 'DummyController', ['as' => 'users']);
+
+            // Match controller with prefix and NO alias
+            TestRouter::controller('/pages', 'DummyController');
+
+        });
+
+        TestRouter::group(['prefix' => 'api', 'as' => 'api'], function () {
+
+            // Match resource controller
+            TestRouter::resource('phones', 'DummyController');
+
+        });
+
+        TestRouter::controller('gadgets', 'DummyController', ['names' => ['getIphoneInfo' => 'iphone']]);
+
+        // Match controller with no prefix and no alias
+        TestRouter::controller('/cats', 'CatsController');
+
+        // Pretend to load page
+        TestRouter::debugNoReset('/', 'get');
+
+        $this->assertEquals('/gadgets/iphoneinfo/', TestRouter::getUrl('gadgets.iphone'));
+
+        $this->assertEquals('/api/phones/create/', TestRouter::getUrl('api.phones.create'));
+
+        // Should match /
+        $this->assertEquals('/', TestRouter::getUrl('home'));
+
+        // Should match /about/
+        $this->assertEquals('/about/', TestRouter::getUrl('DummyController@about'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('DummyController@method2'));
+
+        // Should match /admin/
+        $this->assertEquals('/admin/', TestRouter::getUrl('admin.home'));
+
+        // Should match /admin/2/
+        $this->assertEquals('/admin/2/', TestRouter::getUrl('admin.home', ['id' => 2]));
+
+        // Should match /admin/users/
+        $this->assertEquals('/admin/users/', TestRouter::getUrl('admin.users'));
+
+        // Should match /admin/users/home/
+        $this->assertEquals('/admin/users/home/', TestRouter::getUrl('admin.users@home'));
+
+        // Should match /cats/
+        $this->assertEquals('/cats/', TestRouter::getUrl('CatsController'));
+
+        // Should match /cats/view/
+        $this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', 'view'));
+
+        // Should match /cats/view/
+        //$this->assertEquals('/cats/view/', TestRouter::getUrl('CatsController', ['view']));
+
+        // Should match /cats/view/666
+        $this->assertEquals('/cats/view/666/', TestRouter::getUrl('CatsController@getView', ['666']));
+
+        // Should match /funny/man/
+        $this->assertEquals('/funny/man/', TestRouter::getUrl('/funny/man'));
+
+        // Should match /?jackdaniels=true&cola=yeah
+        $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
+
+        TestRouter::router()->reset();
+
+    }
+
+}
@@ -3,18 +3,20 @@
 class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
 {

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

        static::start();
    }

-    public static function debug($testUri, $testMethod = 'get')
+    public static function debug($testUrl, $testMethod = 'get')
    {
        try {
-            static::debugNoReset($testUri, $testMethod);
+            static::debugNoReset($testUrl, $testMethod);
        } catch(\Exception $e) {
            static::router()->reset();
            throw $e;
@@ -24,13 +26,13 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter

    }

-    public static function debugOutput($testUri, $testMethod = 'get')
+    public static function debugOutput($testUrl, $testMethod = 'get')
    {
        $response = null;

        // Route request
        ob_start();
-        static::debug($testUri, $testMethod);
+        static::debug($testUrl, $testMethod);
        $response = ob_get_contents();
        ob_end_clean();

@@ -0,0 +1,4 @@
+<?php
+
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+require_once 'TestRouter.php';
@@ -0,0 +1,9 @@
+<?php
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+use \Pecee\SimpleRouter\SimpleRouter;
+
+SimpleRouter::get('/user/{name}', 'UserController@show')->where(['name' => '[\w]+']);
+$debugInfo = SimpleRouter::startDebug();
+echo sprintf('<pre>%s</pre>', var_export($debugInfo, true));
+exit;