Merge pull request #111 from skipperbent/development

Automatically push middlewares if multiple in nested group.
This commit is contained in:
Simon Sessingø
2016-09-28 12:24:38 +02:00
committed by GitHub

View File

@@ -93,9 +93,23 @@ class RouterGroup extends RouterEntry {
unset($settings['namespace']);
}
// Push middleware if multiple
if($this->getMiddleware() !== null && isset($settings['middleware'])) {
if(!is_array($this->getMiddleware())) {
$middlewares = [$this->getMiddleware(), $settings['middleware']];
} else {
$middlewares = array_push($settings['middleware']);
}
$settings['middleware'] = array_unique($middlewares);
}
if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings);
}
return $this;
}