Using @!Namespace convention

yceruto · yceruto · commit 52ddda03d798 · 2017-09-28T13:58:50.000-04:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -135,7 +135,7 @@ public function load(array $configs, ContainerBuilder $container)
             // 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));
+                $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '!'.$namespace));
             }
         }
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -198,7 +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(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
`@@ -135,7 +135,7 @@ public function load(array $configs, ContainerBuilder $container)`
`135`	`135`	`// to override a bundle template that also extends itself`
`136`	`136`	`if (count($bundle['paths']) > 0 && 0 === count($bundle['parents'])) {`
`137`	`137`	`// the last path must be the bundle views directory`
`138`		`- $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '@'.$namespace));`
	`138`	`+ $twigFilesystemLoaderDefinition->addMethodCall('addPath', array(end($bundle['paths']), '!'.$namespace));`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`