diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'beberlei/YamlRoutingLoader'

Browse Source 
* 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:
Fabien Potencier 2011-05-22 08:32:12 +02:00
commit ac1bde9003
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View File

@ -65,10 +65,8 @@ class YamlFileLoader extends FileLoader
$prefix = isset($config['prefix']) ? $config['prefix'] : null;
$this->setCurrentDir(dirname($path));
$collection->addCollection($this->import($config['resource'], $type, false, $file), $prefix);
} elseif (isset($config['pattern'])) {
$this->parseRoute($collection, $name, $config, $path);
} else {
throw new \InvalidArgumentException(sprintf('Unable to parse the "%s" route.', $name));
$this->parseRoute($collection, $name, $config, $path);
}
}