Development

- Added new Redirect method to SimpleRouter class.
- Changed method-names in InputHandler for better description.
- Fixed return-types for InputHandler for collections.
- Added unit-tests for InputHandler (get, post).
- Optimisations.

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -120,9 +120,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             $url = '//' . $group->getDomains()[0] . $url;
         }
 
-        /* Contains parameters that aren't recognized and will be appended at the end of the url */
-        $unknownParams = [];
-
         /* Create the param string - {parameter} */
         $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
@@ -142,7 +139,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                 $value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
 
                 /* If parameter is specifically set to null - use the original-defined value */
-                if ($value === null && isset($this->originalParameters[$param])) {
+                if ($value === null && isset($this->originalParameters[$param]) === true) {
                     $value = $this->originalParameters[$param];
                 }
             }
@@ -151,13 +148,12 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
                 /* Add parameter to the correct position */
                 $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
             } else {
-                $unknownParams[$param] = $value;
+                /* Parameter aren't recognized and will be appended at the end of the url */
+                $url .= $value . '/';
             }
         }
 
-        $url = '/' . ltrim($url, '/') . implode('/', $unknownParams);
-
-        return rtrim($url, '/') . '/';
+        return rtrim('/' . ltrim($url, '/'), '/') . '/';
     }
 
     /**
@@ -254,9 +250,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             $this->prependUrl($values['prefix']);
         }
 
-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
     }
 
 }

src/Pecee/SimpleRouter/Route/Route.php

@@ -76,7 +76,9 @@ abstract class Route implements IRoute
         }
 
         $router->debug('Parsing parameters');
+
         $parameters = $this->getParameters();
+
         $router->debug('Finished parsing parameters');
 
         /* Filter parameters with null-value */
@@ -118,14 +120,17 @@ abstract class Route implements IRoute
 
     protected function parseParameters($route, $url, $parameterRegex = null)
     {
-        $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
-
-        $parameters = [];
+        $regex = null;
+        if (strpos($route, $this->paramModifiers[0]) !== false) {
+            $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
+        }
 
         // Ensures that host names/domains will work with parameters
         $url = '/' . ltrim($url, '/');
+        $urlRegex = null;
+        $parameters = [];
 
-        if ((bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
+        if ($regex === null || (bool)preg_match_all('/' . $regex . '/u', $route, $parameters) === false) {
             $urlRegex = preg_quote($route, '/');
         } else {
 
@@ -155,14 +160,11 @@ abstract class Route implements IRoute
                     $regex = sprintf('(?:\/|\-)%1$s(?P<%2$s>%3$s)%1$s', $parameters[2][$key], $name, $regex);
                 }
 
-                $urlParts[$key] = preg_quote($t, '/') . $regex;
+                $urlRegex .= preg_quote($t, '/') . $regex;
             }
-
-            $urlRegex = implode('', $urlParts);
-
         }
 
-        if ((bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
+        if ($urlRegex === null || (bool)preg_match(sprintf($this->urlRegex, $urlRegex), $url, $matches) === false) {
             return null;
         }
 
@@ -247,9 +249,8 @@ abstract class Route implements IRoute
         $this->group = $group;
 
         /* Add/merge parent settings with child */
-        $this->setSettings($group->toArray(), true);
 
-        return $this;
+        return $this->setSettings($group->toArray(), true);
     }
 
     /**

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -95,7 +95,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
-        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtoupper($url) !== strtoupper($this->url))) {
             return false;
         }
 
@@ -177,9 +177,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
             $this->names = $values['names'];
         }
 
-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
     }
 
 }

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -173,9 +173,7 @@ class RouteGroup extends Route implements IGroupRoute
             $this->name = $name;
         }
 
-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
     }
 
     /**

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -92,7 +92,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
-        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtoupper($url) !== strtoupper($this->url))) {
             return false;
         }
 
@@ -224,9 +224,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
             $this->methodNames = $values['methods'];
         }
 
-        parent::setSettings($values, $merge);
-
-        return $this;
+        return parent::setSettings($values, $merge);
     }
 
 }