Merge pull request #434 from skipperbent/v4-development

Version 4.2.0.6
Bugfixes and optimisations.
2026-06-19 01:31:28 +00:00 · 2018-11-25 00:47:02 +01:00 · 2018-11-25 00:44:20 +01:00 · 2018-11-25 00:27:54 +01:00 · 2018-11-25 00:27:30 +01:00 · 2018-11-10 22:17:08 -02:00
14 changed files with 323 additions and 334 deletions
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
@@ -35,12 +35,13 @@
      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
      <path value="$PROJECT_DIR$/vendor/psr/container" />
      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
    </include_path>
  </component>
  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
@@ -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>
@@ -5,14 +5,14 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="a7058529-bdc4-40b4-a50d-c50564dc83f0" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/Http/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/SimpleRouter/Route/Route.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.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" />
@@ -25,75 +25,30 @@
    <favorites_list name="simple-php-router" />
  </component>
  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <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="-2294">
-              <caret line="100" column="16" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="16" />
-              <folding>
-                <element signature="e#302#319#0#PHP" expanded="true" />
-              </folding>
-            </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="1420">
-              <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="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="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>
-      </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="298">
-              <caret line="16" column="64" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IRoute.php" pinned="false" current-in-tab="false">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+            <state relative-caret-position="363">
+              <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="Route.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
-              <folding>
-                <element signature="e#44#82#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="396">
+              <caret line="190" column="12" selection-start-line="190" selection-start-column="12" selection-end-line="190" selection-end-column="12" />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="InputHandler.php" pinned="false" current-in-tab="false">
+      <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="480">
-              <caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
+            <state relative-caret-position="294">
+              <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
              <folding>
                <element signature="e#36#82#0#PHP" expanded="true" />
              </folding>
@@ -101,27 +56,72 @@
          </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">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="893" column="20" selection-start-line="893" selection-start-column="20" selection-end-line="893" selection-end-column="20" />
+            <state relative-caret-position="265">
+              <caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="94" column="49" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" />
              <folding>
-                <element signature="e#38#84#0#PHP" expanded="true" />
+                <element signature="e#44#82#0#PHP" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="20" column="7" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="42">
+              <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="206">
+                <caret line="849" column="50" selection-start-line="849" selection-start-column="50" selection-end-line="849" selection-end-column="50" />
+              </first_editor>
+              <second_editor>
+                <markdownNavigatorState />
+              </second_editor>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
    </leaf>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>-&gt;setUrl</find>
-      <find>EVENT_LOAD</find>
-      <find>addRoute</find>
-      <find>$this-&gt;isPro</find>
-      <find>7.2</find>
      <find>options</find>
      <find>parent::set</find>
      <find>parseParameters</find>
@@ -135,18 +135,23 @@
      <find>matchRoute</find>
      <find>-&gt;getValue</find>
      <find>-&gt;find</find>
