Merge pull request #368 from skipperbent/v3-development

Version 3.5.0.0

README.md

@@ -1136,125 +1136,18 @@ $siteId = input('site_id', 2, ['post', 'get']);
 
 ## Url rewriting
 Sometimes it can be useful to manipulate the route about to be loaded.
-simple-php-router allows you to easily change the route about to be executed.
+simple-php-router allows you to easily manipulate and change the routes which are about to be rendered.
 All information about the current route is stored in the `\Pecee\SimpleRouter\Router` instance's `loadedRoute` property.
 
-For easy access you can use the shortcut method `\Pecee\SimpleRouter\SimpleRouter::router()`.
+For easy access you can use the shortcut helper function `request()` instead of calling the class directly `\Pecee\SimpleRouter\SimpleRouter::router()`.
 
 
 ```php
-use Pecee\SimpleRouter;
-$request = SimpleRouter::request();
-$request->setRewriteCallback('Example\MyCustomClass@hello');
+request()->setRewriteCallback('Example\MyCustomClass@hello');
 
 // -- or you can rewrite by url --
 
-$request->setRewriteUrl('/my-rewrite-url');
-```
-
-**Note:** It's only possible to change the route BEFORE the route has initially been rendered. You can use the `Request` object to manipulate the route which are about to be loaded.
-
-### Rewrite using callback
-
-This method is most efficient, as it will render the route immediately.
-
-This method is useful for rendering 404-pages etc.
-
-You can also change the callback by modifying the `$route` parameter. This is perfect if you just want to display a view quickly - or change the callback depending
-on some criteria's for the request.
-
-The callback below will fire immediately after the `Middleware` or `ExceptionHandler` has been loaded, as they are loaded before the route is rendered.
-If you wish to change the callback from outside, please have this in mind.
-
-The example below will render `DefaultController@notFound` regardless of the url.
-
-**NOTE: Use this method if you want to load another controller. No additional middlewares or rules will be loaded.**
-
-##### Middleware example
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-class CustomMiddleware implements IMiddleware {
-
-    public function handle(Request $request) {
-
-        $request->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
-        return $request;
-
-    }
-
-}
-```
-
-##### Exception handler example
-
-```php
-namespace Demo\Handlers;
-
-use Pecee\Handlers\IExceptionHandler;
-use Pecee\Http\Request;
-use Pecee\SimpleRouter\Exceptions\NotFoundHttpException;
-
-class CustomExceptionHandler implements IExceptionHandler
-{
-	public function handleError(Request $request, \Exception $error)
-	{
-		/* The router will throw the NotFoundHttpException on 404 */
-		if($error instanceof NotFoundHttpException) {
-
-			/*
-			 * Render your own custom 404-view, rewrite the request to another route,
-			 * or simply return the $request object to ignore the error and continue on rendering the route.
-			 *
-			 * The code below will make the router render our page.notfound route.
-			 */
-
-			$request->setRewriteCallback('Demo\Controllers\DefaultController@notFound');
-			return $request;
-
-		}
-
-		throw $error;
-
-	}
-
-}
-```
-
-### Rewrite using url
-
-The example below will cause the router to reload the request and reinitialize all the routes. This method is slower, but will ensure that all middlewares and rules for the route is loaded.
-
-This method is useful if you want to redirect a url to another-url which is dependent on a middleware. You can also add a custom rule by calling `$request->setRewriteRoute($route)` if
-you want to customize request-methods or use another route-type like `RouteController` etc.
-
-We are using the `url()` helper function to get the uri to another route added in the `routes.php` file.
-
-**NOTE: Use this method if you want to fully load another route using it's settings (request method, middlewares etc).**
-
-##### Middleware example
-
-The example below will redirect the request to the `home`-route.
-
-```php
-namespace Demo\Middlewares;
-
-use Pecee\Http\Middleware\IMiddleware;
-use Pecee\Http\Request;
-
-class CustomMiddleware implements IMiddleware {
-
-    public function handle(Request $request) {
-
-        $request->setRewriteUrl(url('home'));
-        return $request;
-
-    }
-}
+request()->setRewriteUrl('/my-rewrite-url');
 ```
 
 ### Bootmanager: loading routes dynamically
@@ -1282,7 +1175,6 @@ class CustomRouterRules implement IRouterBootManager {
 
             if($request->getUri()->getPath() === $url) {
                 $request->setRewriteUrl($rule);
-                return $request;
             }
         }
 

composer.json

@@ -9,7 +9,12 @@
     "simple-php-router",
     "laravel",
     "pecee",
-    "php"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
   ],
   "license": "MIT",
   "support": {

helpers.php

@@ -18,6 +18,7 @@ use Pecee\SimpleRouter\SimpleRouter as Router;
  * @param string|array|null $parameters
  * @param array|null $getParams
  * @return string
+ * @throws \InvalidArgumentException
  */
 function url($name = null, $parameters = null, $getParams = null)
 {

src/Pecee/Http/Input/Input.php

@@ -254,7 +254,7 @@ class Input
      */
     public function all(array $filter = null)
     {
-        $output = $_GET;
+        $output = $_GET + $_POST;
 
         if ($this->request->getMethod() === 'post') {
 
@@ -263,7 +263,7 @@ class Input
             if (strpos(trim($contents), '{') === 0) {
                 $post = json_decode($contents, true);
                 if ($post !== false) {
-                    $output = array_merge($output, $post);
+                    $output += $post;
                 }
             }
         }

src/Pecee/Http/Input/InputFile.php

@@ -9,13 +9,15 @@ class InputFile implements IInputItem
     public $filename;
     public $size;
     public $type;
-    public $error;
+    public $errors;
     public $tmpName;
 
     public function __construct($index)
     {
         $this->index = $index;
 
+        $this->errors = 0;
+
         // Make the name human friendly, by replace _ with space
         $this->name = ucfirst(str_replace('_', ' ', strtolower($this->index)));
     }
@@ -216,7 +218,7 @@ class InputFile implements IInputItem
      */
     public function getError()
     {
-        return $this->error;
+        return $this->errors;
     }
 
     /**
@@ -227,7 +229,7 @@ class InputFile implements IInputItem
      */
     public function setError($error)
     {
-        $this->error = (int)$error;
+        $this->errors = (int)$error;
 
         return $this;
     }
@@ -269,7 +271,7 @@ class InputFile implements IInputItem
             'type'     => $this->type,
             'size'     => $this->size,
             'name'     => $this->name,
-            'error'    => $this->error,
+            'error'    => $this->errors,
             'filename' => $this->filename,
         ];
     }

src/Pecee/Http/Request.php

@@ -16,6 +16,8 @@ class Request
     protected $method;
     protected $input;
 
+    protected $hasRewrite = false;
+
     /**
      * @var ILoadableRoute|null
      */
@@ -36,7 +38,7 @@ class Request
         $this->setUri(new Uri($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
 
         $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
     }
 
     protected function parseHeaders()
@@ -231,6 +233,7 @@ class Request
      */
     public function setRewriteRoute(ILoadableRoute $route)
     {
+        $this->hasRewrite = true;
         $this->rewriteRoute = SimpleRouter::addDefaultNamespace($route);
 
         return $this;
@@ -264,7 +267,8 @@ class Request
      */
     public function setRewriteUrl($rewriteUrl)
     {
-        $this->rewriteUrl = $rewriteUrl;
+        $this->hasRewrite = true;
+        $this->rewriteUrl = rtrim($rewriteUrl, '/') . '/';
 
         return $this;
     }
@@ -276,7 +280,9 @@ class Request
      */
     public function setRewriteCallback($callback)
     {
-        return $this->setRewriteRoute(new RouteUrl($this->uri, $callback));
+        $this->hasRewrite = true;
+
+        return $this->setRewriteRoute(new RouteUrl($this->getUri()->getPath(), $callback));
     }
 
     /**
@@ -301,6 +307,23 @@ class Request
         return $this;
     }
 
+    public function hasRewrite()
+    {
+        return $this->hasRewrite;
+    }
+
+    public function setHasRewrite($value)
+    {
+        $this->hasRewrite = $value;
+
+        return $this;
+    }
+
+    public function isRewrite($url)
+    {
+        return ($this->rewriteUrl === $url);
+    }
+
     public function __isset($name)
     {
         return array_key_exists($name, $this->data);

src/Pecee/Http/Response.php

@@ -37,12 +37,12 @@ class Response
         }
 
         $this->header('location: ' . $url);
-        die();
+        exit(0);
     }
 
     public function refresh()
     {
-        $this->redirect($this->request->getUri()->getPath());
+        $this->redirect($this->request->getUri()->getOriginalUrl());
     }
 
     /**

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -28,15 +28,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      */
     public function loadMiddleware(Request $request)
     {
-        $max = count($this->getMiddlewares());
-
-        if ($max === 0) {
-            return;
-        }
-
-        for ($i = 0; $i < $max; $i++) {
-
-            $middleware = $this->getMiddlewares()[$i];
+        foreach ($this->getMiddlewares() as $middleware) {
 
             if (is_object($middleware) === false) {
                 $middleware = $this->loadClass($middleware);

src/Pecee/SimpleRouter/Route/Route.php

@@ -33,7 +33,7 @@ abstract class Route implements IRoute
      *
      * @var bool
      */
-    protected $filterEmptyParams = false;
+    protected $filterEmptyParams = true;
 
     /**
      * Default regular expression used for parsing parameters.
@@ -86,12 +86,20 @@ abstract class Route implements IRoute
             return null;
         }
 
+        $parameters = $this->getParameters();
+
+        /* Filter parameters with null-value */
+
+        if ($this->filterEmptyParams === true) {
+            $parameters = array_filter($parameters, function ($var) {
+                return ($var !== null);
+            });
+        }
+
         /* Render callback function */
         if (is_callable($callback) === true) {
-
             /* When the callback is a function */
-            return call_user_func_array($callback, $this->getParameters());
-
+            return call_user_func_array($callback, $parameters);
         }
 
         /* When the callback is a class + method */
@@ -108,16 +116,6 @@ abstract class Route implements IRoute
             throw new NotFoundHttpException(sprintf('Method "%s" does not exist in class "%s"', $method, $className), 404);
         }
 
-        $parameters = $this->getParameters();
-
-        /* Filter parameters with null-value */
-
-        if ($this->filterEmptyParams === true) {
-            $parameters = array_filter($parameters, function ($var) {
-                return ($var !== null);
-            });
-        }
-
         return call_user_func_array([$class, $method], $parameters);
     }
 
@@ -130,7 +128,7 @@ abstract class Route implements IRoute
         // Ensures that hostnames/domains will work with parameters
         $url = '/' . ltrim($url, '/');
 
-        if (preg_match_all('/' . $regex . '/u', $route, $parameters) > 0) {
+        if (preg_match_all('/' . $regex . '/u', $route, $parameters) !== 0) {
 
             $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', $route);
 
@@ -168,22 +166,21 @@ abstract class Route implements IRoute
             $urlRegex = preg_quote($route, '/');
         }
 
-        if (preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) > 0) {
-
-            $values = [];
-
-            if (isset($parameters[1]) === true) {
-
-                /* Only take matched parameters with name */
-                foreach ((array)$parameters[1] as $name) {
-                    $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
-                }
-            }
-
-            return $values;
+        if (preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === 0) {
+            return null;
         }
 
-        return null;
+        $values = [];
+
+        if (isset($parameters[1]) === true) {
+
+            /* Only take matched parameters with name */
+            foreach ((array)$parameters[1] as $name) {
+                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+            }
+        }
+
+        return $values;
     }
 
     /**
@@ -545,7 +542,7 @@ abstract class Route implements IRoute
     }
 
     /**
-     * @return string|array
+     * @return array
      */
     public function getMiddlewares()
     {

src/Pecee/SimpleRouter/Router.php

@@ -16,12 +16,6 @@ use Pecee\SimpleRouter\Route\IRoute;
 class Router
 {
 
-    /**
-     * The instance of this class
-     * @var static
-     */
-    protected static $instance;
-
     /**
      * Current request
      * @var Request
@@ -119,15 +113,12 @@ class Router
     protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
     {
         // Loop through each route-request
-        $max = count($routes) - 1;
 
         $exceptionHandlers = [];
 
         $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
 
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $routes[$i];
+        foreach ($routes as $route) {
 
             if ($parent !== null) {
 
@@ -202,15 +193,9 @@ class Router
     public function loadRoutes()
     {
         /* Initialize boot-managers */
-        if (count($this->bootManagers) !== 0) {
-
-            $max = count($this->bootManagers) - 1;
-
-            /* @var $manager IRouterBootManager */
-            for ($i = $max; $i >= 0; $i--) {
-                $manager = $this->bootManagers[$i];
-                $manager->boot($this->request);
-            }
+        /* @var $manager IRouterBootManager */
+        foreach ($this->bootManagers as $manager) {
+            $manager->boot($this->request);
         }
 
         /* Loop through each route-request */
@@ -239,16 +224,14 @@ class Router
                     /* Verify csrf token for request */
                     $this->csrfVerifier->handle($this->request);
                 }
+            } else {
+                $this->request->setHasRewrite(false);
             }
 
             $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
 
-            $max = count($this->processedRoutes) - 1;
-
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $key => $route) {
 
                 /* If the route matches */
                 if ($route->matchRoute($url, $this->request) === true) {
@@ -261,29 +244,28 @@ class Router
 
                     $route->loadMiddleware($this->request);
 
-                    $rewriteRoute = $this->request->getRewriteRoute();
-
-                    if ($rewriteRoute !== null) {
-                        $rewriteRoute->loadMiddleware($this->request);
-
-                        return $rewriteRoute->renderRoute($this->request);
-                    }
-
-                    /* If the request has changed */
-                    $rewriteUrl = $this->request->getRewriteUrl();
-
-                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                        unset($this->processedRoutes[$i]);
-                        $this->processedRoutes = array_values($this->processedRoutes);
+                    if ($this->hasRewrite($url) === true) {
+                        unset($this->processedRoutes[$key]);
 
                         return $this->routeRequest(true);
                     }
 
                     /* Render route */
                     $routeNotAllowed = false;
+
                     $this->request->setLoadedRoute($route);
 
-                    return $route->renderRoute($this->request);
+                    $output = $route->renderRoute($this->request);
+
+                    if ($output !== null) {
+                        return $output;
+                    }
+
+                    if ($this->hasRewrite($url) === true) {
+                        unset($this->processedRoutes[$key]);
+
+                        return $this->routeRequest(true);
+                    }
                 }
             }
 
@@ -312,6 +294,31 @@ class Router
         return null;
     }
 
+    protected function hasRewrite($url)
+    {
+
+        /* If the request has changed */
+        if ($this->request->hasRewrite() === true) {
+
+            if ($this->request->getRewriteRoute() !== null) {
+                /* Render rewrite-route */
+                $this->processedRoutes[] = $this->request->getRewriteRoute();
+
+                return true;
+            }
+
+            if ($this->request->isRewrite($url) === false) {
+
+                /* Render rewrite-url */
+                $this->processedRoutes = array_values($this->processedRoutes);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param \Exception $e
      * @throws HttpException
@@ -320,8 +327,6 @@ class Router
      */
     protected function handleException(\Exception $e)
     {
-        $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
-
         /* @var $handler IExceptionHandler */
         foreach ($this->exceptionHandlers as $key => $handler) {
 
@@ -335,25 +340,13 @@ class Router
 
             try {
 
-                if ($handler->handleError($this->request, $e) !== null) {
+                $handler->handleError($this->request, $e);
 
-                    $rewriteRoute = $this->request->getRewriteRoute();
+                if ($this->request->hasRewrite() === true) {
+                    unset($this->exceptionHandlers[$key]);
+                    $this->exceptionHandlers = array_values($this->exceptionHandlers);
 
-                    if ($rewriteRoute !== null) {
-                        $rewriteRoute->loadMiddleware($this->request);
-
-                        return $rewriteRoute->renderRoute($this->request);
-                    }
-
-                    $rewriteUrl = $this->request->getRewriteUrl();
-
-                    /* If the request has changed */
-                    if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                        unset($this->exceptionHandlers[$key]);
-                        $this->exceptionHandlers = array_values($this->exceptionHandlers);
-
-                        return $this->routeRequest(true);
-                    }
+                    return $this->routeRequest(true);
                 }
 
             } catch (\Exception $e) {
@@ -388,12 +381,8 @@ class Router
      */
     public function findRoute($name)
     {
-        $max = count($this->processedRoutes) - 1;
-
         /* @var $route ILoadableRoute */
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $this->processedRoutes[$i];
+        foreach ($this->processedRoutes as $route) {
 
             /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
             if ($route->hasName($name)) {
@@ -492,12 +481,8 @@ class Router
 
             /* Loop through all the routes to see if we can find a match */
 
-            $max = count($this->processedRoutes) - 1;
-
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $route) {
 
                 /* Check if the route contains the name/alias */
                 if ($route->hasName($controller) === true) {
@@ -545,6 +530,16 @@ class Router
         $this->bootManagers[] = $bootManager;
     }
 
+    /**
+     * Get routes that has been processed.
+     *
+     * @return array
+     */
+    public function getProcessedRoutes()
+    {
+        return $this->processedRoutes;
+    }
+
     /**
      * @return array
      */

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -367,7 +367,7 @@ class SimpleRouter
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \Exception
+     * @throws \InvalidArgumentException
      * @return string
      */
     public static function getUrl($name = null, $parameters = null, $getParams = null)

test/Dummy/Middlewares/RewriteMiddleware.php

@@ -0,0 +1,16 @@
+<?php
+
+use Pecee\Http\Middleware\IMiddleware;
+use Pecee\Http\Request;
+
+class RewriteMiddleware implements IMiddleware {
+
+    public function handle(Request $request) {
+
+        $request->setRewriteCallback(function() {
+            return 'ok';
+        });
+
+    }
+
+}

test/RouterRewriteTest.php

@@ -5,6 +5,7 @@ require_once 'Dummy/Handler/ExceptionHandlerFirst.php';
 require_once 'Dummy/Handler/ExceptionHandlerSecond.php';
 require_once 'Dummy/Handler/ExceptionHandlerThird.php';
 require_once 'Helpers/TestRouter.php';
+require_once 'Dummy/Middlewares/RewriteMiddleware.php';
 
 class RouteRewriteTest extends PHPUnit_Framework_TestCase
 {
@@ -33,9 +34,9 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
         global $stack;
         $stack = [];
 
-        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () {
+        TestRouter::group(['exceptionHandler' => [ExceptionHandlerFirst::class, ExceptionHandlerSecond::class]], function () use ($stack) {
 
-            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () {
+            TestRouter::group(['exceptionHandler' => ExceptionHandlerThird::class], function () use ($stack) {
 
                 TestRouter::get('/my-path', 'DummyController@method1');
 
@@ -64,10 +65,8 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
 
         TestRouter::error(function (\Pecee\Http\Request $request, \Exception $error) {
 
-            if (strtolower($request->getUri()->getPath()) == '/my/test') {
+            if (strtolower($request->getUri()->getPath()) === '/my/test/') {
                 $request->setRewriteUrl('/another-non-existing');
-
-                return $request;
             }
 
         });
@@ -75,4 +74,104 @@ class RouteRewriteTest extends PHPUnit_Framework_TestCase
         TestRouter::debug('/my/test', 'get');
     }
 
+    public function testRewriteUrlFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            echo 'ok';
+        });
+
+        TestRouter::get('/new2', function () {
+            echo 'ok';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteCallbackFromRoute()
+    {
+
+        TestRouter::get('/old', function () {
+            TestRouter::request()->setRewriteUrl('/new');
+        });
+
+        TestRouter::get('/new', function () {
+            return 'ok';
+        });
+
+        TestRouter::get('/new1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new/2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/old');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testRewriteRouteFromRoute()
+    {
+
+        TestRouter::get('/match', function () {
+            TestRouter::request()->setRewriteRoute(new \Pecee\SimpleRouter\Route\RouteUrl('/match', function () {
+                return 'ok';
+            }));
+        });
+
+        TestRouter::get('/old1', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/old/2', function () {
+            return 'fail';
+        });
+
+        TestRouter::get('/new2', function () {
+            return 'fail';
+        });
+
+        $output = TestRouter::debugOutput('/match');
+
+        TestRouter::router()->reset();
+
+        $this->assertEquals('ok', $output);
+
+    }
+
+    public function testMiddlewareRewrite()
+    {
+
+        TestRouter::group(['middleware' => 'RewriteMiddleware'], function () {
+            TestRouter::get('/', function () {
+                return 'fail';
+            });
+
+            TestRouter::get('no/match', function () {
+                return 'fail';
+            });
+        });
+
+        $output = TestRouter::debugOutput('/');
+
+        $this->assertEquals('ok', $output);
+
+    }
+
 }

test/RouterRouteTest.php

@@ -125,6 +125,20 @@ class RouterRouteTest extends PHPUnit_Framework_TestCase
         TestRouter::debug('/my/custom-path', 'get');
     }
 
+    public function testParameterDefaultValue() {
+
+        $defaultVariable = null;
+
+        TestRouter::get('/my/{path?}', function($path = 'working') use(&$defaultVariable) {
+            $defaultVariable = $path;
+        });
+
+        TestRouter::debug('/my/');
+
+        $this->assertEquals('working', $defaultVariable);
+
+    }
+
     public function testDefaultParameterRegex()
     {
         TestRouter::get('/my/{path}', 'DummyController@param', ['defaultParameterRegex' => '[\w\-]+']);