symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+1Lines changed: 1 addition & 0 deletions
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * added exclusive Twig namespace only for root bundles
  * deprecated `Symfony\Bundle\TwigBundle\Command\DebugCommand`, use `Symfony\Bridge\Twig\Command\DebugCommand` instead
  * deprecated relying on the `ContainerAwareInterface` implementation for `Symfony\Bundle\TwigBundle\Command\LintCommand`
  * added option to configure default path templates (via `default_path`)
 
@@ -130,6 +130,13 @@ public function load(array $configs, ContainerBuilder $container)
             foreach ($bundle['paths'] as $path) {
                 $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
             }
+
+            // add exclusive namespace for root bundles only
+            // to override a bundle template that also extends itself
+            if (count($bundle['paths']) > 0 && 0 === count($bundle['parents'])) {
+                // the last path must be the bundle views directory
+                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '!'.$namespace));
+            }
         }
 
         if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
 
@@ -198,6 +198,7 @@ public function testTwigLoaderPaths($format)
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(__DIR__.'/Fixtures/templates/bundles/TwigBundle', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
+            array(realpath(__DIR__.'/../..').'/Resources/views', '!Twig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
             array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildTwig'),
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,13 @@ public function load(array $configs, ContainerBuilder $container)`
`130`	`130`	`foreach ($bundle['paths'] as $path) {`
`131`	`131`	`$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ // add exclusive namespace for root bundles only`
	`135`	`+ // to override a bundle template that also extends itself`
	`136`	`+ if (count($bundle['paths']) > 0 && 0 === count($bundle['parents'])) {`
	`137`	`+ // the last path must be the bundle views directory`
	`138`	`+ $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '!'.$namespace));`
	`139`	`+ }`
`133`	`140`	`}`
`134`	`141`
`135`	`142`	`if (file_exists($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {`