Merge pull request #103 from antoine-pous/master

Antoine Pous · web-flow · commit 5c5831e0bad3 · 2017-03-09T22:53:41.000+01:00
Merge config params with query params #101
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()

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public function __construct($resource, array $config)`
`85`	`85`	`$this->methods = isset($config['methods']) ? (array) $config['methods'] : array();`
`86`	`86`	`$this->target = isset($config['target']) ? $config['target'] : null;`
`87`	`87`	`$this->name = isset($config['name']) ? $config['name'] : null;`
	`88`	`+ $this->parameters = isset($config['parameters']) ? $config['parameters'] : array();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`public function getUrl()`
`@@ -161,7 +162,7 @@ public function getParameters()`
`161`	`162`
`162`	`163`	`public function setParameters(array $parameters)`
`163`	`164`	`{`
`164`		`- $this->parameters = $parameters;`
	`165`	`+ $this->parameters = array_merge($this->parameters, $parameters);`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`public function dispatch()`