Merge pull request #146 from skipperbent/v2

V2

src/Pecee/SimpleRouter/LoadableRoute.php

@@ -22,13 +22,11 @@ abstract class LoadableRoute extends RouterEntry implements ILoadableRoute {
         $this->url = '/' . trim($url, '/') . '/';
 
         if(preg_match_all('/' . static::PARAMETERS_REGEX_MATCH . '/is', $this->url, $matches)) {
-
             if (count($matches[1])) {
-                foreach (array_keys($matches[1]) as $key) {
+                foreach ($matches[1] as $key) {
                     $this->parameters[$key] = null;
                 }
             }
-
         }
 
         return $this;

src/Pecee/SimpleRouter/RouterController.php

@@ -12,7 +12,7 @@ class RouterController extends LoadableRoute implements IControllerRoute {
     protected $method;
 
     public function __construct($url, $controller) {
-        $this->url = $url;
+        $this->setUrl($url);
         $this->controller = $controller;
     }
 

src/Pecee/SimpleRouter/RouterResource.php

@@ -9,7 +9,7 @@ class RouterResource extends LoadableRoute implements IControllerRoute {
     protected $controller;
 
     public function __construct($url, $controller) {
-        $this->url = $url;
+        $this->setUrl($url);
         $this->controller = $controller;
     }