Merge pull request #63 from skipperbent/development

[OPTIMISATION] Parameters matching optimisations.
2026-06-19 09:41:25 +00:00 · 2016-01-15 10:22:14 +01:00 · 2016-01-15 10:20:50 +01:00 · 2016-01-15 10:07:51 +01:00 · 2016-01-15 10:06:13 +01:00 · 2016-01-15 09:39:28 +01:00
3 changed files with 4 additions and 14 deletions
@@ -178,10 +178,6 @@ abstract class RouterEntry {
    public function getMergeableSettings() {
        $settings = $this->settings;

-        /*if(isset($settings['middleware'])) {
-            unset($settings['middleware']);
-        }*/
-
        if(isset($settings['prefix'])) {
            unset($settings['prefix']);
        }
@@ -242,7 +238,7 @@ abstract class RouterEntry {
        return new $name();
    }

-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]*?') {
+    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+?') {
        $parameterNames = array();
        $regex = '';
        $lastCharacter = '';
@@ -278,7 +274,7 @@ abstract class RouterEntry {

                if($lastCharacter === '?') {
                    $parameter = substr($parameter, 0, strlen($parameter)-1);
-                    $regex .= '\\/(?:(?P<'.$parameter.'>[^\/]*)\\/?)';
+                    $regex .= '(?:\\/?(?P<'.$parameter.'>[^\/]+)?\\/?)';
                    $required = false;
                } else {
                    $regex .= '\\/(?P<' . $parameter . '>'. $parameterRegex .')\\/';
@@ -51,7 +51,7 @@ class RouterResource extends RouterEntry {

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

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

        if($parameters !== null) {

@@ -40,13 +40,7 @@ class RouterRoute extends RouterEntry {
        $parameters = $this->parseParameters($route, $url);

        if($parameters !== null) {
-
-            //if(is_array($this->parameters)) {
-            //    $this->parameters = array_merge($this->parameters, $parameters);
-            //} else {
-                $this->parameters = $parameters;
-            //}
-
+            $this->parameters = $parameters;
            return true;
        }
Author	SHA1	Message	Date
Simon Sessingø	4267cb8751	Merge pull request #63 from skipperbent/development [OPTIMISATION] Parameters matching optimisations.	2016-01-15 10:22:14 +01:00
Simon Sessingø	714edf7902	[OPTIMISATION] Parameters matching optimisations.	2016-01-15 10:20:50 +01:00
Simon Sessingø	c3b12ba053	Merge pull request #62 from skipperbent/development Development	2016-01-15 10:07:51 +01:00
Simon Sessingø	b096742d6b	[BUGFIX] Enchanched regular expression for optinal parameters to completely ignore path seperators (/).	2016-01-15 10:06:13 +01:00
Simon Sessingø	3298970798	Merge pull request #61 from skipperbent/development [BUGFIX] Fixed some ressources not working after latest update.	2016-01-15 09:39:28 +01:00
Simon Sessingø	bb6f56ef8c	[BUGFIX] Fixed some ressources not working after latest update. - Optimisations + cleanup.	2016-01-15 09:37:23 +01:00