More development

This commit is contained in:
Simon Sessingø
2016-11-19 05:22:51 +01:00
parent 4e12cb8bc3
commit d4a04920b8
5 changed files with 57 additions and 45 deletions
+11 -5
View File
@@ -77,15 +77,21 @@ abstract class LoadableRoute extends RouterEntry implements ILoadableRoute
return $this;
}
public function setData(array $settings)
/**
* Merge with information from another route.
*
* @param array $values
* @return static
*/
public function merge(array $values)
{
// Change as to alias
if (isset($settings['as'])) {
$this->setAlias($settings['as']);
if (isset($values['as'])) {
$this->setAlias($values['as']);
}
return parent::setData($settings);
parent::merge($values);
return $this;
}
}