Merge pull request #434 from skipperbent/v4-development

Version 4.2.0.6
Bugfixes and optimisations.
2026-06-24 03:59:16 +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
55 changed files with 3888 additions and 998 deletions
@@ -1,3 +1,3 @@
-.idea
 composer.lock
-vendor/
+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>
@@ -27,7 +27,9 @@
    }
  ],
  "require": {
-    "php": ">=7.1"
+    "php": ">=7.1",
+    "ext-json": "*",
+    "php-di/php-di": "^6.0"
  },
  "require-dev": {
    "phpunit/phpunit": "^6.0",
@@ -38,4 +40,4 @@
      "Pecee\\": "src/Pecee/"
    }
  }
-}
+}
@@ -1,6 +1,9 @@
 <?php

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

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

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

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

    return request()->getInputHandler();
 }

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

    public function setIndex(string $index): self;

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

    public function setName(string $name): self;

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

    public function setValue(string $value): self;

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

 }
@@ -49,7 +49,7 @@ class InputFile implements IInputItem

        return (new static($values['index']))
            ->setSize((int)$values['size'])
-            ->setError($values['error'])
+            ->setError((int)$values['error'])
            ->setType($values['type'])
            ->setTmpName($values['tmp_name'])
            ->setFilename($values['name']);
@@ -140,7 +140,7 @@ class InputFile implements IInputItem
     *
     * @return string
     */
-    public function getName(): string
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -177,7 +177,7 @@ class InputFile implements IInputItem
     *
     * @return string mixed
     */
-    public function getFilename(): string
+    public function getFilename(): ?string
    {
        return $this->filename;
    }
@@ -216,11 +216,11 @@ class InputFile implements IInputItem
    /**
     * Get upload-error code.
     *
-     * @return string
+     * @return int
     */
-    public function getError(): string
+    public function getError(): int
    {
-        return $this->errors;
+        return (int)$this->errors;
    }

    /**
@@ -256,12 +256,12 @@ class InputFile implements IInputItem
        return $this;
    }

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

-    public function getValue(): string
+    public function getValue(): ?string
    {
        return $this->getFilename();
    }
@@ -10,17 +10,17 @@ class InputHandler
    /**
     * @var array
     */
-    public $get = [];
+    protected $get = [];

    /**
     * @var array
     */
-    public $post = [];
+    protected $post = [];

    /**
     * @var array
     */
-    public $file = [];
+    protected $file = [];

    /**
     * @var Request
@@ -46,7 +46,7 @@ class InputHandler
    {
        /* Parse get requests */
        if (\count($_GET) !== 0) {
-            $this->get = $this->handleGetPost($_GET);
+            $this->get = $this->parseInputItem($_GET);
        }

        /* Parse post requests */
@@ -57,7 +57,7 @@ class InputHandler
        }

        if (\count($postVars) !== 0) {
-            $this->post = $this->handleGetPost($postVars);
+            $this->post = $this->parseInputItem($postVars);
        }

        /* Parse get requests */
@@ -87,8 +87,7 @@ class InputHandler
            }

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

            if (isset($list[$key]) === true) {
                $list[$key][] = $files;
@@ -101,9 +100,16 @@ class InputHandler
        return $list;
    }

-    protected function rearrangeFiles(array $values, &$index, $original): array
+    /**
+     * 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);

@@ -139,7 +145,7 @@ class InputHandler

            $index[] = $key;

-            $files = $this->rearrangeFiles($value, $index, $original);
+            $files = $this->rearrangeFile($value, $index, $original);

            if (isset($output[$key]) === true) {
                $output[$key][] = $files;
@@ -152,7 +158,13 @@ class InputHandler
        return $output;
    }

-    protected function handleGetPost(array $array): array
+    /**
+     * Parse input item from array
+     *
+     * @param array $array
+     * @return array
+     */
+    protected function parseInputItem(array $array): array
    {
        $list = [];

@@ -164,7 +176,7 @@ class InputHandler
                continue;
            }

-            $output = $this->handleGetPost($value);
+            $output = $this->parseInputItem($value);

            $list[$key] = $output;
        }
@@ -172,14 +184,79 @@ class InputHandler
        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|string
+     * @return InputItem|array|string|null
     */
-    public function findPost(string $index, ?string $defaultValue = null)
+    public function post(string $index, ?string $defaultValue = null)
    {
        return $this->post[$index] ?? $defaultValue;
    }
@@ -189,9 +266,9 @@ class InputHandler
     *
     * @param string $index
     * @param string|null $defaultValue
-     * @return InputFile|string
+     * @return InputFile|array|string|null
     */
-    public function findFile(string $index, ?string $defaultValue = null)
+    public function file(string $index, ?string $defaultValue = null)
    {
        return $this->file[$index] ?? $defaultValue;
    }
@@ -201,87 +278,29 @@ class InputHandler
     *
     * @param string $index
     * @param string|null $defaultValue
-     * @return InputItem|string
+     * @return InputItem|array|string|null
     */
-    public function findGet(string $index, ?string $defaultValue = null)
+    public function get(string $index, ?string $defaultValue = null)
    {
        return $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(string $index, ?string $defaultValue = null, $methods = null)
-    {
-        if ($methods !== null && \is_string($methods) === true) {
-            $methods = [$methods];
-        }
-
-        $element = null;
-
-        if ($methods === null || \in_array('get', $methods, true) === true) {
-            $element = $this->findGet($index);
-        }
-
-        if (($element === null && $methods === null) || ($methods !== null && \in_array('post', $methods, true) === true)) {
-            $element = $this->findPost($index);
-        }
-
-        if (($element === null && $methods === null) || ($methods !== null && \in_array('file', $methods, true) === true)) {
-            $element = $this->findFile($index);
-        }
-
-        return $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(string $index, ?string $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(string $index): bool
-    {
-        return ($this->getObject($index) !== null);
-    }
-
    /**
     * Get all get/post items
-     * @param array|null $filter Only take items in filter
+     * @param array $filter Only take items in filter
     * @return array
     */
-    public function all(array $filter = null): array
+    public function all(array $filter = []): array
    {
-        $output = $_GET + $_POST;
+        $output = $_GET;

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

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

+            // Append any PHP-input json
            if (strpos(trim($contents), '{') === 0) {
                $post = json_decode($contents, true);
                if ($post !== false) {
@@ -290,7 +309,40 @@ class InputHandler
            }
        }

-        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
+        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;
    }

 }
@@ -35,7 +35,7 @@ class InputItem implements IInputItem
    /**
     * @return string
     */
-    public function getName(): string
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -55,7 +55,7 @@ class InputItem implements IInputItem
    /**
     * @return string
     */
-    public function getValue(): string
+    public function getValue(): ?string
    {
        return $this->value;
    }
@@ -72,7 +72,7 @@ class InputItem implements IInputItem
        return $this;
    }

-    public function __toString()
+    public function __toString(): string
    {
        return (string)$this->value;
    }
@@ -9,7 +9,7 @@ use Pecee\Http\Security\ITokenProvider;

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

    protected $except;
@@ -67,14 +67,13 @@ class BaseCsrfVerifier implements IMiddleware

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

-            $token = $request->getInputHandler()->get(static::POST_KEY, null, 'post');
+            $token = $request->getInputHandler()->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->tokenProvider->validate($token) === false) {
+            if ($this->tokenProvider->validate((string)$token) === false) {
                throw new TokenMismatchException('Invalid CSRF-token.');
            }

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

 namespace Pecee\Http;

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

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

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

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

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

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

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

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

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

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

    /**
@@ -226,7 +280,7 @@ class Request
     */
    public function setMethod(string $method): void
    {
-        $this->method = $method;
+        $this->method = strtolower($method);
    }

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

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

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

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

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

        return $this;
    }
