[TwigBundle] fixed wrong rebase in #7373

jfsimon · jfsimon · commit 6021873f821e · 2013-03-15T17:34:54.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)
         if ($container->has('form.extension')) {
             $container->getDefinition('twig.extension.form')->addTag('twig.extension');
             $reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
-            $container->getDefinition('twig.loader')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
+            $container->getDefinition('twig.loader.filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
         }
 
         if ($container->has('translator')) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)`
`24`	`24`	`if ($container->has('form.extension')) {`
`25`	`25`	`$container->getDefinition('twig.extension.form')->addTag('twig.extension');`
`26`	`26`	`$reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');`
`27`		`- $container->getDefinition('twig.loader')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));`
	`27`	`+ $container->getDefinition('twig.loader.filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if ($container->has('translator')) {`