Merge pull request #69 from skipperbent/development

[BUGFIX] Bugfix

src/Pecee/SimpleRouter/RouterController.php

@@ -43,7 +43,7 @@ class RouterController extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {

src/Pecee/SimpleRouter/RouterEntry.php

@@ -248,7 +248,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 = '';
@@ -376,7 +376,11 @@ abstract class RouterEntry {
                 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/RouterResource.php

@@ -46,7 +46,7 @@ class RouterResource extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
@@ -59,7 +59,7 @@ class RouterResource extends RouterEntry {
                 $parameters = array_merge($this->parameters, $parameters);
             }
 
-            $action = $parameters['action'];
+            $action = isset($parameters['action']) ? $parameters['action'] : null;
             unset($parameters['action']);
 
             // Delete

src/Pecee/SimpleRouter/RouterRoute.php

@@ -21,7 +21,7 @@ class RouterRoute extends RouterEntry {
 
     public function matchRoute(Request $request) {
 
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         // Match on custom defined regular expression
@@ -40,10 +40,18 @@ class RouterRoute extends RouterEntry {
         $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;
     }