@@ -372,4 +426,4 @@ class Request
        return $this->data[$name] ?? null;
    }

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

    /**
@@ -4,39 +4,53 @@ namespace Pecee\Http;

 use Pecee\Http\Exceptions\MalformedUrlException;

-class Url
+class Url implements \JsonSerializable
 {
    private $originalUrl;
-    private $data = [
-        'scheme'   => null,
-        'host'     => null,
-        'port'     => null,
-        'user'     => null,
-        'pass'     => null,
-        'path'     => null,
-        'query'    => null,
-        'fragment' => null,
-    ];
+
+    private $scheme;
+    private $host;
+    private $port;
+    private $username;
+    private $password;
+    private $path;
+    private $params = [];
+    private $fragment;

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

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

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

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

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

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

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

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

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

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

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

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

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

    /**
-     * Returns data array with information about the url
-     * @return array
+     * Check if url contains parameter/query string.
+     *
+     * @param string $name
+     * @return bool
     */
-    public function getData(): array
+    public function hasParam(string $name): bool
    {
-        return $this->data;
+        return array_key_exists($name, $this->getParams());
    }

-    public function __toString()
+    /**
+     * Removes multiple parameters from the query-string
+     *
+     * @param array ...$names
+     * @return static
+     */
+    public function removeParams(...$names): self
    {
-        return $this->getOriginalUrl();
+        $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,6 +1,6 @@
 <?php

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

 use Pecee\Http\Request;

@@ -10,7 +10,7 @@ use Pecee\Http\Request;
 * Class is used to create callbacks which are fired when an exception is reached.
 * This allows for easy handling 404-exception etc. without creating an custom ExceptionHandler.
 *
- * @package Pecee\Handlers
+ * @package \Pecee\SimpleRouter\Handlers
 */
 class CallbackExceptionHandler implements IExceptionHandler
 {
@@ -0,0 +1,62 @@
+<?php
+
+namespace Pecee\SimpleRouter\Handlers;
+
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Router;
+
+class DebugEventHandler implements IEventHandler
+{
+
+    /**
+     * Debug callback
+     * @var \Closure
+     */
+    protected $callback;
+
+    public function __construct()
+    {
+        $this->callback = function (EventArgument $argument) {
+            // todo: log in database
+        };
+    }
+
+    /**
+     * Get events.
+     *
+     * @param string|null $name Filter events by name.
+     * @return array
+     */
+    public function getEvents(?string $name): array
+    {
+        return [
+            $name => [
+                $this->callback,
+            ],
+        ];
+    }
+
+    /**
+     * Fires any events registered with given event-name
+     *
+     * @param Router $router Router instance
+     * @param string $name Event name
+     * @param array $eventArgs Event arguments
+     */
+    public function fireEvents(Router $router, string $name, array $eventArgs = []): void
+    {
+        $callback = $this->callback;
+        $callback(new EventArgument($router, $eventArgs));
+    }
+
+    /**
+     * Set debug callback
+     *
+     * @param \Closure $event
+     */
+    public function setCallback(\Closure $event): void
+    {
+        $this->callback = $event;
+    }
+
+}
@@ -0,0 +1,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,6 +1,6 @@
 <?php

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

 use Pecee\Http\Request;

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

 namespace Pecee\SimpleRouter\Route;

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

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

    /**
     * Loads and renders middleware-classes
@@ -39,6 +39,13 @@ interface ILoadableRoute extends IRoute
     */
    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.
     *
@@ -35,16 +35,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        foreach ($this->getMiddlewares() as $middleware) {

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

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

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

        $router->debug('Finished loading middlewares');
@@ -83,6 +85,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        return $this;
    }

+    /**
+     * 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;
@@ -97,7 +110,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = $this->getUrl();

@@ -107,9 +120,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
            $url = '//' . $group->getDomains()[0] . $url;
        }

-        /* Contains parameters that aren't recognized and will be appended at the end of the url */
-        $unknownParams = [];
-
        /* Create the param string - {parameter} */
        $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];

@@ -129,7 +139,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                $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])) {
+                if ($value === null && isset($this->originalParameters[$param]) === true) {
                    $value = $this->originalParameters[$param];
                }
            }
@@ -138,13 +148,12 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                /* 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 = '/' . ltrim($url, '/') . implode('/', $unknownParams);
-
-        return rtrim($url, '/') . '/';
+        return rtrim('/' . ltrim($url, '/'), '/') . '/';
    }

    /**
@@ -152,7 +161,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     *
     * @return string
     */
-    public function getName(): string
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -238,12 +247,10 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
        }

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

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

 }
@@ -18,6 +18,7 @@ abstract class Route implements IRoute
    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,
@@ -26,6 +27,7 @@ abstract class Route implements IRoute
        self::REQUEST_TYPE_PATCH,
        self::REQUEST_TYPE_OPTIONS,
        self::REQUEST_TYPE_DELETE,
+        self::REQUEST_TYPE_HEAD,
    ];

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

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

        $callback = $this->getCallback();

@@ -91,7 +78,9 @@ abstract class Route implements IRoute
        }

        $router->debug('Parsing parameters');
+
        $parameters = $this->getParameters();
+
        $router->debug('Finished parsing parameters');

        /* Filter parameters with null-value */
