[TwigBundle] fixed template root path

fabpot · fabpot · commit 526b8a04fd16 · 2016-11-06T12:23:45.000-08:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -66,6 +66,7 @@ public function process(ContainerBuilder $container)
 
         if (!$container->has('templating')) {
             $loader = $container->getDefinition('twig.loader.native_filesystem');
+            $loader->replaceArgument(1, $this->getComposerRootDir($container->getParameter('kernel.root_dir')));
             $loader->addTag('twig.loader');
             $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
 
@@ -91,4 +92,18 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.expression')->addTag('twig.extension');
         }
     }
+
+    private function getComposerRootDir($rootDir)
+    {
+        $dir = $rootDir;
+        while (!file_exists($dir.'/composer.json')) {
+            if ($dir === dirname($dir)) {
+                return $rootDir;
+            }
+
+            $dir = dirname($dir);
+        }
+
+        return $dir;
+    }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -46,7 +46,7 @@
 
         <service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
             <argument type="collection" /> <!-- paths -->
-            <argument>%kernel.root_dir%</argument>
+            <argument></argument> <!-- project's root dir -->
         </service>
 
         <service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
