Merge pull request #434 from skipperbent/v4-development

Version 4.2.0.6
skipperbent · Nov 24, 2018 · b715c48 · b715c48
2 parents ac594eb + d601e8e
commit b715c48
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 181 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
@@ -9,7 +9,7 @@
 
 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;

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
@@ -84,7 +84,8 @@ public function __construct()
 
         // 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 @@ public function __get($name)
         return $this->data[$name] ?? null;
     }
 
-}
+}
diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
@@ -109,6 +109,10 @@ public function renderRoute(Request $request, Router $router): ?string
         $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) {

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
@@ -188,7 +188,7 @@ protected function renderAndProcess(IRoute $route): void
             $this->routeStack = [];
 
             /* Route any routes added to the stack */
-            $this->processRoutes($stack, $route);
+            $this->processRoutes($stack, ($route instanceof IGroupRoute) ? $route : null);
         }
     }