mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 21:12:14 +00:00
[BUGFIX] Fixed nested groups not merging settings to routes
This commit is contained in:
@@ -91,7 +91,7 @@ class RouterBase {
|
|||||||
if($route instanceof RouterGroup && is_callable($route->getCallback())) {
|
if($route instanceof RouterGroup && is_callable($route->getCallback())) {
|
||||||
$group = $route;
|
$group = $route;
|
||||||
$route->renderRoute($this->request);
|
$route->renderRoute($this->request);
|
||||||
$mergedSettings = array_merge($route->getMergeableSettings(), $settings);
|
$mergedSettings = array_merge($settings, $route->getMergeableSettings());
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->currentRoute = null;
|
$this->currentRoute = null;
|
||||||
|
|||||||
@@ -88,4 +88,18 @@ class RouterGroup extends RouterEntry {
|
|||||||
return $this->domain;
|
return $this->domain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $settings
|
||||||
|
* @return self
|
||||||
|
*/
|
||||||
|
public function addSettings(array $settings = null) {
|
||||||
|
if(isset($settings['namespace'])) {
|
||||||
|
unset($settings['namespace']);
|
||||||
|
}
|
||||||
|
if(is_array($settings)) {
|
||||||
|
$this->settings = array_merge($this->settings, $settings);
|
||||||
|
}
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user