Merge pull request #434 from skipperbent/v4-development

Version 4.2.0.6

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/php.xml

@@ -35,13 +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" />

README.md

@@ -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
 

composer.json

@@ -28,6 +28,7 @@
   ],
   "require": {
     "php": ">=7.1",
+    "ext-json": "*",
     "php-di/php-di": "^6.0"
   },
   "require-dev": {

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

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

src/Pecee/Http/Request.php

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

src/Pecee/Http/Security/CookieTokenProvider.php

@@ -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'));
     }
 
     /**

src/Pecee/SimpleRouter/Route/Route.php

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

src/Pecee/SimpleRouter/Router.php

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

src/Pecee/SimpleRouter/SimpleRouter.php

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

tests/Pecee/SimpleRouter/RouterRouteTest.php

@@ -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');
         });