Merge pull request #402 from skipperbent/v4-development

Version 4.1.0.0
Development
2026-06-29 14:39:17 +00:00 · 2018-04-02 14:56:12 +02:00 · 2018-04-02 14:53:36 +02:00 · 2018-04-01 04:28:06 +02:00 · 2018-04-01 04:26:48 +02:00 · 2018-04-01 03:02:49 +02:00
13 changed files with 409 additions and 261 deletions
@@ -3,10 +3,12 @@
  <component name="ChangeListManager">
    <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Url.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Url.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -20,81 +22,110 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="230">
+                <caret line="1298" column="39" selection-start-line="1298" selection-start-column="39" selection-end-line="1298" selection-end-column="39" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="LoadableRoute.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="92" column="7" lean-forward="true" selection-start-line="92" selection-start-column="7" selection-end-line="92" selection-end-column="7" />
+              <folding>
+                <element signature="e#44#82#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteController.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="213">
+              <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteResource.php" 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="213">
+              <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouteUrl.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ILoadableRoute.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="362">
+              <caret line="42" column="18" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
+              <folding>
+                <element signature="e#44#67#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Route.php" 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="211">
+              <caret line="239" column="10" selection-start-line="239" selection-start-column="10" selection-end-line="239" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
      <file leaf-file-name="Router.php" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9860">
-              <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
+            <state relative-caret-position="245">
+              <caret line="156" selection-start-line="156" selection-end-line="156" />
              <folding>
                <element signature="e#38#84#0#PHP" expanded="true" />
-                <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/helpers.php">
+      <file leaf-file-name="EventHandler.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1420">
-              <caret line="74" selection-end-line="87" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5160">
-              <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
+            <state relative-caret-position="-742">
+              <caret line="28" selection-start-line="28" selection-end-line="28" />
              <folding>
-                <element signature="e#302#319#0#PHP" expanded="true" />
+                <element signature="e#47#90#0#PHP" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
+      <file leaf-file-name="EventHandlerTest.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="484">
-              <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputItem.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="20">
-              <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Url.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Url.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
-              <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputFile.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IInputItem.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
+            <state relative-caret-position="278">
+              <caret line="88" column="13" lean-forward="true" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
+              <folding>
+                <element signature="e#249#292#0#PHP" expanded="true" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -103,26 +134,8 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>function renderRoute</find>
-      <find>-&gt;renderRoute</find>
-      <find>fireEvent</find>
-      <find>renderRoute</find>
-      <find>findRoute</find>
-      <find>-&gt;fireEvents</find>
-      <find>RENDER_MIDD</find>
-      <find>EVENT_RENDER_CSRF</find>
-      <find>RENDER_ROUTE</find>
-      <find>requirements</find>
-      <find># Advan</find>
-      <find># Feed</find>
-      <find>: void</find>
-      <find>call_user_func_array</find>
-      <find>loadClass</find>
-      <find>$this-&gt;</find>
-      <find>$this-&gt;result</find>
      <find>$this-&gt;r</find>
      <find>getInput</find>
-      <find>helpers.php</find>
      <find>input()-&gt;get</find>
      <find>getObject</find>
      <find>helpers</find>
@@ -133,19 +146,37 @@
      <find>function parti</find>
      <find>__toString</find>
      <find>getValue</find>