-      <find />
+      <find>function find</find>
      <find>Req</find>
      <find>value(</find>
      <find>file(</find>
      <find>setUrl</find>
      <find>TODO</find>
      <find>input()-&gt;get</find>
-      <find />
+      <find>function get</find>
      <find>REQUEST_TYPE_</find>
-      <find />
+      <find>or method</find>
      <find>setDebugEnabled</find>
      <find>debugEnabled</find>
+      <find>optiona</find>
+      <find>\/</find>
+      <find>requirements</find>
+      <find>ler = new I</find>
+      <find>csrf_token</find>
    </findStrings>
    <dirStrings>
      <dir>D:\Workspace\simple-php-router\src\Pecee\SimpleRouter\Route</dir>
@@ -175,7 +180,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" />
@@ -192,11 +196,8 @@
        <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" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputItem.php" />
        <option value="$PROJECT_DIR$/src/Pecee/Http/Input/InputFile.php" />
@@ -206,24 +207,26 @@
        <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$/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$/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/Route/Route.php" />
-        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php" />
+        <option value="$PROJECT_DIR$/composer.json" />
        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php" />
+        <option value="$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php" />
+        <option value="$PROJECT_DIR$/.gitignore" />
      </list>
    </option>
  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsFlowSettings">
    <service-enabled>false</service-enabled>
    <exe-path />
@@ -231,11 +234,7 @@
    <other-services-enabled>false</other-services-enabled>
    <auto-save>true</auto-save>
  </component>
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.2">
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.1">
    <include_path>
      <path value="$PROJECT_DIR$/vendor/composer" />
      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
@@ -270,12 +269,13 @@
      <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
      <path value="$PROJECT_DIR$/vendor/jeremeamia/SuperClosure" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-util" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
      <path value="$PROJECT_DIR$/vendor/php-di/invoker" />
      <path value="$PROJECT_DIR$/vendor/php-di/phpdoc-reader" />
      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
      <path value="$PROJECT_DIR$/vendor/psr/container" />
      <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php56" />
    </include_path>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
@@ -291,98 +291,74 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
-              <item name="simple-php-router" type="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" />
-            </path>
-            <path>
-              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
-              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="simple-php-router" type="b2602c69:ProjectViewProjectNode" />
-              <item name="simple-php-router" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="tests" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="Pecee" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="SimpleRouter" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="simple-php-router" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="Pecee" type="462c0819:PsiDirectoryNode" />
+              <item name="SimpleRouter" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
-      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../ninjaimg-service" />
+    <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" />
@@ -420,34 +396,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.tests" />
+      <item itemvalue="PHPUnit.phpunit.xml" />
      <item itemvalue="PHPUnit.EventHandlerTest" />
+      <item itemvalue="PHPUnit.RouterRouteTest" />
    </list>
    <recent_temporary>
      <list>
+        <item itemvalue="PHPUnit.tests" />
+        <item itemvalue="PHPUnit.RouterRouteTest" />
        <item itemvalue="PHPUnit.phpunit.xml" />
        <item itemvalue="PHP Script.debug.php" />
        <item itemvalue="PHPUnit.EventHandlerTest" />
-        <item itemvalue="PHPUnit.tests" />
-        <item itemvalue="PHPUnit.RouterUrlTest" />
      </list>
    </recent_temporary>
  </component>
@@ -525,44 +507,49 @@
      <workItem from="1522668357317" duration="4847000" />
      <workItem from="1523014652739" duration="16240000" />
      <workItem from="1523035686391" duration="174000" />
-      <workItem from="1523035884787" duration="578000" />
+      <workItem from="1523035884787" duration="1022000" />
+      <workItem from="1523038029219" duration="56000" />
+      <workItem from="1535121332253" duration="2346000" />
+      <workItem from="1535671881115" duration="506000" />
+      <workItem from="1535806837271" duration="204000" />
+      <workItem from="1543101575756" duration="1207000" />
    </task>
    <servers />
  </component>
  <component name="TestHistory">
-    <history-entry file="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 28s.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 12m 29s.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.24 at 17h 12m 31s.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.24 at 17h 12m 32s.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.24 at 17h 12m 33s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
-    <history-entry file="phpunit_xml - 2018.04.06 at 19h 04m 25s.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 19h 04m 32s.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 19h 35m 48s.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 19h 35m 53s.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>
-    <history-entry file="phpunit_xml - 2018.04.06 at 19h 35m 56s.xml">
-      <configuration name="phpunit.xml" configurationId="PHPUnitRunConfigurationType" />
+    <history-entry file="tests - 2018.11.25 at 00h 37m 03s.xml">
+      <configuration name="tests" configurationId="PHPUnitRunConfigurationType" />
    </history-entry>
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="166207000" />
+    <option name="totallyTimeSpent" value="171000000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -577,57 +564,35 @@
    <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" visible="true" 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" weight="0.28282827" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20879121" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21878122" />
+      <window_info id="Structure" order="1" weight="0.24975026" />
+      <window_info id="Favorites" order="2" weight="0.32967034" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48880896" weight="0.32696176" />
+      <window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.4935065" visible="true" weight="0.28169015" />
+      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.49080735" weight="0.32595575" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
+      <window_info anchor="bottom" id="REST Client" order="6" weight="0.32929292" />
+      <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="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" side_tool="true" weight="0.24975026" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" order="2" side_tool="true" weight="0.32967034" />
-      <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="Command Line Tools Console" order="9" weight="0.32928804" />
      <window_info anchor="bottom" id="PHP-CGI Server" order="10" />
+      <window_info anchor="bottom" id="TODO" order="11" weight="0.32897383" />
+      <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="13" weight="0.3279678" />
+      <window_info anchor="bottom" id="Inspection Results" order="14" weight="0.32696176" />
+      <window_info anchor="bottom" id="Event Log" order="15" sideWeight="0.5064935" weight="0.28169015" />
      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="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="bottom" id="Cvs" order="4" weight="0.25" />
-      <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="right" id="Database" order="3" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="3" />
-    </breakpoint-manager>
-  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/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">
@@ -702,13 +667,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">
@@ -723,13 +681,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">
@@ -769,9 +720,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>
@@ -801,20 +749,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">
-          <caret line="88" column="24" lean-forward="true" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/MiddlewareTest.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="120">
@@ -824,7 +758,7 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterUrlTest.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-34">
+        <state relative-caret-position="1640">
          <caret line="85" selection-start-line="85" selection-end-line="85" />
        </state>
      </provider>
@@ -868,9 +802,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="640">
          <caret line="32" column="36" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="36" />
-          <folding>
-            <element signature="e#44#67#0#PHP" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
@@ -881,16 +812,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="24400">
-            <caret line="1220" column="10" selection-start-line="1220" selection-start-column="10" selection-end-line="1220" selection-end-column="10" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/InputHandlerTest.php">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="405">
@@ -898,74 +819,119 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteUrl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/Pecee/SimpleRouter/RouterRouteTest.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Security/CookieTokenProvider.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="65" column="87" selection-start-line="65" selection-start-column="87" selection-end-line="65" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/composer.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="538">
+          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="263" column="48" lean-forward="true" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/IRoute.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="190" column="12" selection-start-line="190" selection-start-column="12" selection-end-line="190" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Input/InputHandler.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
+        <state relative-caret-position="294">
+          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
          <folding>
            <element signature="e#36#82#0#PHP" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Router.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Request.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <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 relative-caret-position="265">
+          <caret line="87" column="24" selection-start-line="87" selection-start-column="24" selection-end-line="87" selection-end-column="24" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/Route.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
+        <state relative-caret-position="172">
+          <caret line="94" column="49" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" />
          <folding>
            <element signature="e#44#82#0#PHP" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/SimpleRouter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2294">
-          <caret line="100" column="16" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="16" />
-          <folding>
-            <element signature="e#302#319#0#PHP" expanded="true" />
-          </folding>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="206">
+            <caret line="849" column="50" selection-start-line="849" selection-start-column="50" selection-end-line="849" selection-end-column="50" />
+          </first_editor>
+          <second_editor>
+            <markdownNavigatorState />
+          </second_editor>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/LoadableRoute.php">
+    <entry file="file://$PROJECT_DIR$/src/Pecee/Http/Middleware/BaseCsrfVerifier.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1420">
-          <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 relative-caret-position="357">
+          <caret line="20" column="7" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Pecee/SimpleRouter/Route/RouteResource.php">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
      <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/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/SimpleRouter/Route/RouteUrl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="16" column="64" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
+        <state relative-caret-position="42">
+          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
        </state>
      </provider>
    </entry>
@@ -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": {
@@ -298,17 +298,13 @@ 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;
                }
            }
        }
