[TwigBundle] do not lose already set method calls

xabbuh · xabbuh · commit cb1a4b778f52 · 2017-01-14T10:53:53.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -91,7 +91,7 @@ public function process(ContainerBuilder $container)
         $twigLoader = $container->getDefinition('twig.loader.native_filesystem');
         if ($container->has('templating')) {
             $loader = $container->getDefinition('twig.loader.filesystem');
-            $loader->setMethodCalls($twigLoader->getMethodCalls());
+            $loader->setMethodCalls(array_merge($twigLoader->getMethodCalls(), $loader->getMethodCalls()));
 
             $twigLoader->clearTag('twig.loader');
         } else {
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
+
+use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\ExtensionPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+class ExtensionPassTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProcessDoesNotDropExistingFileLoaderMethodCalls()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
+        $container->register('twig.app_variable', '\Symfony\Bridge\Twig\AppVariable');
+        $container->register('templating', '\Symfony\Bundle\TwigBundle\TwigEngine');
+
+        $nativeTwigLoader = new Definition('\Twig_Loader_Filesystem');
+        $nativeTwigLoader->addMethodCall('addPath', array());
+        $container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
+
+        $filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
+        $filesystemLoader->addMethodCall('addPath', array());
+        $container->setDefinition('twig.loader.filesystem', $filesystemLoader);
+
+        $extensionPass = new ExtensionPass();
+        $extensionPass->process($container);
+
+        $this->assertCount(2, $filesystemLoader->getMethodCalls());
+    }
+}
