Merge pull request #28 from skipperbent/development

[BUGFIX] Fixed routeMatch in RouterEntry not matching routes with multiple arguments.
[BUGFIX] Fixed routeMatch in RouterEntry not matching routes with multiple
2026-07-01 15:29:58 +00:00 · 2015-11-14 22:22:00 +01:00 · 2015-11-14 22:21:11 +01:00 · 2015-11-02 08:09:43 +01:00 · 2015-11-02 08:09:13 +01:00 · 2015-11-02 08:08:49 +01:00
2 changed files with 1 additions and 3 deletions
@@ -29,8 +29,6 @@ class RouterGroup extends RouterEntry {
                throw new RouterException('Method not allowed');
            }

-            $this->loadMiddleware($request);
-
            return parent::renderRoute($request);
        }

@@ -44,7 +44,7 @@ class RouterRoute extends RouterEntry {

        $route = $this->url;

-        $routeMatch = preg_replace('/'.self::PARAMETERS_REGEX_MATCH.'/is', '', $route);
+        $routeMatch = preg_replace('/\/{0,1}'.self::PARAMETERS_REGEX_MATCH.'\/{0,1}/is', '', $route);

        // Check if url parameter count matches
        if(stripos($url, $routeMatch) === 0) {
Author	SHA1	Message	Date
Simon Sessingø	2c8e65f25b	Merge pull request #28 from skipperbent/development [BUGFIX] Fixed routeMatch in RouterEntry not matching routes with multiple arguments.	2015-11-14 22:22:00 +01:00
Simon Sessingø	eb93584d85	[BUGFIX] Fixed routeMatch in RouterEntry not matching routes with multiple arguments.	2015-11-14 22:21:11 +01:00
Simon Sessingø	bd5d17b6fb	Merge pull request #27 from skipperbent/development [TASK] Removed Pecee folder.	2015-11-02 08:09:43 +01:00
Simon Sessingø	7c0ac390fd	[TASK] Undid changes to composer.json	2015-11-02 08:09:13 +01:00
Simon Sessingø	3fc81b6492	[TASK] Readded Pecee folder.	2015-11-02 08:08:49 +01:00
Simon Sessingø	b400b86322	[TASK] Removed Pecee folder.	2015-11-02 08:06:49 +01:00
Simon Sessingø	1d338e9aa9	Merge pull request #26 from skipperbent/development [OPTIMISATION] Fixed Group only loading middleware when initialised.	2015-11-01 10:24:51 +01:00
Simon Sessingø	889ceaa37f	[OPTIMISATION] Fixed Group only loading middleware when initialised.	2015-11-01 10:24:05 +01:00