@@ -9,7 +9,7 @@ use Pecee\Http\Security\ITokenProvider;

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

    protected $except;
@@ -84,7 +84,8 @@ class Request

        // Check if special IIS header exist, otherwise use default.
        $this->setUrl(new Url($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
-
+        
+        $this->method = strtolower($this->getHeader('request-method'));
        $this->inputHandler = new InputHandler($this);
        $this->method = strtolower($this->inputHandler->value('_method', $this->getHeader('request-method')));
    }
@@ -425,4 +426,4 @@ class Request
        return $this->data[$name] ?? null;
    }

-}
+}
@@ -63,7 +63,7 @@ class CookieTokenProvider implements ITokenProvider
    public function setToken(string $token): void
    {
        $this->token = $token;
-        setcookie(static::CSRF_KEY, $token, (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'));
    }

    /**
@@ -109,6 +109,10 @@ abstract class Route implements IRoute
        $router->debug('Loading class %s', $className);
        $class = $router->getClassLoader()->loadClass($className);

+        if (\count($controller) === 1) {
+            $controller[1] = '__invoke';
+        }
+
        $method = $controller[1];

        if (method_exists($class, $method) === false) {
@@ -151,17 +155,13 @@ 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;
@@ -188,7 +188,7 @@ class Router
            $this->routeStack = [];

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

@@ -261,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ø	b715c48415	Merge pull request #434 from skipperbent/v4-development Version 4.2.0.6	2018-11-25 00:47:02 +01:00
Simon Sessingø	d601e8eca3	Bugfixes and optimisations. - Fix for __invoke methods (issue: #429) - Fixed not being able to parse body of PUT request. - BaseCsrfVerifier expects the field name to be "csrf-token" (issue: #432) - Minor optimisations	2018-11-25 00:44:20 +01:00
Simon Sessingø	4a8b71a0b5	Merge pull request #430 from Tahrz/master fix for __invoke methods (if there are only in class (Action))	2018-11-25 00:27:54 +01:00
Simon Sessingø	bd01a8a802	Merge pull request #431 from matheusheiden/master Set HTTP method before initializing InputHandler	2018-11-25 00:27:30 +01:00
Matheus	55bcd4e030	Merge pull request #1 from matheusheiden/matheusheiden-patch-1 Set HTTP method before initializing InputHandler	2018-11-10 22:17:08 -02:00
Matheus	d4a6d504b1	Set HTTP method before initializing InputHandler This is needed because without it the InputHandler doesn't know which http method is being used, and because of that it can't parse the body of a PUT request	2018-11-10 22:16:45 -02:00
Taras Victorovich	9e3b1b6baa	fix for __invoke methods (if there are only in class (Action))	2018-10-02 15:40:26 +03:00
Simon Sessingø	1395527cc6	Merge pull request #428 from skipperbent/v4-release V4 release	2018-08-31 01:41:48 +02:00
Simon Sessingø	ac594ebde2	Merge pull request #427 from skipperbent/v4-development Version 4.2.0.5	2018-08-31 01:41:36 +02:00
Simon Sessingø	064154f27f	Merge pull request #426 from skipperbent/v4-optimisations Optimizations	2018-08-31 01:41:05 +02:00
Simon Sessingø	0ac7fd559a	Optimizations - Settings parameter in group method are no longer optional. - Updated README to contain PHP JSON-extension under requirements. - Updated composer.json to include php json extension.	2018-08-31 01:40:21 +02:00
Simon Sessingø	da8dfdb135	Merge pull request #424 from skipperbent/v4-release V4 release	2018-08-24 17:24:48 +02:00
Simon Sessingø	57c9da2c42	Merge pull request #423 from skipperbent/v4-development Version 4.2.0.4	2018-08-24 17:24:25 +02:00
Simon Sessingø	6bdfe06223	Merge pull request #422 from skipperbent/v4-optional-character-fix Fix for issue #421: Incorrectly optional character in route	2018-08-24 17:23:43 +02:00
Simon Sessingø	5c2a973214	Merge branch 'v4-development' into v4-optional-character-fix	2018-08-24 17:23:33 +02:00
Simon Sessingø	a7cbacbde7	Fix for issue #421 : Incorrectly optional character in route	2018-08-24 17:16:02 +02:00
Simon Sessingø	f0c851e49d	Merge pull request #417 from skipperbent/v4-release V4 release	2018-04-22 05:37:41 +02:00
Simon Sessingø	45a5176b3c	Merge pull request #416 from skipperbent/v4-development Version 4.2.0.3	2018-04-22 05:37:29 +02:00
Simon Sessingø	2d042391aa	Merge pull request #415 from skipperbent/v4-fix-input-all-empty Fixed returning empty array when positing json (issue #413)	2018-04-22 05:36:10 +02:00
Simon Sessingo	4d842d0583	Fixed returning empty array when positing json (issue #413 )	2018-04-22 05:35:15 +02:00
Simon Sessingø	7c54d319e6	Merge pull request #411 from skipperbent/v4-release V4 release	2018-04-06 19:46:01 +02:00
Simon Sessingø	e51290dfd8	Merge pull request #409 from skipperbent/v4-release V4 release	2018-04-06 18:04:28 +02:00
Simon Sessingø	d4bbb6641d	Merge pull request #407 from skipperbent/v4-release V4 release	2018-04-06 17:28:12 +02:00
Simon Sessingø	ca1e2ef94b	Merge pull request #404 from skipperbent/v4-release V4 release	2018-04-05 12:19:27 +02:00
Simon Sessingø	0fc40f2a82	Merge pull request #384 from skipperbent/v3 V3	2018-03-03 23:44:32 +01:00
Simon Sessingø	c5c63671ef	Merge pull request #383 from skipperbent/v3-development Development	2018-03-03 23:44:20 +01:00
Simon Sessingø	781fab48cc	Merge pull request #382 from skipperbent/v3 V3	2018-02-27 09:05:08 +01:00
Simon Sessingø	6e247f811f	Merge pull request #381 from skipperbent/v3-development Throw correct exception-types.	2018-02-27 09:04:57 +01:00
Simon Sessingø	486d7c3a5b	Merge pull request #380 from skipperbent/v3 Merge pull request #378 from skipperbent/v3-development	2018-02-27 08:37:14 +01:00
Simon Sessingø	559a65859e	Merge pull request #379 from skipperbent/v3-development Fixed issue with PDO exception not returning correct type for error-c…	2018-02-27 08:36:57 +01:00
Simon Sessingø	8111de48fd	Merge pull request #378 from skipperbent/v3-development Fixed issue with PDO exception not returning correct type for error-code.	2018-02-27 08:36:43 +01:00
Simon Sessingø	8b46d97418	Merge pull request #377 from skipperbent/v3 V3	2018-02-27 00:20:25 +01:00
Simon Sessingø	0dbc4e6ba2	Merge pull request #376 from skipperbent/v3-development Optimisations	2018-02-27 00:20:12 +01:00
Simon Sessingø	38910ea9b6	Merge pull request #375 from skipperbent/v3 V3	2018-02-27 00:14:39 +01:00
Simon Sessingø	a4dfa59a66	Merge pull request #374 from skipperbent/v3-development Stop router from processing routes if no valid route is found.	2018-02-27 00:14:24 +01:00
Simon Sessingø	d40eaba3e7	Merge pull request #373 from skipperbent/v3 V3	2018-02-26 23:49:41 +01:00
Simon Sessingø	2c9d996437	Merge pull request #372 from skipperbent/v3-development Fixed setUrl issue.	2018-02-26 23:48:45 +01:00
Simon Sessingø	8b6a6864a7	Merge pull request #371 from skipperbent/v3 V3	2018-02-26 23:24:50 +01:00
Simon Sessingø	98ce5f7635	Merge pull request #370 from skipperbent/v3-development Development	2018-02-26 23:24:37 +01:00
Simon Sessingø	6b22632141	Merge pull request #369 from skipperbent/v3 V3	2018-02-24 05:39:30 +01:00
Simon Sessingø	69bb570c73	Merge pull request #368 from skipperbent/v3-development Version 3.5.0.0	2018-02-24 05:39:20 +01:00
Simon Sessingø	ed320e2f87	Merge pull request #366 from skipperbent/v3 V3	2018-02-19 23:07:13 +01:00
Simon Sessingø	c80b23e9d4	Merge pull request #365 from skipperbent/v3-development Version 3.4.11.2	2018-02-19 23:07:02 +01:00
Simon Sessingø	76589e9d92	Merge pull request #364 from skipperbent/v3 Merge pull request #363 from skipperbent/master	2018-02-19 16:37:35 +01:00
Simon Sessingø	9d88bf10d2	Merge pull request #363 from skipperbent/master Sync	2018-02-19 16:37:04 +01:00
Simon Sessingø	dfa4a9aa6c	Merge pull request #362 from skipperbent/v3-development Version 3.4.11.1	2018-02-19 16:36:27 +01:00
Simon Sessingø	7c789ea0f8	Merge pull request #361 from skipperbent/v3 V3	2018-02-14 12:39:31 +01:00
Simon Sessingø	3ba9dd01f0	Merge pull request #360 from skipperbent/v3-development Version 3.4.11.0	2018-02-14 12:39:19 +01:00
Simon Sessingø	14360b6779	Merge pull request #353 from skipperbent/v3 V3	2018-01-14 15:54:49 +01:00
Simon Sessingø	bbb81333b4	Merge pull request #352 from skipperbent/v3-development Fixed Input::all when php://input is not available	2018-01-14 15:54:37 +01:00
Simon Sessingø	161fbf6ccf	Merge pull request #351 from skipperbent/v3 V3	2018-01-06 03:33:23 +01:00
Simon Sessingø	9a7b598880	Merge pull request #350 from skipperbent/v3-development Version 3.4.10.0	2018-01-06 03:33:13 +01:00
Simon Sessingø	1486095e9f	Merge pull request #345 from skipperbent/v3 V3 sync	2017-12-17 10:41:58 +01:00
Simon Sessingø	2db20dce6b	Merge pull request #344 from skipperbent/v3-development Version 3.4.9.3	2017-12-17 10:41:22 +01:00
Simon Sessingø	7cb416cfc8	Merge pull request #342 from skipperbent/v3 V3	2017-12-17 09:53:49 +01:00
Simon Sessingø	c6341960d7	Merge pull request #341 from skipperbent/v3-development Version 3.4.9.2	2017-12-17 09:53:39 +01:00
Simon Sessingø	a570322e25	Merge pull request #340 from skipperbent/v3 V3	2017-12-16 12:54:06 +01:00
Simon Sessingø	85cf925793	Merge pull request #339 from skipperbent/v3-development Version 3.4.9.1	2017-12-16 12:53:56 +01:00
Simon Sessingø	feb6c8bd41	Merge pull request #337 from skipperbent/v3 V3	2017-12-09 23:58:48 +01:00
Simon Sessingø	7c0a20115e	Merge pull request #336 from skipperbent/v3-development Version 3.4.9.0	2017-12-09 23:58:33 +01:00
Simon Sessingø	276f213ccc	Merge pull request #335 from skipperbent/v3 V3	2017-12-06 19:06:20 +01:00
Simon Sessingø	877e0aa937	Merge pull request #334 from skipperbent/v3-development Version 3.4.8.0	2017-12-06 19:06:09 +01:00
Simon Sessingø	56457448e4	Merge pull request #331 from skipperbent/v3 V3	2017-12-02 20:30:37 +01:00
Simon Sessingø	3e7767d978	Merge pull request #330 from skipperbent/v3-development V3 development	2017-12-02 20:30:27 +01:00
Simon Sessingø	8ce1540771	Merge pull request #328 from skipperbent/v3 V3	2017-11-27 02:05:40 +01:00
Simon Sessingø	5ef9349b18	Merge pull request #327 from skipperbent/v3-development Version 3.4.6.4	2017-11-27 02:05:17 +01:00
Simon Sessingø	3b305ceb00	Merge pull request #326 from skipperbent/v3 V3	2017-11-27 00:01:45 +01:00
Simon Sessingø	264f0a7b0f	Merge pull request #325 from skipperbent/v3-development Version 3.4.6.3	2017-11-27 00:01:30 +01:00
Simon Sessingø	1f00cf50e6	Merge pull request #324 from skipperbent/v3 V3	2017-11-26 23:44:17 +01:00
Simon Sessingø	5197ae2990	Merge pull request #323 from skipperbent/v3-development Version 3.4.6.2	2017-11-26 23:44:06 +01:00
Simon Sessingø	32bc46be81	Merge pull request #322 from skipperbent/v3 V3	2017-11-26 18:46:25 +01:00
Simon Sessingø	9c701aabee	Merge pull request #321 from skipperbent/v3-development Fixed url parsing issues	2017-11-26 18:45:54 +01:00
Simon Sessingø	2b0821a557	Merge pull request #320 from skipperbent/v3-development Fixed typo	2017-11-26 18:29:36 +01:00
Simon Sessingø	1ee71b9ec3	Merge pull request #319 from skipperbent/v3 V3	2017-11-26 18:08:36 +01:00
Simon Sessingø	afc81d7005	Merge pull request #318 from skipperbent/v3-development Version 3.4.6.0	2017-11-26 18:08:24 +01:00
Simon Sessingø	0b8931a2e1	Merge pull request #316 from skipperbent/v3 V3	2017-11-25 01:35:03 +01:00
Simon Sessingø	496d3e7182	Merge pull request #315 from skipperbent/v3-development Version 3.4.5.5	2017-11-25 01:34:53 +01:00
Simon Sessingø	2472079642	Merge pull request #312 from skipperbent/v3 V3	2017-11-10 13:03:02 +01:00
Simon Sessingø	1fd13ed2aa	Merge pull request #311 from skipperbent/v3-development V3 development	2017-11-10 13:02:49 +01:00
Simon Sessingø	4409fbcf4e	Merge pull request #309 from skipperbent/v3 V3	2017-11-10 08:25:22 +01:00
Simon Sessingø	9d5c4a2ed1	Merge pull request #308 from skipperbent/v3-development 3.4.5.4	2017-11-10 08:24:55 +01:00
Simon Sessingø	b8634bcf79	Merge pull request #307 from skipperbent/revert-306-revert-305-v3-development Revert "Revert "V3 development""	2017-11-08 04:11:50 +01:00
Simon Sessingø	6ad22a3816	Revert "Revert "V3 development""	2017-11-08 04:11:40 +01:00
Simon Sessingø	ed41cd55af	Merge pull request #306 from skipperbent/revert-305-v3-development Revert "V3 development"	2017-11-08 04:09:55 +01:00
Simon Sessingø	ebeca952cf	Revert "V3 development"	2017-11-08 04:09:41 +01:00
Simon Sessingø	0672e85fd7	Merge pull request #305 from skipperbent/v3-development V3 development	2017-11-08 04:09:31 +01:00