Merge pull request #103 from antoine-pous/master

Merge config params with query params #101
dannyvankooten · Mar 9, 2017 · 5c5831e · 5c5831e
2 parents 10f6590 + 46bf0cd
commit 5c5831e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Route.php b/src/Route.php
@@ -85,6 +85,7 @@ public function __construct($resource, array $config)
         $this->methods = isset($config['methods']) ? (array) $config['methods'] : array();
         $this->target  = isset($config['target']) ? $config['target'] : null;
         $this->name    = isset($config['name']) ? $config['name'] : null;
+        $this->parameters = isset($config['parameters']) ? $config['parameters'] : array();
     }
 
     public function getUrl()
@@ -161,7 +162,7 @@ public function getParameters()
 
     public function setParameters(array $parameters)
     {
-        $this->parameters = $parameters;
+        $this->parameters = array_merge($this->parameters, $parameters);
     }
 
     public function dispatch()