Callback, faking route and documentation updates

This commit is contained in:
Simon Sessingø
2016-11-15 05:44:24 +01:00
parent bc14790a67
commit 83c73a4240
8 changed files with 131 additions and 50 deletions
+2 -2
View File
@@ -113,8 +113,8 @@ class RouterGroup extends RouterEntry {
// Push middleware if multiple
if ($this->getMiddleware() !== null && isset($settings['middleware'])) {
if (!is_array($this->getMiddleware())) {
$settings['middleware'] = array($this->getMiddleware(), $settings['middleware']);
if (!is_array($settings['middleware'])) {
$settings['middleware'] = array_merge($this->getMiddleware(), array($settings['middleware']));
} else {
$settings['middleware'][] = $this->getMiddleware();
}