Merge remote branch 'beberlei/YamlRoutingLoader'
* beberlei/YamlRoutingLoader: [Routing] Remove exception condition in YamlFileLoader::load() as its duplicating a check that is done in parseRoute() anyways. This changes allows to extend the YamlFileLoader without having to duplicate the whole method.
This commit is contained in:
commit
ac1bde9003
@ -65,10 +65,8 @@ class YamlFileLoader extends FileLoader
|
|||||||
$prefix = isset($config['prefix']) ? $config['prefix'] : null;
|
$prefix = isset($config['prefix']) ? $config['prefix'] : null;
|
||||||
$this->setCurrentDir(dirname($path));
|
$this->setCurrentDir(dirname($path));
|
||||||
$collection->addCollection($this->import($config['resource'], $type, false, $file), $prefix);
|
$collection->addCollection($this->import($config['resource'], $type, false, $file), $prefix);
|
||||||
} elseif (isset($config['pattern'])) {
|
|
||||||
$this->parseRoute($collection, $name, $config, $path);
|
|
||||||
} else {
|
} else {
|
||||||
throw new \InvalidArgumentException(sprintf('Unable to parse the "%s" route.', $name));
|
$this->parseRoute($collection, $name, $config, $path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user