+      <find>getError</find>
+      <find>(int)</find>
+      <find>setSize</find>
+      <find>helpers.php</find>
+      <find>getName</find>
+      <find>url(</find>
+      <find>url()</find>
+      <find>: void</find>
+      <find>void</find>
+      <find>set</find>
+      <find>hasParam</find>
+      <find>csrf_token</find>
+      <find>static function start</find>
+      <find>fireEvents(</find>
+      <find>EVENT_LOAD</find>
+      <find>-&gt;setUrl</find>
+      <find>setUrl</find>
+      <find>addRoute</find>
    </findStrings>
    <dirStrings>
      <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
      <dir>D:\Workspace\simple-php-router\src</dir>
      <dir>D:\Workspace\simple-php-router\tests\Pecee\SimpleRouter\Dummy</dir>
      <dir>D:\Workspace\simple-php-router</dir>
-      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
      <dir>E:\Workspace\simple-php-router\tests</dir>
      <dir>E:\Workspace\simple-php-router\src\Pecee</dir>
      <dir>E:\Workspace\simple-php-router</dir>
      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter</dir>
      <dir>E:\Workspace\simple-php-router\tests\Pecee\SimpleRouter</dir>
      <dir>E:\Workspace\simple-php-router\src</dir>
+      <dir>E:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
    </dirStrings>
  </component>
  <component name="Git.Settings">
@@ -167,18 +198,14 @@
        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/ITokenProvider.php" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Response.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RoutePartialGroup.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" />
        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
-        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassHandler.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/ClassLoader.php" />
@@ -188,23 +215,27 @@
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ContainerInterface.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IContainer.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php" />
        <option value="$PROJECT_DIR$/composer.json" />
        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/GroupTest.php" />
        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/DependencyInjectionTest.php" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/helpers.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
        <option value="$PROJECT_DIR$/.gitignore" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
+        <option value="$PROJECT_DIR$/helpers.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Url.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.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/RouteUrl.php" />
      </list>
    </option>
  </component>
@@ -265,8 +296,7 @@
    </include_path>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="106" />
-    <option name="y" value="51" />
+    <option name="x" value="-10" />
    <option name="width" value="2295" />
    <option name="height" value="1235" />
  </component>
@@ -278,6 +308,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -334,6 +365,14 @@
              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
              <item name="Handlers" type="2a2b976b:PhpTreeStructureProvider$1" />
            </path>
+            <path>
+              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
+              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="Route" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
            <path>
              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -356,12 +395,11 @@
          <select />
        </subPane>
      </pane>
-      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dscuz-v1" />
+    <property name="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" />
@@ -369,7 +407,7 @@
    <property name="node.js.selected.package.eslint" value="" />
    <property name="node.js.selected.package.standard" value="" />
    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
@@ -399,7 +437,10 @@
      </list>
    </option>
  </component>
-  <component name="RunManager" selected="PHPUnit.phpunit.xml">
+  <component name="RunManager" selected="PHPUnit.EventHandlerTest">
+    <configuration name="EventHandlerTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
+      <TestRunner class="EventHandlerTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php" scope="Class" />
+    </configuration>
    <configuration name="RouterUrlTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
      <TestRunner class="RouterUrlTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" scope="Class" />
    </configuration>
@@ -415,9 +456,11 @@
      <item itemvalue="PHPUnit.RouterUrlTest" />
      <item itemvalue="PHPUnit.phpunit.xml" />
      <item itemvalue="PHP Script.debug.php" />
+      <item itemvalue="PHPUnit.EventHandlerTest" />
    </list>
    <recent_temporary>
      <list>
+        <item itemvalue="PHPUnit.EventHandlerTest" />
        <item itemvalue="PHPUnit.phpunit.xml" />
        <item itemvalue="PHPUnit.tests" />
        <item itemvalue="PHP Script.debug.php" />
@@ -491,44 +534,49 @@
      <workItem from="1522310475899" duration="12840000" />
      <workItem from="1522325810130" duration="30260000" />
      <workItem from="1522360506281" duration="168000" />
-      <workItem from="1522378435862" duration="1346000" />
+      <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="2371000" />
    </task>
    <servers />
  </component>
  <component name="TestHistory">
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 47m 20s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 00s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 48m 57s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 14s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 49m 08s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 37s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 04s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 40m 42s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 18s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 43m 05s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 20h 50m 23s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 13h 43m 07s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 21h 12m 55s.xml">
+    <history-entry file="phpunit_xml - 2018.04.02 at 14h 48m 41s.xml">
      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 02s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 50m 26s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 18s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 50m 34s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.03.29 at 23h 09m 37s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="EventHandlerTest - 2018.04.02 at 14h 51m 17s.xml">
+      <configuration name="EventHandlerTest" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="136391000" />
+    <option name="totallyTimeSpent" value="146739000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -543,27 +591,29 @@
    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
    <editor active="true" />
    <layout>
-      <window_info anchor="bottom" id="TODO" order="10" weight="0.32983023" />
-      <window_info anchor="bottom" id="Event Log" order="6" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
-      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.327405" />
-      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32902184" />
-      <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49680257" weight="0.28282827" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1923077" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="11" weight="0.32983023" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49080735" visible="true" weight="0.3272727" />
+      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32902184" />
+      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" weight="0.28282827" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2027972" />
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
      <window_info anchor="right" id="Database" order="3" />
-      <window_info active="true" anchor="bottom" id="Find" order="1" sideWeight="0.48880896" visible="true" weight="0.3272727" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="PHP-CGI Server" order="8" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection Results" order="12" weight="0.32902184" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
+      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
+      <window_info anchor="bottom" id="REST Client" order="5" weight="0.32929292" />
+      <window_info anchor="bottom" id="Command Line Tools Console" order="9" weight="0.32928804" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -578,14 +628,27 @@
    </breakpoint-manager>
  </component>
  <component name="editorHistoryManager">
+    <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$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="7400">
+            <caret line="370" column="1" selection-start-line="370" selection-start-column="1" selection-end-line="370" selection-end-column="1" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="9860">
          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
-          <folding>
-            <element signature="e#38#84#0#PHP" expanded="true" />
-            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
-          </folding>
        </state>
      </provider>
    </entry>
@@ -625,13 +688,6 @@
        <state relative-caret-position="-288" />
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/ILoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="555">
-          <caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="48">
@@ -660,13 +716,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/EventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Event/EventArgument.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="54">
@@ -674,13 +723,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/EventHandlerTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="16" column="36" lean-forward="true" selection-end-line="80" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/CallbackExceptionHandler.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="48">
@@ -733,13 +775,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="47" column="25" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/IClassLoader.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="144">
@@ -755,13 +790,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/composer.json">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="370">
@@ -818,51 +846,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="522">
-            <caret line="286" column="4" selection-start-line="286" selection-start-column="4" selection-end-line="286" selection-end-column="4" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9860">
-          <caret line="509" column="45" selection-start-line="509" selection-start-column="45" selection-end-line="509" selection-end-column="45" />
-          <folding>
-            <element signature="e#38#84#0#PHP" expanded="true" />
-            <marker date="1522357776600" expanded="true" signature="1690:1698" ph=" List of loaded exception that has been loaded. ..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/helpers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <caret line="74" selection-end-line="87" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5160">
-          <caret line="283" column="39" selection-start-line="283" selection-start-column="39" selection-end-line="283" selection-end-column="39" />
-          <folding>
-            <element signature="e#302#319#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="224" column="80" selection-start-line="224" selection-start-column="80" selection-end-line="224" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="380">
@@ -870,24 +853,136 @@
        </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="197">
-          <caret line="258" column="40" selection-start-line="258" selection-start-column="40" selection-end-line="258" selection-end-column="40" />
+        <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/Http/Url.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="455" column="20" selection-end-line="460" selection-end-column="1" />
+        <state relative-caret-position="6160">
+          <caret line="308" column="7" selection-start-line="308" selection-start-column="7" selection-end-line="308" selection-end-column="7" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php">
+    <entry file="file://$PROJECT_DIR$/helpers.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
+        <state relative-caret-position="1520">
+          <caret line="79" column="30" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
+        </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="191">
+          <caret line="255" column="7" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
+        </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="165">
+          <caret line="60" column="4" lean-forward="true" selection-start-line="60" selection-start-column="4" selection-end-line="63" selection-end-column="5" />
+          <folding>
+            <element signature="e#302#319#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;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="230">
+            <caret line="1298" column="39" selection-start-line="1298" selection-start-column="39" selection-end-line="1298" selection-end-column="39" />
+          </first_editor>
+          <second_editor />
+        </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="362">
+          <caret line="42" column="18" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
+          <folding>
+            <element signature="e#44#67#0#PHP" expanded="true" />
+          </folding>
+        </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="213">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </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="213">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+        </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="146">
+          <caret line="92" column="7" lean-forward="true" selection-start-line="92" selection-start-column="7" selection-end-line="92" selection-end-column="7" />
+          <folding>
+            <element signature="e#44#82#0#PHP" expanded="true" />
+          </folding>
+        </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="211">
+          <caret line="239" column="10" selection-start-line="239" selection-start-column="10" selection-end-line="239" selection-end-column="10" />
+        </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="245">
+          <caret line="156" selection-start-line="156" selection-end-line="156" />
+          <folding>
+            <element signature="e#38#84#0#PHP" expanded="true" />
+          </folding>
+        </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="-742">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+          <folding>
+            <element signature="e#47#90#0#PHP" expanded="true" />
+          </folding>
+        </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="278">
+          <caret line="88" column="13" lean-forward="true" selection-start-line="88" selection-start-column="13" selection-end-line="88" selection-end-column="13" />
+          <folding>
+            <element signature="e#249#292#0#PHP" expanded="true" />
+          </folding>
+        </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="300">
+          <caret line="21" column="50" lean-forward="true" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
        </state>
      </provider>
    </entry>
@@ -332,7 +332,7 @@ function request(): Request
 * @param string|null $index Parameter index name
 * @param string|null $defaultValue Default return value
 * @param array ...$methods Default methods
- * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
+ * @return \Pecee\Http\Input\InputHandler|string
 */
 function input($index = null, $defaultValue = null, ...$methods)
 {
@@ -1296,6 +1296,7 @@ All event callbacks will retrieve a `EventArgument` object as parameter. This ob
 | `EVENT_ALL`                 | - | Fires when a event is triggered. |
 | `EVENT_INIT`                | - | Fires when router is initializing and before routes are loaded. |
 | `EVENT_LOAD`                | `loadedRoutes` | Fires when all routes has been loaded and rendered, just before the output is returned. |
+| `EVENT_ADD_ROUTE`           | `route` | Fires when route is added to the router. |
 | `EVENT_REWRITE`             | `rewriteUrl`<br>`rewriteRoute` | Fires when a url-rewrite is and just before the routes are re-initialized. |
 | `EVENT_BOOT`                | `bootmanagers` | Fires when the router is booting. This happens just before boot-managers are rendered and before any routes has been loaded. |
 | `EVENT_RENDER_BOOTMANAGER`  | `bootmanagers`<br>`bootmanager` | Fires before a boot-manager is rendered. |
@@ -49,7 +49,7 @@ function request(): Request
 * @param string|null $index Parameter index name
 * @param string|null $defaultValue Default return value
 * @param array ...$methods Default methods
- * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string
+ * @return \Pecee\Http\Input\InputHandler|string
 */
 function input($index = null, $defaultValue = null, ...$methods)
 {
@@ -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']);
@@ -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;
    }

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

    /**
@@ -314,25 +314,36 @@ class Url implements \JsonSerializable
     */
    public function hasParam(string $name): bool
    {
-        return \in_array($name, $this->getParams(), true);
+        return array_key_exists($name, $this->getParams());
    }

    /**
-     * Removes parameter from query-string
+     * Removes multiple parameters from the query-string
+     *
+     * @param array ...$names
+     * @return static
+     */
+    public function removeParams(...$names): self
+    {
+        $params = array_diff_key($this->getParams(), array_flip($names));
+        $this->setParams($params);
+
+        return $this;
+    }
+
+    /**
+     * Removes parameter from the query-string
     *
     * @param string $name
+     * @return static
     */
-    public function removeParam(string $name): void
+    public function removeParam(string $name): self
    {
-        if ($this->hasParam($name) === true) {
-            $params = $this->getParams();
-            $key = \array_search($name, $params, true);
+        $params = $this->getParams();
+        unset($params[$name]);
+        $this->setParams($params);

-            if ($key === true) {
-                unset($params[$key]);
-                $this->setParams($params);
-            }
-        }
+        return $this;
    }

    /**
@@ -345,18 +356,7 @@ class Url implements \JsonSerializable
     */
    public function getParam(string $name, ?string $defaultValue = null): ?string
    {
-        $output = null;
-
-        if ($this->hasParam($name) === true) {
-            $params = $this->getParams();
-            $key = \array_search($name, $params, true);
-
-            if ($key === true) {
-                $output = $params[$key];
-            }
-        }
-
-        return $output ?? $defaultValue;
+        return isset($this->getParams()[$name]) ?? $defaultValue;
    }

    /**
@@ -22,6 +22,11 @@ class EventHandler implements IEventHandler
     */
    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.
     */
@@ -95,6 +100,7 @@ class EventHandler implements IEventHandler
        self::EVENT_ALL,
        self::EVENT_INIT,
        self::EVENT_LOAD,
+        self::EVENT_ADD_ROUTE,
        self::EVENT_REWRITE,
        self::EVENT_BOOT,
        self::EVENT_RENDER_BOOTMANAGER,
@@ -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.
     *
@@ -85,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;
@@ -154,7 +165,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     *
     * @return string
     */
-    public function getName(): string
+    public function getName(): ?string
    {
        return $this->name;
    }
@@ -240,7 +251,7 @@ 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);
@@ -192,7 +192,7 @@ abstract class Route implements IRoute
            return $this->callback;
        }

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

    /**
@@ -151,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->isProcessingRoute === true) {
            $this->routeStack[] = $route;
-
-            return $route;
+        } else {
+            $this->routes[] = $route;
        }

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

@@ -447,7 +447,7 @@ class SimpleRouter
     * @param array|null $getParams
     * @return Url
     */
-    public static function getUrl(?string $name = null, $parameters = null, $getParams = null): Url
+    public static function getUrl(?string $name = null, $parameters = null, ?array $getParams = null): Url
    {
        try {
            return static::router()->getUrl($name, $parameters, $getParams);
@@ -6,8 +6,8 @@ require_once 'Dummy/Handler/ExceptionHandler.php';
 require_once 'Dummy/Security/SilentTokenProvider.php';
 require_once 'Dummy/Managers/TestBootManager.php';

-use \Pecee\SimpleRouter\Handlers\EventHandler;
-use \Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Event\EventArgument;
+use Pecee\SimpleRouter\Handlers\EventHandler;

 class EventHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -78,4 +78,30 @@ class EventHandlerTest extends \PHPUnit\Framework\TestCase
        $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);
+
+    }
+
 }
Author	SHA1	Message	Date
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