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

fix kernel:locateResource to loop accross the bundle tree to find the first match

Browse Source
This commit is contained in:
Thomas 2011-01-21 11:09:32 +01:00 committed by Fabien Potencier
parent 0b0c15b7b6
commit dd20434227
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -295,25 +295,20 @@ abstract class Kernel implements HttpKernelInterface, \Serializable
$isResource = 0 === strpos($path, 'Resources');
// return the first matching one
if (true === $first) {
if (true === $isResource && null !== $dir && is_file($file = $dir.'/'.$bundle.'/'.substr($path, 10))) {
return $file;
} elseif (is_file($file = $this->getBundle($bundle)->getPath().'/'.$path)) {
$files = array();
if (true === $isResource && null !== $dir && is_file($file = $dir.'/'.$bundle.'/'.substr($path, 10))) {
if ($first) {
return $file;
}
throw new \InvalidArgumentException(sprintf('Unable to find file "@%s".', $name));
}
// return them all
$files = array();
if (true === $isResource && null !== $dir && is_file($file = $dir.'/'.$bundle.'/'.substr($path, 10))) {
$files[] = $file;
}
foreach ($this->getBundle($bundle, false) as $bundle) {
if (is_file($file = $bundle->getPath().'/'.$path)) {
if ($first) {
return $file;
}
$files[] = $file;
}
}