Merge pull request #427 from skipperbent/v4-development

Version 4.2.0.5
Merge pull request #426 from skipperbent/v4-optimisations
2026-06-22 11:09:16 +00:00 · 2018-08-31 01:41:36 +02:00 · 2018-08-31 01:41:05 +02:00 · 2018-08-31 01:40:21 +02:00 · 2018-08-24 17:24:25 +02:00 · 2018-08-24 17:23:43 +02:00
11 changed files with 420 additions and 385 deletions
@@ -41,6 +41,7 @@
      <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" />
    </include_path>
  </component>
  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
@@ -40,6 +40,7 @@
      <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>
@@ -7,22 +7,12 @@
    <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$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/helpers.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php" 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/Http/Request.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Request.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$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.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/Route/RouteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteGroup.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.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$/src/Pecee/SimpleRouter/SimpleRouter.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -31,103 +21,103 @@
  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
  </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="-51423087">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.open.time.0" value="1" />
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.opened" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="json" value="1" />
+          <entry key="md" value="1" />
+          <entry key="php" value="7" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="JSON" value="1" />
+          <entry key="Markdown" value="1" />
+          <entry key="PHP" value="7" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="json" value="18" />
+          <entry key="md" value="39" />
+          <entry key="php" value="397" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JSON" value="18" />
+          <entry key="Markdown" value="39" />
+          <entry key="PHP" value="397" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
  <component name="FavoritesManager">
    <favorites_list name="simple-php-router" />
  </component>
  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <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="20">
-              <caret line="71" column="33" selection-start-line="71" selection-start-column="27" selection-end-line="71" selection-end-column="33" />
-              <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="20">
-              <caret line="15" column="22" lean-forward="true" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IRoute.php" 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="224">
-              <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
-            </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="204">
-              <caret line="32" column="36" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="36" />
-              <folding>
-                <element signature="e#44#67#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RouteUrl.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="280" column="38" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
-              <folding>
-                <element signature="e#36#82#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="162">
-              <caret line="498" column="61" selection-start-line="498" selection-start-column="61" selection-end-line="498" selection-end-column="61" />
-              <folding>
-                <element signature="e#44#82#0#PHP" expanded="true" />
-              </folding>
-            </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">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="220">
-              <caret line="517" lean-forward="true" selection-start-line="517" selection-end-line="517" />
+              <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file 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="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>
+      </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="426">
+              <caret line="153" column="54" selection-start-line="153" selection-start-column="54" selection-end-line="153" selection-end-column="54" />
              <folding>
-                <element signature="e#38#84#0#PHP" expanded="true" />
+                <element signature="e#44#82#0#PHP" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="SimpleRouter.php" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
+        <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>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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>
+      </file>
+      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="505">
-              <caret line="63" selection-start-line="63" selection-end-line="63" />
+            <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" />
              <folding>
                <element signature="e#302#319#0#PHP" expanded="true" />
              </folding>