@@ -107,7 +96,7 @@ abstract class Route implements IRoute

            /* When the callback is a function */

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

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

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

        if (method_exists($class, $method) === false) {
@@ -132,20 +126,25 @@ abstract class Route implements IRoute

    protected function parseParameters($route, $url, $parameterRegex = null)
    {
-        $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $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 = [];

-        // Ensures that hostnames/domains will work with parameters
-        $url = '/' . ltrim($url, '/');
-
-        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+        if ($regex === null || (bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
            $urlRegex = preg_quote($route, '/');
        } else {

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

                $regex = '';

@@ -156,27 +155,20 @@ abstract class Route implements IRoute
                    /* If custom regex is defined, use that */
                    if (isset($this->where[$name]) === true) {
                        $regex = $this->where[$name];
+                    } else if ($parameterRegex !== null) {
+                        $regex = $parameterRegex;
                    } else {
-
-                        /* If method specific regex is defined use that, otherwise use the default parameter regex */
-                        if ($parameterRegex !== null) {
-                            $regex = $parameterRegex;
-                        } else {
-                            $regex = $this->defaultParameterRegex ?? static::PARAMETERS_DEFAULT_REGEX;
-                        }
+                        $regex = $this->defaultParameterRegex ?? static::PARAMETERS_DEFAULT_REGEX;
                    }

-                    $regex = sprintf('(?:\/|\-)%1$s(?P<%2$s>%3$s)%1$s', $parameters[2][$key], $name, $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 = implode('', $urlParts);
-
        }

-        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+        if (trim($urlRegex) === '' || (bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
            return null;
        }

@@ -186,7 +178,7 @@ abstract class Route implements IRoute

            /* Only take matched parameters with name */
            foreach ((array)$parameters[1] as $name) {
-                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+                $values[$name] = (isset($matches[$name]) === true && $matches[$name] !== '') ? $matches[$name] : null;
            }
        }

@@ -206,7 +198,7 @@ abstract class Route implements IRoute
            return $this->callback;
        }

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

    /**
@@ -261,9 +253,8 @@ abstract class Route implements IRoute
        $this->group = $group;

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

-        return $this;
+        return $this->setSettings($group->toArray(), true);
    }

    /**
@@ -49,7 +49,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
     * @param string|null $name
     * @return string
     */
-    public function findUrl($method = null, $parameters = null, $name = null): string
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        if (strpos($name, '.') !== false) {
            $found = array_search(substr($name, strrpos($name, '.') + 1), $this->names, false);
@@ -95,7 +95,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
        /* 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;
        }

@@ -177,9 +177,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
            $this->names = $values['names'];
        }

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

 }
@@ -2,8 +2,8 @@

 namespace Pecee\SimpleRouter\Route;

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

 class RouteGroup extends Route implements IGroupRoute
 {
@@ -173,9 +173,7 @@ class RouteGroup extends Route implements IGroupRoute
            $this->name = $name;
        }

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

    /**
@@ -6,7 +6,14 @@ use Pecee\Http\Request;

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

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

-    public function findUrl($method = null, $parameters = null, $name = null): string
+    /**
+     * @param string|null $method
+     * @param array|string|null $parameters
+     * @param string|null $name
+     * @return string
+     */
+    public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
    {
        $url = array_search($name, $this->names, false);
        if ($url !== false) {
@@ -86,7 +92,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
        /* 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;
        }

@@ -218,9 +224,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
            $this->methodNames = $values['methods'];
        }

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

 }
@@ -3,11 +3,17 @@
 namespace Pecee\SimpleRouter;

 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\IExceptionHandler;
+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\ClassLoader;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
 use Pecee\SimpleRouter\Exceptions\HttpException;
 use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
+use Pecee\SimpleRouter\Handlers\EventHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
+use Pecee\SimpleRouter\Handlers\IExceptionHandler;
 use Pecee\SimpleRouter\Route\IControllerRoute;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\ILoadableRoute;
@@ -27,32 +33,32 @@ class Router
     * Defines if a route is currently being processed.
     * @var bool
     */
-    protected $processingRoute;
+    protected $isProcessingRoute;

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

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

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

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

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

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

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

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

    /**
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * Resets the router by reloading request and clearing all routes and data.
     */
    public function reset(): void
    {
-        $this->processingRoute = false;
-        $this->request = new Request();
+        $this->debugStartTime = microtime(true);
+        $this->isProcessingRoute = false;
+
+        try {
+            $this->request = new Request();
+        } catch (MalformedUrlException $e) {
+            $this->debug(sprintf('Invalid request-uri url: %s', $e->getMessage()));
+        }
+
        $this->routes = [];
        $this->bootManagers = [];
        $this->routeStack = [];
        $this->processedRoutes = [];
        $this->exceptionHandlers = [];
        $this->loadedExceptionHandlers = [];
+        $this->eventHandlers = [];
+        $this->debugList = [];
+        $this->csrfVerifier = null;
+        $this->classLoader = new ClassLoader();
    }

    /**
@@ -123,18 +151,20 @@ class Router
     */
    public function addRoute(IRoute $route): IRoute
    {
+        $this->fireEvents(EventHandler::EVENT_ADD_ROUTE, [
+            'route' => $route,
+        ]);
+
        /*
         * If a route is currently being processed, that means that the route being added are rendered from the parent
         * routes callback, so we add them to the stack instead.
         */
-        if ($this->processingRoute === true) {
+        if ($this->isProcessingRoute === true) {
            $this->routeStack[] = $route;
-
-            return $route;
+        } else {
+            $this->routes[] = $route;
        }

-        $this->routes[] = $route;
-
        return $route;
    }

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

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

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

@@ -158,7 +188,7 @@ class Router
            $this->routeStack = [];

            /* Route any routes added to the stack */
-            $this->processRoutes($stack, $route);
+            $this->processRoutes($stack, ($route instanceof IGroupRoute) ? $route : null);
        }
    }

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

+        $this->fireEvents(EventHandler::EVENT_BOOT, [
+            'bootmanagers' => $this->bootManagers,
+        ]);
+
        /* Initialize boot-managers */
+
        /* @var $manager IRouterBootManager */
        foreach ($this->bootManagers as $manager) {
-            $this->debug('Rendering bootmanager %s', \get_class($manager));
-            $manager->boot($this->request);
-            $this->debug('Finished rendering bootmanager');
+
+            $className = \get_class($manager);
+            $this->debug('Rendering bootmanager "%s"', $className);
+            $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, [
+                'bootmanagers' => $this->bootManagers,
+                'bootmanager'  => $manager,
+            ]);
+
+            /* Render bootmanager */
+            $manager->boot($this, $this->request);
+
+            $this->debug('Finished rendering bootmanager "%s"', $className);
        }

+        $this->fireEvents(EventHandler::EVENT_LOAD_ROUTES, [
+            'routes' => $this->routes,
+        ]);
+
        /* Loop through each route-request */
        $this->processRoutes($this->routes);

        $this->debug('Finished loading routes');
    }

+    /**
+     * Start the routing
+     *
+     * @return string|null
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
+     * @throws HttpException
+     * @throws \Exception
+     */
+    public function start(): ?string
+    {
+        $this->debug('Router starting');
+
+        $this->fireEvents(EventHandler::EVENT_INIT);
+
+        $this->loadRoutes();
+
+        if ($this->csrfVerifier !== null) {
+
+            $this->fireEvents(EventHandler::EVENT_RENDER_CSRF, [
+                'csrfVerifier' => $this->csrfVerifier,
+            ]);
+
+            /* Verify csrf token for request */
+            $this->csrfVerifier->handle($this->request);
+        }
+
+        $output = $this->routeRequest();
+
+        $this->fireEvents(EventHandler::EVENT_LOAD, [
+            'loadedRoutes' => $this->getRequest()->getLoadedRoutes(),
+        ]);
+
+        $this->debug('Routing complete');
+
+        return $output;
+    }
+
    /**
     * Routes the request
     *
-     * @param bool $rewrite
     * @return string|null
     * @throws HttpException
     * @throws \Exception
     */
-    public function routeRequest(bool $rewrite = false): ?string
+    public function routeRequest(): ?string
    {
-        $this->debug('Started routing request (rewrite: %s)', $rewrite === true ? 'yes' : 'no');
+        $this->debug('Routing request');

        $methodNotAllowed = false;

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

            /* @var $route ILoadableRoute */
@@ -289,6 +363,10 @@ class Router
                /* If the route matches */
                if ($route->matchRoute($url, $this->request) === true) {

+                    $this->fireEvents(EventHandler::EVENT_MATCH_ROUTE, [
+                        'route' => $route,
+                    ]);
+
                    /* Check if request method matches */
                    if (\count($route->getRequestMethods()) !== 0 && \in_array($this->request->getMethod(), $route->getRequestMethods(), true) === false) {
                        $this->debug('Method "%s" not allowed', $this->request->getMethod());
@@ -296,6 +374,11 @@ class Router
                        continue;
                    }

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

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

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

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

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

+                    $output = $route->renderRoute($this->request, $this);
                    if ($output !== null) {
                        return $output;
                    }
@@ -327,7 +412,7 @@ class Router

        if ($methodNotAllowed === true) {
            $message = sprintf('Route "%s" or method "%s" not allowed.', $this->request->getUrl()->getPath(), $this->request->getMethod());
-            $this->handleException(new HttpException($message, 403));
+            $this->handleException(new NotFoundHttpException($message, 403));
        }

        if (\count($this->request->getLoadedRoutes()) === 0) {
@@ -360,7 +445,7 @@ class Router
    protected function handleRouteRewrite($key, string $url): ?string
    {
        /* If the request has changed */
-        if ($this->request->hasRewrite() === false) {
+        if ($this->request->hasPendingRewrite() === false) {
            return null;
        }

@@ -372,10 +457,17 @@ class Router
        }

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

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

        return null;
@@ -391,6 +483,11 @@ class Router
    {
        $this->debug('Starting exception handling for "%s"', \get_class($e));

+        $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS, [
+            'exception'         => $e,
+            'exceptionHandlers' => $this->exceptionHandlers,
+        ]);
+
        /* @var $handler IExceptionHandler */
        foreach ($this->exceptionHandlers as $key => $handler) {

@@ -398,6 +495,12 @@ class Router
                $handler = new $handler();
            }

+            $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION, [
+                'exception'         => $e,
+                'exceptionHandler'  => $handler,
+                'exceptionHandlers' => $this->exceptionHandlers,
+            ]);
+
            $this->debug('Processing exception-handler "%s"', \get_class($handler));

            if (($handler instanceof IExceptionHandler) === false) {
@@ -405,17 +508,26 @@ class Router
            }

            try {
-
                $this->debug('Start rendering exception handler');
                $handler->handleError($this->request, $e);
                $this->debug('Finished rendering exception-handler');

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

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

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

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

-    public function arrayToParams(array $getParams = [], bool $includeEmpty = true): string
-    {
-        if (\count($getParams) !== 0) {
-
-            if ($includeEmpty === false) {
-                $getParams = array_filter($getParams, function ($item) {
-                    return (trim($item) !== '');
-                });
-            }
-
-            return '?' . http_build_query($getParams);
-        }
-
-        return '';
-    }
-
    /**
     * Find route by alias, class, callback or method.
     *
@@ -453,9 +549,12 @@ class Router
     */
    public function findRoute(string $name): ?ILoadableRoute
    {
-
        $this->debug('Finding route by name "%s"', $name);

+        $this->fireEvents(EventHandler::EVENT_FIND_ROUTE, [
+            'name' => $name,
+        ]);
+
        /* @var $route ILoadableRoute */
        foreach ($this->processedRoutes as $route) {

@@ -467,7 +566,7 @@ class Router
            }

            /* Direct match to controller */
-            if ($route instanceof IControllerRoute && strtolower($route->getController()) === strtolower($name)) {
+            if ($route instanceof IControllerRoute && strtoupper($route->getController()) === strtoupper($name)) {
                $this->debug('Found route "%s" by controller "%s"', $route->getUrl(), $name);

                return $route;
@@ -485,10 +584,11 @@ class Router
            }

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

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

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

+        $this->fireEvents(EventHandler::EVENT_GET_URL, [
+            'name'       => $name,
+            'parameters' => $parameters,
+            'getParams'  => $getParams,
+        ]);
+
        if ($getParams !== null && \is_array($getParams) === false) {
            throw new InvalidArgumentException('Invalid type for getParams. Must be array or null');
        }

        if ($name === '' && $parameters === '') {
-            return '/';
+            return new Url('/');
        }

        /* Only merge $_GET when all parameters are null */
-        if ($name === null && $parameters === null && $getParams === null) {
-            $getParams = $_GET;
-        } else {
-            $getParams = (array)$getParams;
-        }
+        $getParams = ($name === null && $parameters === null && $getParams === null) ? $_GET : (array)$getParams;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    /**
@@ -673,13 +802,68 @@ class Router
     * Set csrf verifier class
     *
     * @param BaseCsrfVerifier $csrfVerifier
-     * @return static
     */
-    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier)
+    public function setCsrfVerifier(BaseCsrfVerifier $csrfVerifier): void
    {
        $this->csrfVerifier = $csrfVerifier;
+    }

-        return $this;
+    /**
+     * Set class loader
+     *
+     * @param IClassLoader $loader
+     */
+    public function setClassLoader(IClassLoader $loader): void
+    {
+        $this->classLoader = $loader;
+    }
+
+    /**
+     * Get class loader
+     *
+     * @return ClassLoader
+     */
+    public function getClassLoader(): IClassLoader
+    {
+        return $this->classLoader;
+    }
+
+    /**
+     * Register event handler
+     *
+     * @param IEventHandler $handler
+     */
+    public function addEventHandler(IEventHandler $handler): void
+    {
+        $this->eventHandlers[] = $handler;
+    }
+
+    /**
+     * Get registered event-handler.
+     *
+     * @return array
+     */
+    public function getEventHandlers(): array
+    {
+        return $this->eventHandlers;
+    }
+
+    /**
+     * Fire event in event-handler.
+     *
+     * @param string $name
+     * @param array $arguments
+     */
+    protected function fireEvents($name, array $arguments = []): void
+    {
+        if (\count($this->eventHandlers) === 0) {
+            return;
+        }
+
+        /* @var IEventHandler $eventHandler */
+        foreach ($this->eventHandlers as $eventHandler) {
+            $eventHandler->fireEvents($this, $name, $arguments);
+        }
    }

    /**
@@ -704,15 +888,14 @@ class Router
    /**
     * Enable or disables debugging
     *
-     * @param bool $boolean
+     * @param bool $enabled
+     * @return static
     */
-    public function setDebugEnabled(bool $boolean): void
+    public function setDebugEnabled(bool $enabled): self
    {
-        if ($boolean === true) {
-            $this->debugStartTime = microtime(true);
-        }
+        $this->debugEnabled = $enabled;

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

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

 namespace Pecee\SimpleRouter;

+use DI\Container;
 use Pecee\Exceptions\InvalidArgumentException;
-use Pecee\Handlers\CallbackExceptionHandler;
+use Pecee\Http\Exceptions\MalformedUrlException;
 use Pecee\Http\Middleware\BaseCsrfVerifier;
 use Pecee\Http\Request;
 use Pecee\Http\Response;
+use Pecee\Http\Url;
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
 use Pecee\SimpleRouter\Exceptions\HttpException;
+use Pecee\SimpleRouter\Handlers\CallbackExceptionHandler;
+use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
@@ -48,20 +53,20 @@ class SimpleRouter
    /**
     * Start routing
     *
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @throws \Pecee\SimpleRouter\Exceptions\NotFoundHttpException
+     * @throws \Pecee\Http\Middleware\Exceptions\TokenMismatchException
     * @throws HttpException
     * @throws \Exception
     */
    public static function start(): void
    {
-        echo static::router()->routeRequest();
+        echo static::router()->start();
    }

    /**
     * Start the routing an return array with debugging-information
     *
     * @return array
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function startDebug(): array
    {
@@ -69,8 +74,7 @@ class SimpleRouter

        try {
            ob_start();
-            static::router()->setDebugEnabled(true);
-            static::start();
+            static::router()->setDebugEnabled(true)->start();
            $routerOutput = ob_get_contents();
            ob_end_clean();
        } catch (\Exception $e) {
@@ -94,19 +98,23 @@ class SimpleRouter
            }
        }

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

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

+    /**
+     * Add new event handler to the router
+     *
+     * @param IEventHandler $eventHandler
+     */
+    public static function addEventHandler(IEventHandler $eventHandler): void
+    {
+        static::router()->addEventHandler($eventHandler);
+    }
+
    /**
     * Boot managers allows you to alter the routes before the routing occurs.
     * Perfect if you want to load pretty-urls from a file or database.
     *
     * @param IRouterBootManager $bootManager
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function addBootManager(IRouterBootManager $bootManager): void
    {
        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.
     *
@@ -151,7 +182,6 @@ class SimpleRouter
     * @param array|null $settings
     *
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function get(string $url, $callback, array $settings = null): IRoute
    {
@@ -165,7 +195,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function post(string $url, $callback, array $settings = null): IRoute
    {
@@ -179,7 +208,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function put(string $url, $callback, array $settings = null): IRoute
    {
@@ -193,7 +221,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function patch(string $url, $callback, array $settings = null): IRoute
    {
@@ -207,7 +234,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function options(string $url, $callback, array $settings = null): IRoute
    {
@@ -221,7 +247,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function delete(string $url, $callback, array $settings = null): IRoute
    {
@@ -234,10 +259,9 @@ class SimpleRouter
     * @param array $settings
     * @param \Closure $callback
     * @return RouteGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws InvalidArgumentException
     */
-    public static function group(array $settings = [], \Closure $callback): IGroupRoute
+    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');
@@ -260,7 +284,6 @@ class SimpleRouter
     * @param \Closure $callback
     * @param array $settings
     * @return RoutePartialGroup
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     * @throws InvalidArgumentException
     */
    public static function partialGroup(string $url, \Closure $callback, array $settings = []): IPartialGroupRoute
@@ -288,7 +311,6 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function basic(string $url, $callback, array $settings = null): IRoute
    {
@@ -304,7 +326,6 @@ class SimpleRouter
     * @param array|null $settings
     * @see SimpleRouter::form
     * @return RouteUrl
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function form(string $url, $callback, array $settings = null): IRoute
    {
@@ -319,7 +340,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function match(array $requestMethods, string $url, $callback, array $settings = null)
    {
@@ -331,9 +351,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -343,7 +361,6 @@ class SimpleRouter
     * @param string|\Closure $callback
     * @param array|null $settings
     * @return RouteUrl|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function all(string $url, $callback, array $settings = null)
    {
@@ -354,9 +371,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -366,7 +381,6 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteController|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function controller(string $url, $controller, array $settings = null)
    {
@@ -377,9 +391,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -389,7 +401,6 @@ class SimpleRouter
     * @param string $controller
     * @param array|null $settings
     * @return RouteResource|IRoute
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function resource(string $url, $controller, array $settings = null)
    {
@@ -400,9 +411,7 @@ class SimpleRouter
            $route->setSettings($settings);
        }

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

    /**
@@ -410,7 +419,6 @@ class SimpleRouter
     *
     * @param \Closure $callback
     * @return CallbackExceptionHandler $callbackHandler
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
     */
    public static function error(\Closure $callback): CallbackExceptionHandler
    {
@@ -443,20 +451,28 @@ class SimpleRouter
     * @param string|null $name
     * @param string|array|null $parameters
     * @param array|null $getParams
-     * @throws \Pecee\Exceptions\InvalidArgumentException
-     * @return string
-     * @throws \Pecee\Http\Exceptions\MalformedUrlException
+     * @return Url
     */
-    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): string
+    public static function getUrl(?string $name = null, $parameters = null, ?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;
    }

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

+    /**
+     * Enable or disable dependency injection
+     *
+     * @param Container $container
+     * @return IClassLoader
+     */
+    public static function enableDependencyInjection(Container $container): IClassLoader
+    {
+        return static::router()
+            ->getClassLoader()
+            ->useDependencyInjection(true)
+            ->setContainer($container);
+    }
+
    /**
     * Get default namespace
     * @return string|null
@@ -0,0 +1,53 @@
+<?php
+
+require_once 'Dummy/DummyMiddleware.php';
+
+class DependencyInjectionTest extends \PHPUnit\Framework\TestCase
+{
+    public function testDependencyInjectionDevelopment()
+    {
+        $builder = new \DI\ContainerBuilder();
+        $container = $builder
+            ->useAutowiring(true)
+            ->ignorePhpDocErrors(true)
+            ->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+
+    public function testDependencyInjectionProduction()
+    {
+        $cacheDir = dirname(__DIR__, 2) . '/tmp';
+
+        $builder = new \DI\ContainerBuilder();
+        $builder
+            ->enableCompilation($cacheDir)
+            ->writeProxiesToFile(true, $cacheDir . '/proxies')
+            ->ignorePhpDocErrors(true)
+            ->useAutowiring(true);
+
+        $container = $builder->build();
+
+        TestRouter::enableDependencyInjection($container);
+
+        $className = null;
+
+        TestRouter::get('/', function (DummyMiddleware $url) use (&$className) {
+            $className = \get_class($url);
+        });
+
+        TestRouter::debug('/');
+
+        $this->assertEquals(DummyMiddleware::class, $className);
+    }
+}
@@ -1,6 +1,6 @@
 <?php

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

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

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

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

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

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

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

-class ExceptionHandlerThird implements \Pecee\Handlers\IExceptionHandler
+class ExceptionHandlerThird implements \Pecee\SimpleRouter\Handlers\IExceptionHandler
 {
 	public function handleError(\Pecee\Http\Request $request, \Exception $error) : void
 	{
@@ -0,0 +1,32 @@
+<?php
+
+class TestBootManager implements \Pecee\SimpleRouter\IRouterBootManager
+{
+
+    protected $routes;
+    protected $aliasUrl;
+
+    public function __construct(array $routes, string $aliasUrl)
+    {
+        $this->routes = $routes;
+        $this->aliasUrl = $aliasUrl;
+    }
+
+    /**
+     * Called when router loads it's routes
+     *
+     * @param \Pecee\SimpleRouter\Router $router
+     * @param \Pecee\Http\Request $request
+     */
+    public function boot(\Pecee\SimpleRouter\Router $router, \Pecee\Http\Request $request): void
+    {
+        foreach ($this->routes as $url) {
+            // If the current url matches the rewrite url, we use our custom route
+
+            if ($request->getUrl()->contains($url) === true) {
+                $request->setRewriteUrl($this->aliasUrl);
+            }
+
+        }
+    }
+}
@@ -0,0 +1,41 @@
+<?php
+
+class SilentTokenProvider implements \Pecee\Http\Security\ITokenProvider {
+
+    protected $token;
+
+    public function __construct()
+    {
+        $this->refresh();
+    }
+
+    /**
+     * Refresh existing token
+     */
+    public function refresh(): void
+    {
+        $this->token = uniqid('', false);
+    }
+
+    /**
+     * Validate valid CSRF token
+     *
+     * @param string $token
+     * @return bool
+     */
+    public function validate(string $token): bool
+    {
+        return ($token === $this->token);
+    }
+
+    /**
+     * Get token token
+     *
+     * @param string|null $defaultValue
+     * @return string|null
+     */
+    public function getToken(?string $defaultValue = null): ?string
+    {
+        return $this->token ?? $defaultValue;
+    }
+}
@@ -0,0 +1,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);
+
+    }
+
+}
@@ -5,14 +5,13 @@ require_once 'Dummy/DummyController.php';

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

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

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

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

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

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

 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);

    }

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

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

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

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

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

    }

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

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

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

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

    }

@@ -134,11 +150,12 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
        $this->assertTrue(true);
    }

-    public function testParameterDefaultValue() {
+    public function testParameterDefaultValue()
+    {

        $defaultVariable = null;

-        TestRouter::get('/my/{path?}', function($path = 'working') use(&$defaultVariable) {
+        TestRouter::get('/my/{path?}', function ($path = 'working') use (&$defaultVariable) {
            $defaultVariable = $path;
        });

@@ -158,7 +175,7 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase

    public function testDefaultParameterRegexGroup()
    {
-        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function() {
+        TestRouter::group(['defaultParameterRegex' => '[\w\-]+'], function () {
            TestRouter::get('/my/{path}', 'DummyController@param');
        });

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

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

        static::start();
    }
Author	SHA1	Message	Date
Simon Sessingø	b715c48415	Merge pull request #434 from skipperbent/v4-development Version 4.2.0.6	2018-11-25 00:47:02 +01:00
Simon Sessingø	d601e8eca3	Bugfixes and optimisations. - Fix for __invoke methods (issue: #429) - Fixed not being able to parse body of PUT request. - BaseCsrfVerifier expects the field name to be "csrf-token" (issue: #432) - Minor optimisations	2018-11-25 00:44:20 +01:00
Simon Sessingø	4a8b71a0b5	Merge pull request #430 from Tahrz/master fix for __invoke methods (if there are only in class (Action))	2018-11-25 00:27:54 +01:00
Simon Sessingø	bd01a8a802	Merge pull request #431 from matheusheiden/master Set HTTP method before initializing InputHandler	2018-11-25 00:27:30 +01:00
Matheus	55bcd4e030	Merge pull request #1 from matheusheiden/matheusheiden-patch-1 Set HTTP method before initializing InputHandler	2018-11-10 22:17:08 -02:00
Matheus	d4a6d504b1	Set HTTP method before initializing InputHandler This is needed because without it the InputHandler doesn't know which http method is being used, and because of that it can't parse the body of a PUT request	2018-11-10 22:16:45 -02:00
Taras Victorovich	9e3b1b6baa	fix for __invoke methods (if there are only in class (Action))	2018-10-02 15:40:26 +03:00
Simon Sessingø	1395527cc6	Merge pull request #428 from skipperbent/v4-release V4 release	2018-08-31 01:41:48 +02:00
Simon Sessingø	ac594ebde2	Merge pull request #427 from skipperbent/v4-development Version 4.2.0.5	2018-08-31 01:41:36 +02:00
Simon Sessingø	064154f27f	Merge pull request #426 from skipperbent/v4-optimisations Optimizations	2018-08-31 01:41:05 +02:00
Simon Sessingø	0ac7fd559a	Optimizations - Settings parameter in group method are no longer optional. - Updated README to contain PHP JSON-extension under requirements. - Updated composer.json to include php json extension.	2018-08-31 01:40:21 +02:00
Simon Sessingø	da8dfdb135	Merge pull request #424 from skipperbent/v4-release V4 release	2018-08-24 17:24:48 +02:00
Simon Sessingø	57c9da2c42	Merge pull request #423 from skipperbent/v4-development Version 4.2.0.4	2018-08-24 17:24:25 +02:00
Simon Sessingø	6bdfe06223	Merge pull request #422 from skipperbent/v4-optional-character-fix Fix for issue #421: Incorrectly optional character in route	2018-08-24 17:23:43 +02:00
Simon Sessingø	5c2a973214	Merge branch 'v4-development' into v4-optional-character-fix	2018-08-24 17:23:33 +02:00
Simon Sessingø	a7cbacbde7	Fix for issue #421 : Incorrectly optional character in route	2018-08-24 17:16:02 +02:00
Simon Sessingø	f0c851e49d	Merge pull request #417 from skipperbent/v4-release V4 release	2018-04-22 05:37:41 +02:00
Simon Sessingø	45a5176b3c	Merge pull request #416 from skipperbent/v4-development Version 4.2.0.3	2018-04-22 05:37:29 +02:00
Simon Sessingø	2d042391aa	Merge pull request #415 from skipperbent/v4-fix-input-all-empty Fixed returning empty array when positing json (issue #413)	2018-04-22 05:36:10 +02:00
Simon Sessingo	4d842d0583	Fixed returning empty array when positing json (issue #413 )	2018-04-22 05:35:15 +02:00
Simon Sessingø	7c54d319e6	Merge pull request #411 from skipperbent/v4-release V4 release	2018-04-06 19:46:01 +02:00
Simon Sessingø	9ccff91287	Merge pull request #410 from skipperbent/v4-development Version 4.2.0.2	2018-04-06 19:45:51 +02:00
Simon Sessingø	8653bfa86f	Development - Fixed 403 not allowed exception is now thrown as NotFoundHttpException. - Added REQUEST_TYPE_HEAD to Route class. - Minor optimizations.	2018-04-06 19:44:30 +02:00
Simon Sessingø	e51290dfd8	Merge pull request #409 from skipperbent/v4-release V4 release	2018-04-06 18:04:28 +02:00
Simon Sessingø	13501b3f88	Merge pull request #408 from skipperbent/v4-development Version 4.2.0.1	2018-04-06 18:04:01 +02:00
Simon Sessingø	b8cfc4eb0b	Fixed default parameter for all method allowed to by empty.	2018-04-06 18:01:49 +02:00
Simon Sessingø	5db4621831	Added methods for adding get, post and file parameters manually.	2018-04-06 18:00:59 +02:00
Simon Sessingø	d4bbb6641d	Merge pull request #407 from skipperbent/v4-release V4 release	2018-04-06 17:28:12 +02:00
Simon Sessingø	af641e3805	Merge pull request #406 from skipperbent/v4-development Version 4.2.0.0	2018-04-06 17:27:42 +02:00
Simon Sessingø	d38f81836d	Development - Added new Redirect method to SimpleRouter class. - Changed method-names in InputHandler for better description. - Fixed return-types for InputHandler for collections. - Added unit-tests for InputHandler (get, post). - Optimisations.	2018-04-06 17:20:00 +02:00
Simon Sessingø	ca1e2ef94b	Merge pull request #404 from skipperbent/v4-release V4 release	2018-04-05 12:19:27 +02:00
Simon Sessingø	89be00a72a	Merge pull request #402 from skipperbent/v4-development Version 4.1.0.0	2018-04-02 14:56:12 +02:00
Simon Sessingø	30a2ddeed9	Development - Added new event when adding route. - Added `prependUrl` method to `LoadableRoute` class. - Added unit-test for add-route event. - Updated documentation to reflect new changes.	2018-04-02 14:53:36 +02:00
Simon Sessingø	313833d78a	Merge pull request #400 from skipperbent/v4-development Fixed `exists` method in `InputHandler` returning incorrect value.	2018-04-01 04:28:06 +02:00
Simon Sessingø	17a7b28e82	Fixed `exists` method in `InputHandler` returning incorrect value.	2018-04-01 04:26:48 +02:00
Simon Sessingø	e77d78e2f2	Merge pull request #399 from skipperbent/v4-development Bugfixes and optimizations	2018-04-01 03:02:49 +02:00
Simon Sessingø	1dc88d23e1	Bugfixes and optimizations - Fixed `hasParam` not working returning expected value in `Url` class. - Chained the remaining methods in the `Url` class. - Simplified `removeParam` method in `Url` class. - Added new `removeParams` method to `Url` class for removal of multiple params.	2018-04-01 03:02:21 +02:00
Simon Sessingø	bd033d9e13	Merge pull request #398 from skipperbent/v4-development Version 4.0.0.11	2018-03-30 06:48:15 +02:00
Simon Sessingø	53f0b7d8e2	- Fixed `getName` method in `LoadableRoute` class can contain nullable value.	2018-03-30 06:47:27 +02:00
Simon Sessingø	5df0c12864	Updated helpers	2018-03-30 05:54:12 +02:00
Simon Sessingø	5bae3ff773	Merge pull request #397 from skipperbent/v4-development Version 4.0.0.10	2018-03-30 05:38:27 +02:00
Simon Sessingø	833961ddc3	Fixed `getError` in `InputFile` returning string instead of int.	2018-03-30 05:37:04 +02:00
Simon Sessingø	36388f0f79	Merge pull request #396 from skipperbent/v4-development Version 4.0.0.9	2018-03-30 05:23:54 +02:00
Simon Sessingø	ce63e247b1	Bugfixes - Fixed `Url` not outputting correct class when used in json_encode. - Fixed `IInputItem` being too strict about strings which may be nullable.	2018-03-30 05:22:41 +02:00
Simon Sessingø	d2d3938bf4	Merge pull request #395 from skipperbent/v4-development Bugfixes	2018-03-29 23:48:32 +02:00
Simon Sessingø	80a42030ea	Bugfixes - Fixed getting specific input-value by request-method in InputHandler. - Added .idea files	2018-03-29 23:47:27 +02:00
Simon Sessingø	1d6a2fafff	Merge pull request #394 from skipperbent/v4-development Removed namespace from groups	2018-03-29 23:28:47 +02:00
Simon Sessingø	17471a53cd	Removed namespace from groups	2018-03-29 23:28:03 +02:00
Simon Sessingø	e97e624cef	Merge pull request #393 from skipperbent/v4-development Bugfixes	2018-03-29 23:14:22 +02:00
Simon Sessingø	da219d0b19	Bugfixes - Fixed rewrite from ExceptionHandler sometimes not working correctly. - Fixed default-namespace for Group and partial groups.	2018-03-29 23:13:56 +02:00
Simon Sessingø	30d2285699	Merge pull request #392 from skipperbent/v4-development Bugfixes	2018-03-29 22:36:01 +02:00
Simon Sessingø	a1dc4c5119	Bugfixes - Updated `input` helper function. - Update documentation to reflect v4 changes in `InputHandler` class.	2018-03-29 22:35:21 +02:00
Simon Sessingø	87e1fa3775	Merge pull request #391 from skipperbent/v4-development Bugfixes	2018-03-29 22:18:26 +02:00
Simon Sessingø	a11595fb86	Bugfixes - Fixed `$methods` argument not properly passed in `InputHandler` class. - Updated helpers.php with latest changes.	2018-03-29 22:17:53 +02:00
Simon Sessingø	555afd04f1	Merge pull request #390 from skipperbent/v4-development Fixed defaultValue issue in `getValue` method in `InputHandler` class.	2018-03-29 21:45:26 +02:00
Simon Sessingø	e6db83c97a	Fixed defaultValue issue in `getValue` method in `InputHandler` class.	2018-03-29 21:44:41 +02:00
Simon Sessingø	32e5dd623c	Merge pull request #389 from skipperbent/v4-development Version 4.0.0.1	2018-03-29 21:26:37 +02:00
Simon Sessingø	8eded4a619	Updated documentation.	2018-03-29 21:19:52 +02:00
Simon Sessingø	af2ac6031d	Development - Added dependency injection support. - Added php-di composer dependency. - Added `ClassLoader` class. - Added `IClassLoader` interface. - Added unit-tests for dependency injection. - Updated documentation to reflect new features.	2018-03-29 21:16:02 +02:00
Simon Sessingø	cca2f5cb88	Added donate option	2018-03-29 19:13:55 +02:00
Simon Sessingø	1a59a659fe	Updated documentation	2018-03-29 19:02:31 +02:00
Simon Sessingø	4c61899560	Updated documentation	2018-03-29 19:00:18 +02:00
Simon Sessingø	931b50098c	Updated documentation	2018-03-29 18:54:03 +02:00
Simon Sessingø	f5a023117a	Development - Added event-arguments data. - Added event-arguments to the event list in documentation. - Fixed missing exceptions thrown in phpDocs. - Added unit-tests for new event functionality.	2018-03-29 18:51:28 +02:00
Simon Sessingø	a9c03f9271	Development - Updated `helpers.php` and helpers example in documentation. - MalformedUrlException is now handled properly by Router to avoid phpStorm syntax highlights in routes. - Added `getUrlCopy` to `Request` class, used to clone the current route (to keep domain etc.) - `setUrl` in `Request` are now strict and requires `Url` object and no longer accepts strings. - Renamed `hasRewrite` property to `hasPendingRewrite` in `Request` class. - Renamed `hasRewrite` and `setHasRewrite` methods to `hasPendingRewrite` and `setHasPendingRewrite` in `Request` class. - Added better usage of `Url` class. When calling `url` you can now use the methods on the `Url` class to filter params, get relative/absolute url etc. See documentation for more info. - Renamed `get` method to `getValue` in `InputHandler` class. - Renamed `getObject` to `get` and removed `$defaultValue` argument in `InputHandler` class. - Optimized `InputHandler` class. - Fixed issue with `$token` not being proper string in `BaseCsrfVerifier` when token is not found. - Added php.ini configuration settings to `setcookie` in `CookieTokenProvider` for improved security. - Added `$router` parameter to `boot` method in `IRouterBootManager` which allows for further manipulation of the router within the bootmanager. - Renamed `$processingRoute` property to `$isProcessingRoute` in `Router` class. - Fixed `reset` method not resetting CSRF-verifier in `Router` class. - Moved `arrayToParams` helper-method from `Router` to `Url` class. - Began to add Event-functionality to router. - Added `addEventHandler` method to `SimpleRouter` class. - Moved `Pecee\SimpleRouter\Handler\CallbackExceptionHandler` to `Pecee\SimpleRouter\Handlers\CallbackExceptionHandler`. - Moved `Pecee\SimpleRouter\Handler\IExceptionHandler` to `Pecee\SimpleRouter\Handlers\IExceptionHandler`. - Added Events section to documentation. - Added more information on url-handling in documentation. - Optimisations.	2018-03-29 18:17:42 +02:00
Simon Sessingø	aa56d45f9c	Updated documentation	2018-03-29 10:13:23 +02:00
Simon Sessingø	0fc40f2a82	Merge pull request #384 from skipperbent/v3 V3	2018-03-03 23:44:32 +01:00
Simon Sessingø	c5c63671ef	Merge pull request #383 from skipperbent/v3-development Development	2018-03-03 23:44:20 +01:00
Simon Sessingø	781fab48cc	Merge pull request #382 from skipperbent/v3 V3	2018-02-27 09:05:08 +01:00
Simon Sessingø	6e247f811f	Merge pull request #381 from skipperbent/v3-development Throw correct exception-types.	2018-02-27 09:04:57 +01:00
Simon Sessingø	486d7c3a5b	Merge pull request #380 from skipperbent/v3 Merge pull request #378 from skipperbent/v3-development	2018-02-27 08:37:14 +01:00
Simon Sessingø	559a65859e	Merge pull request #379 from skipperbent/v3-development Fixed issue with PDO exception not returning correct type for error-c…	2018-02-27 08:36:57 +01:00
Simon Sessingø	8111de48fd	Merge pull request #378 from skipperbent/v3-development Fixed issue with PDO exception not returning correct type for error-code.	2018-02-27 08:36:43 +01:00
Simon Sessingø	8b46d97418	Merge pull request #377 from skipperbent/v3 V3	2018-02-27 00:20:25 +01:00
Simon Sessingø	0dbc4e6ba2	Merge pull request #376 from skipperbent/v3-development Optimisations	2018-02-27 00:20:12 +01:00
Simon Sessingø	38910ea9b6	Merge pull request #375 from skipperbent/v3 V3	2018-02-27 00:14:39 +01:00
Simon Sessingø	a4dfa59a66	Merge pull request #374 from skipperbent/v3-development Stop router from processing routes if no valid route is found.	2018-02-27 00:14:24 +01:00
Simon Sessingø	d40eaba3e7	Merge pull request #373 from skipperbent/v3 V3	2018-02-26 23:49:41 +01:00
Simon Sessingø	2c9d996437	Merge pull request #372 from skipperbent/v3-development Fixed setUrl issue.	2018-02-26 23:48:45 +01:00
Simon Sessingø	8b6a6864a7	Merge pull request #371 from skipperbent/v3 V3	2018-02-26 23:24:50 +01:00
Simon Sessingø	98ce5f7635	Merge pull request #370 from skipperbent/v3-development Development	2018-02-26 23:24:37 +01:00
Simon Sessingø	6b22632141	Merge pull request #369 from skipperbent/v3 V3	2018-02-24 05:39:30 +01:00
Simon Sessingø	69bb570c73	Merge pull request #368 from skipperbent/v3-development Version 3.5.0.0	2018-02-24 05:39:20 +01:00
Simon Sessingø	ed320e2f87	Merge pull request #366 from skipperbent/v3 V3	2018-02-19 23:07:13 +01:00
Simon Sessingø	c80b23e9d4	Merge pull request #365 from skipperbent/v3-development Version 3.4.11.2	2018-02-19 23:07:02 +01:00
Simon Sessingø	76589e9d92	Merge pull request #364 from skipperbent/v3 Merge pull request #363 from skipperbent/master	2018-02-19 16:37:35 +01:00
Simon Sessingø	9d88bf10d2	Merge pull request #363 from skipperbent/master Sync	2018-02-19 16:37:04 +01:00
Simon Sessingø	dfa4a9aa6c	Merge pull request #362 from skipperbent/v3-development Version 3.4.11.1	2018-02-19 16:36:27 +01:00
Simon Sessingø	7c789ea0f8	Merge pull request #361 from skipperbent/v3 V3	2018-02-14 12:39:31 +01:00
Simon Sessingø	3ba9dd01f0	Merge pull request #360 from skipperbent/v3-development Version 3.4.11.0	2018-02-14 12:39:19 +01:00
Simon Sessingø	14360b6779	Merge pull request #353 from skipperbent/v3 V3	2018-01-14 15:54:49 +01:00
Simon Sessingø	bbb81333b4	Merge pull request #352 from skipperbent/v3-development Fixed Input::all when php://input is not available	2018-01-14 15:54:37 +01:00
Simon Sessingø	161fbf6ccf	Merge pull request #351 from skipperbent/v3 V3	2018-01-06 03:33:23 +01:00
Simon Sessingø	9a7b598880	Merge pull request #350 from skipperbent/v3-development Version 3.4.10.0	2018-01-06 03:33:13 +01:00
Simon Sessingø	1486095e9f	Merge pull request #345 from skipperbent/v3 V3 sync	2017-12-17 10:41:58 +01:00
Simon Sessingø	2db20dce6b	Merge pull request #344 from skipperbent/v3-development Version 3.4.9.3	2017-12-17 10:41:22 +01:00
Simon Sessingø	7cb416cfc8	Merge pull request #342 from skipperbent/v3 V3	2017-12-17 09:53:49 +01:00
Simon Sessingø	c6341960d7	Merge pull request #341 from skipperbent/v3-development Version 3.4.9.2	2017-12-17 09:53:39 +01:00
Simon Sessingø	a570322e25	Merge pull request #340 from skipperbent/v3 V3	2017-12-16 12:54:06 +01:00
Simon Sessingø	85cf925793	Merge pull request #339 from skipperbent/v3-development Version 3.4.9.1	2017-12-16 12:53:56 +01:00
Simon Sessingø	feb6c8bd41	Merge pull request #337 from skipperbent/v3 V3	2017-12-09 23:58:48 +01:00
Simon Sessingø	7c0a20115e	Merge pull request #336 from skipperbent/v3-development Version 3.4.9.0	2017-12-09 23:58:33 +01:00
Simon Sessingø	276f213ccc	Merge pull request #335 from skipperbent/v3 V3	2017-12-06 19:06:20 +01:00
Simon Sessingø	877e0aa937	Merge pull request #334 from skipperbent/v3-development Version 3.4.8.0	2017-12-06 19:06:09 +01:00
Simon Sessingø	56457448e4	Merge pull request #331 from skipperbent/v3 V3	2017-12-02 20:30:37 +01:00
Simon Sessingø	3e7767d978	Merge pull request #330 from skipperbent/v3-development V3 development	2017-12-02 20:30:27 +01:00
Simon Sessingø	8ce1540771	Merge pull request #328 from skipperbent/v3 V3	2017-11-27 02:05:40 +01:00
Simon Sessingø	5ef9349b18	Merge pull request #327 from skipperbent/v3-development Version 3.4.6.4	2017-11-27 02:05:17 +01:00
Simon Sessingø	3b305ceb00	Merge pull request #326 from skipperbent/v3 V3	2017-11-27 00:01:45 +01:00
Simon Sessingø	264f0a7b0f	Merge pull request #325 from skipperbent/v3-development Version 3.4.6.3	2017-11-27 00:01:30 +01:00
Simon Sessingø	1f00cf50e6	Merge pull request #324 from skipperbent/v3 V3	2017-11-26 23:44:17 +01:00
Simon Sessingø	5197ae2990	Merge pull request #323 from skipperbent/v3-development Version 3.4.6.2	2017-11-26 23:44:06 +01:00
Simon Sessingø	32bc46be81	Merge pull request #322 from skipperbent/v3 V3	2017-11-26 18:46:25 +01:00
Simon Sessingø	9c701aabee	Merge pull request #321 from skipperbent/v3-development Fixed url parsing issues	2017-11-26 18:45:54 +01:00
Simon Sessingø	2b0821a557	Merge pull request #320 from skipperbent/v3-development Fixed typo	2017-11-26 18:29:36 +01:00
Simon Sessingø	1ee71b9ec3	Merge pull request #319 from skipperbent/v3 V3	2017-11-26 18:08:36 +01:00
Simon Sessingø	afc81d7005	Merge pull request #318 from skipperbent/v3-development Version 3.4.6.0	2017-11-26 18:08:24 +01:00
Simon Sessingø	0b8931a2e1	Merge pull request #316 from skipperbent/v3 V3	2017-11-25 01:35:03 +01:00
Simon Sessingø	496d3e7182	Merge pull request #315 from skipperbent/v3-development Version 3.4.5.5	2017-11-25 01:34:53 +01:00
Simon Sessingø	2472079642	Merge pull request #312 from skipperbent/v3 V3	2017-11-10 13:03:02 +01:00
Simon Sessingø	1fd13ed2aa	Merge pull request #311 from skipperbent/v3-development V3 development	2017-11-10 13:02:49 +01:00
Simon Sessingø	4409fbcf4e	Merge pull request #309 from skipperbent/v3 V3	2017-11-10 08:25:22 +01:00
Simon Sessingø	9d5c4a2ed1	Merge pull request #308 from skipperbent/v3-development 3.4.5.4	2017-11-10 08:24:55 +01:00
Simon Sessingø	b8634bcf79	Merge pull request #307 from skipperbent/revert-306-revert-305-v3-development Revert "Revert "V3 development""	2017-11-08 04:11:50 +01:00
Simon Sessingø	6ad22a3816	Revert "Revert "V3 development""	2017-11-08 04:11:40 +01:00
Simon Sessingø	ed41cd55af	Merge pull request #306 from skipperbent/revert-305-v3-development Revert "V3 development"	2017-11-08 04:09:55 +01:00
Simon Sessingø	ebeca952cf	Revert "V3 development"	2017-11-08 04:09:41 +01:00
Simon Sessingø	0672e85fd7	Merge pull request #305 from skipperbent/v3-development V3 development	2017-11-08 04:09:31 +01:00