Merge pull request #108 from skipperbent/development

Allow for default parameters (including A-Z, a-z, 0-9 and "-") when p…
Allow for default parameters (including A-Z, a-z, 0-9 and "-") when parsing parameters in RouterResource.
2026-06-29 14:39:17 +00:00 · 2016-06-14 22:21:20 +02:00 · 2016-06-14 22:20:05 +02:00 · 2016-06-04 18:44:59 +02:00 · 2016-06-04 18:44:33 +02:00
2 changed files with 2 additions and 2 deletions
@@ -301,7 +301,7 @@ abstract class RouterEntry {

        $parameterValues = array();

-        if(preg_match('/^'.$regex.'$/is', $url, $parameterValues)) {
+        if(preg_match('/^'.$regex.'\/?$/is', $url, $parameterValues)) {

            $parameters = array();

@@ -52,7 +52,7 @@ class RouterResource extends RouterEntry {

        $route = rtrim($this->url, '/') . '/{id?}/{action?}';

-        $parameters = $this->parseParameters($route, $url, '[0-9]+?');
+        $parameters = $this->parseParameters($route, $url);

        if($parameters !== null) {
Author	SHA1	Message	Date
Simon Sessingø	71dc6e172f	Merge pull request #108 from skipperbent/development Allow for default parameters (including A-Z, a-z, 0-9 and "-") when p…	2016-06-14 22:21:20 +02:00
Simon Sessingø	fab0d0641c	Allow for default parameters (including A-Z, a-z, 0-9 and "-") when parsing parameters in RouterResource.	2016-06-14 22:20:05 +02:00
Simon Sessingø	6ee172927f	Merge pull request #107 from skipperbent/development Bugfix	2016-06-04 18:44:59 +02:00
Simon Sessingø	4169716f87	Bugfix - Fixed some routes with ending slash not matching on when using Ressource.	2016-06-04 18:44:33 +02:00