@@ -135,11 +125,29 @@
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="helpers.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/helpers.php">
+      <file 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="301">
+                <caret line="146" column="28" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
+                <folding>
+                  <element signature="e#6#52#0" expanded="true" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </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="180">
-              <caret line="51" column="59" selection-start-line="51" selection-start-column="59" selection-end-line="51" selection-end-column="59" />
+            <state relative-caret-position="603">
+              <caret line="304" column="24" selection-start-line="304" selection-start-column="24" selection-end-line="304" selection-end-column="24" />
+              <folding>
+                <element signature="e#36#82#0#PHP" expanded="true" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -148,15 +156,6 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>void</find>
-      <find>set</find>
-      <find>hasParam</find>
-      <find>csrf_token</find>
-      <find>static function start</find>
-      <find>fireEvents(</find>
-      <find>-&gt;setUrl</find>
-      <find>EVENT_LOAD</find>
-      <find>addRoute</find>
      <find>$this-&gt;isPro</find>
      <find>7.2</find>
      <find>options</find>
@@ -178,6 +177,15 @@
      <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>
    </findStrings>
    <dirStrings>
      <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -206,7 +214,6 @@
        <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/CookieTokenProvider.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" />
@@ -223,9 +230,7 @@
        <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$/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$/.gitignore" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/IInputItem.php" />
@@ -237,19 +242,22 @@
        <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/Middleware/BaseCsrfVerifier.php" />
-        <option value="$PROJECT_DIR$/README.md" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Request.php" />
-        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.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$/src/Pecee/Http/Input/InputHandler.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.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$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.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$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/composer.json" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
      </list>
    </option>
  </component>
@@ -307,6 +315,7 @@
      <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" />
    </include_path>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
@@ -328,69 +337,58 @@
          <expand>
            <path>
              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
-              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
            </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="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="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <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="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="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="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Http" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Input" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <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="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="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="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="ClassLoader" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <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="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Handlers" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <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="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" />
-              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <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 />
@@ -400,7 +398,7 @@
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pecee-pixie" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../ninjaimg-service" />
    <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" />
@@ -438,34 +436,40 @@
      </list>
    </option>
  </component>
-  <component name="RunManager" selected="PHPUnit.phpunit.xml">
+  <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="RouterUrlTest" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
-      <TestRunner class="RouterUrlTest" file="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php" scope="Class" />
+    <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>
-    <configuration name="debug.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/tests/debug.php" />
    <list>
      <item itemvalue="PHPUnit.tests" />
-      <item itemvalue="PHPUnit.RouterUrlTest" />
      <item itemvalue="PHPUnit.phpunit.xml" />
      <item itemvalue="PHP Script.debug.php" />
      <item itemvalue="PHPUnit.EventHandlerTest" />
+      <item itemvalue="PHPUnit.RouterRouteTest" />
    </list>
    <recent_temporary>
      <list>
-        <item itemvalue="PHPUnit.phpunit.xml" />
-        <item itemvalue="PHPUnit.EventHandlerTest" />
        <item itemvalue="PHPUnit.tests" />
+        <item itemvalue="PHPUnit.RouterRouteTest" />
+        <item itemvalue="PHPUnit.phpunit.xml" />
        <item itemvalue="PHP Script.debug.php" />
-        <item itemvalue="PHPUnit.RouterUrlTest" />
+        <item itemvalue="PHPUnit.EventHandlerTest" />
      </list>
    </recent_temporary>
  </component>
@@ -541,44 +545,49 @@
      <workItem from="1522508007514" duration="2427000" />
      <workItem from="1522530661439" duration="3502000" />
      <workItem from="1522668357317" duration="4847000" />
-      <workItem from="1523014652739" duration="11926000" />
+      <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" />
    </task>
    <servers />
  </component>
  <component name="TestHistory">
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 11m 34s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 27s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 11m 56s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 28s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 12m 06s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 29s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 12m 15s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 31s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 53m 38s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 32s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 54m 36s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 12m 33s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 55m 10s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.24 at 17h 13m 32s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 55m 25s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.31 at 01h 36m 24s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 57m 00s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.31 at 01h 36m 28s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 16h 57m 10s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.08.31 at 01h 36m 29s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="161141000" />
+    <option name="totallyTimeSpent" value="169559000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -593,29 +602,29 @@
    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
    <editor active="true" />
    <layout>
-      <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 anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.3272727" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32828283" />
-      <window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.28282827" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20479521" />
-      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32828283" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
-      <window_info id="Structure" order="1" weight="0.24975026" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" order="2" weight="0.32967034" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21478522" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.24975026" />
+      <window_info id="Favorites" order="2" side_tool="true" weight="0.32967034" />
      <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="6" weight="0.4" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.3272727" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49080735" weight="0.326284" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="REST Client" order="5" weight="0.32929292" />
+      <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50919265" side_tool="true" weight="0.32902184" />
+      <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.32983023" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="12" sideWeight="0.49680257" visible="true" weight="0.2819738" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32828283" />
+      <window_info anchor="bottom" id="Inspection Results" order="15" weight="0.32729104" />
      <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="PHP-CGI Server" order="10" />
-      <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" />
+      <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">
@@ -624,26 +633,7 @@
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="3" />
-    </breakpoint-manager>
-  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IExceptionHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="2" column="10" lean-forward="true" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/DebugEventHandler.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Handlers/IEventHandler.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="552">
@@ -718,13 +708,6 @@
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/tmp/CompiledContainer.php" />
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/ClassLoader/ClassLoader.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="384">
@@ -739,13 +722,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="105" column="33" selection-start-line="105" selection-start-column="33" selection-end-line="105" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/Dummy/Exception/ResponseException.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="192">
@@ -785,9 +761,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="540">
          <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>
@@ -795,9 +768,6 @@
      <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" />
-          <folding>
-            <element signature="e#249#292#0#PHP" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
@@ -808,28 +778,11 @@
        </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="403">
-          <caret line="94" column="116" selection-start-line="94" selection-start-column="116" selection-end-line="94" selection-end-column="116" />
-        </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$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="165">
-            <caret line="1202" lean-forward="true" selection-start-line="1202" selection-end-line="1202" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </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">
@@ -837,13 +790,6 @@
        </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="213">
-          <caret line="69" column="56" selection-start-line="69" selection-start-column="56" selection-end-line="69" selection-end-column="56" />
-        </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="286">
@@ -872,13 +818,6 @@
        </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="1806">
-          <caret line="93" column="63" selection-start-line="93" selection-start-column="63" selection-end-line="93" selection-end-column="63" />
-        </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">
@@ -900,93 +839,142 @@
        </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="20">
-          <caret line="71" column="33" selection-start-line="71" selection-start-column="27" selection-end-line="71" selection-end-column="33" />
-          <folding>
-            <element signature="e#44#82#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="20">
-          <caret line="15" column="22" lean-forward="true" 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/IRoute.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+          <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="204">
+        <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" />
-          <folding>
-            <element signature="e#44#67#0#PHP" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+    <entry file="file://$PROJECT_DIR$/helpers.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
+        <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$/src/Pecee/Http/Input/InputHandler.php">
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="280" column="38" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
-          <folding>
-            <element signature="e#36#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="162">
-          <caret line="498" column="61" selection-start-line="498" selection-start-column="61" selection-end-line="498" selection-end-column="61" />
-          <folding>
-            <element signature="e#44#82#0#PHP" expanded="true" />
-          </folding>
+        <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/Router.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="517" lean-forward="true" selection-start-line="517" selection-end-line="517" />
+        <state relative-caret-position="17860">
+          <caret line="893" column="20" selection-start-line="893" selection-start-column="20" selection-end-line="893" selection-end-column="20" />
          <folding>
            <element signature="e#38#84#0#PHP" expanded="true" />
          </folding>
        </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="1880">
+          <caret line="94" column="116" selection-start-line="94" selection-start-column="116" selection-end-line="94" selection-end-column="116" />
+        </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="300">
+          <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </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="1280">
+          <caret line="67" column="47" lean-forward="true" selection-start-line="67" selection-start-column="47" selection-end-line="67" selection-end-column="121" />
+        </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="220">
+          <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="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="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/Http/Input/InputHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="603">
+          <caret line="304" column="24" selection-start-line="304" selection-start-column="24" selection-end-line="304" selection-end-column="24" />
+          <folding>
+            <element signature="e#36#82#0#PHP" expanded="true" />
+          </folding>
+        </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$/src/Pecee/SimpleRouter/Route/Route.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="153" column="54" selection-start-line="153" selection-start-column="54" selection-end-line="153" selection-end-column="54" />
+          <folding>
+            <element signature="e#44#82#0#PHP" expanded="true" />
+          </folding>
+        </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$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="301">
+            <caret line="146" column="28" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
+            <folding>
+              <element signature="e#6#52#0" expanded="true" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </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="505">
-          <caret line="63" selection-start-line="63" selection-end-line="63" />
+        <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" />
          <folding>
            <element signature="e#302#319#0#PHP" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/helpers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="51" column="59" selection-start-line="51" selection-start-column="59" selection-end-line="51" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
  </component>
 </project>
@@ -144,6 +144,7 @@ You can find the demo-project here: [https://github.com/skipperbent/simple-route
 ## Requirements

 - PHP 7.1 or greater (version 3.x and below supports PHP 5.5+)
+- PHP JSON extension enabled.

 ## Features

@@ -28,6 +28,7 @@
  ],
  "require": {
    "php": ">=7.1",
+    "ext-json": "*",
    "php-di/php-di": "^6.0"
  },
  "require-dev": {
@@ -290,7 +290,7 @@ class InputHandler
     * @param array $filter Only take items in filter
     * @return array
     */
-    public function all(array $filter): array
+    public function all(array $filter = []): array
    {
        $output = $_GET;

@@ -298,22 +298,51 @@ class InputHandler

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

-            if (\in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
-
-                $contents = file_get_contents('php://input');
-
-                // Append any PHP-input json
-                if (strpos(trim($contents), '{') === 0) {
-                    $post = json_decode($contents, true);
-                    if ($post !== false) {
-                        $output += $post;
-                    }
+            // Append any PHP-input json
+            if (strpos(trim($contents), '{') === 0) {
+                $post = json_decode($contents, true);
+                if ($post !== false) {
+                    $output += $post;
                }
            }
        }

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

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

    /**
@@ -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,
    ];

    /**
@@ -120,23 +122,25 @@ abstract class Route implements IRoute

    protected function parseParameters($route, $url, $parameterRegex = null)
    {
-        $regex = null;
-        if (strpos($route, $this->paramModifiers[0]) !== false) {
-            $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 = null;
+        $urlRegex = '';
        $parameters = [];

        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 = '';

@@ -147,24 +151,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);
                }

                $urlRegex .= preg_quote($t, '/') . $regex;
            }
        }

-        if ($urlRegex === null || (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;
        }

@@ -174,7 +174,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;
            }
        }

@@ -412,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) {
@@ -457,7 +457,9 @@ class Router
        }

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

            $this->fireEvents(EventHandler::EVENT_REWRITE, [
@@ -644,11 +646,7 @@ class Router
        }

        /* 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) {
@@ -24,7 +24,6 @@ use Pecee\SimpleRouter\Handlers\IEventHandler;
 use Pecee\SimpleRouter\Route\IGroupRoute;
 use Pecee\SimpleRouter\Route\IPartialGroupRoute;
 use Pecee\SimpleRouter\Route\IRoute;
-use Pecee\SimpleRouter\Route\Route;
 use Pecee\SimpleRouter\Route\RouteController;
 use Pecee\SimpleRouter\Route\RouteGroup;
 use Pecee\SimpleRouter\Route\RoutePartialGroup;
@@ -75,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) {
@@ -187,7 +185,7 @@ class SimpleRouter
     */
    public static function get(string $url, $callback, array $settings = null): IRoute
    {
-        return static::match([Route::REQUEST_TYPE_GET], $url, $callback, $settings);
+        return static::match(['get'], $url, $callback, $settings);
    }

    /**
@@ -200,7 +198,7 @@ class SimpleRouter
     */
    public static function post(string $url, $callback, array $settings = null): IRoute
    {
-        return static::match([Route::REQUEST_TYPE_POST], $url, $callback, $settings);
+        return static::match(['post'], $url, $callback, $settings);
    }

    /**
@@ -213,7 +211,7 @@ class SimpleRouter
     */
    public static function put(string $url, $callback, array $settings = null): IRoute
    {
-        return static::match([Route::REQUEST_TYPE_PUT], $url, $callback, $settings);
+        return static::match(['put'], $url, $callback, $settings);
    }

    /**
@@ -226,7 +224,7 @@ class SimpleRouter
     */
    public static function patch(string $url, $callback, array $settings = null): IRoute
    {
-        return static::match([Route::REQUEST_TYPE_PATCH], $url, $callback, $settings);
+        return static::match(['patch'], $url, $callback, $settings);
    }

    /**
@@ -239,7 +237,7 @@ class SimpleRouter
     */
    public static function options(string $url, $callback, array $settings = null): IRoute
    {
-        return static::match([Route::REQUEST_TYPE_OPTIONS], $url, $callback, $settings);
+        return static::match(['options'], $url, $callback, $settings);
    }

    /**
@@ -263,7 +261,7 @@ class SimpleRouter
     * @return RouteGroup
     * @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');
@@ -6,10 +6,28 @@ require_once 'Dummy/Exception/ExceptionHandlerException.php';

 class RouterRouteTest extends \PHPUnit\Framework\TestCase
 {
+
+    /**
+     * 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()
    {
        $result = false;
-        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use(&$result) {
+        TestRouter::get('/test-{param1}-{param2}', function ($param1, $param2) use (&$result) {

            if ($param1 === 'param1' && $param2 === 'param2') {
                $result = true;
@@ -94,13 +112,12 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase
        $result = false;
        TestRouter::request()->setHost('hello.world.com');

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

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

        $this->assertTrue($result);
@@ -113,8 +130,8 @@ class RouterRouteTest extends \PHPUnit\Framework\TestCase

        $result = false;

-        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use(&$result) {
-            TestRouter::get('/test', function ($subdomain = null) use(&$result) {
+        TestRouter::group(['domain' => '{subdomain}.world.com'], function () use (&$result) {
+            TestRouter::get('/test', function ($subdomain = null) use (&$result) {
                $result = ($subdomain === 'hello');
            });
        });
@@ -133,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;
        });

@@ -157,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');
        });
Author	SHA1	Message	Date
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ø	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ø	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ø	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ø	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