8000 Prepend Child Bundle paths before the parent by trsteel88 · Pull Request #9112 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Prepend Child Bundle paths before the parent #9112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Prepend Child Bundle paths before the parent #9112

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ebcf66
Prepend Child Bundle paths before the parent - fixes #9085
trsteel88 Sep 24, 2013
db3a041
reverse the other of the dirs as they are prepended
trsteel88 Sep 24, 2013
75686e6
remove the prepended kernel root resources directory as you can just …
trsteel88 Sep 24, 2013
a62debb
remove method check
trsteel88 Sep 24, 2013
f3e8c6a
remove line break
trsteel88 Sep 24, 2013
59840e3
add method to sort bundles by child first. remove the need for prepen…
trsteel88 Sep 24, 2013
bbb78d3
use getPath() from bundle instance. prepend child app Resource path t…
trsteel88 Sep 24, 2013
98fc660
remove unused var
trsteel88 Sep 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
View file
Open in desktop
F0BB
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,26 @@ public function load(array $configs, ContainerBuilder $container)
}

// register bundles as Twig namespaces
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
$bundles = $this->getBundlesByChildPriority($container);
foreach ($bundles as $bundle => $bundleReflection) {
/** @var \Symfony\Component\HttpKernel\Bundle\BundleInterface $bundleInstance */
$bundleInstance = $bundleReflection->newInstance();

if (null !== $parentBundle = $bundleInstance->getParent()) {
if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views')) {
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $parentBundle);
}

if (is_dir($dir = $bundleInstance->getPath().'/Resources/views')) {
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $parentBundle);
}
}

if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views')) {
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
}

$reflection = new \ReflectionClass($class);
if (is_dir($dir = dirname($reflection->getFilename()).'/Resources/views')) {
if (is_dir($dir = $bundleInstance->getPath().'/Resources/views')) {
$this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
}
}
Expand Down Expand Up @@ -130,12 +143,36 @@ public function load(array $configs, ContainerBuilder $container)
));
}

/**
* @param ContainerBuilder $container
* @return array | \ReflectionClass[]
*/
private function getBundlesByChildPriority(ContainerBuilder $container)
{
$childBundles = array();
$parentBundles = array();

foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
$reflection = new \ReflectionClass($class);

$bundleInstance = $reflection->newInstance();
if (null === $bundleInstance->getParent()) {
$parentBundles[$bundle] = $reflection;
} else {
$childBundles[$bundle] = $reflection;
}
}

return array_merge($childBundles, $parentBundles);
}

private function addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle)
{
$name = $bundle;
if ('Bundle' === substr($name, -6)) {
$name = substr($name, 0, -6);
}

$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir, $name));
}

Expand Down
0