Merge pull request #67 from skipperbent/development

Development

Author: skipperbent

src/Pecee/SimpleRouter/RouterEntry.php

@@ -376,7 +376,11 @@ public function renderRoute(Request $request) {
                 throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
             }
 
-            call_user_func_array(array($class, $method), $this->getParameters());
+            $parameters = array_filter($this->getParameters(), function($var){
+                return !is_null($var);
+            });
+
+            call_user_func_array(array($class, $method), $parameters);
 
             return $class;
         }

src/Pecee/SimpleRouter/RouterRoute.php

@@ -40,10 +40,18 @@ public function matchRoute(Request $request) {
         $parameters = $this->parseParameters($route, $url);
 
         if($parameters !== null) {
-            $this->parameters = $parameters;
+
+            if(is_array($this->parameters)) {
+                $this->parameters = array_merge($this->parameters, $parameters);
+            } else {
+                $this->parameters = $parameters;
+            }
+
             return true;
         }
 
+
+
         return null;
     }