Merge pull request #79 from chives/2.1

Fixed template paths when templating component is not loaded
fsi-open · Feb 12, 2021 · db38110 · db38110
2 parents 388c4fb + 5626f28
commit db38110
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/DependencyInjection/Compiler/TemplatePathPass.php b/DependencyInjection/Compiler/TemplatePathPass.php
@@ -20,7 +20,11 @@ final class TemplatePathPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $loaderDefinition = $container->getDefinition('twig.loader.filesystem');
+        if (true === $container->hasDefinition('twig.loader.native_filesystem')) {
+            $loaderDefinition = $container->getDefinition('twig.loader.native_filesystem');
+        } else {
+            $loaderDefinition = $container->getDefinition('twig.loader.filesystem');
+        }
 
         $reflection = new ReflectionClass(DataSourceBundle::class);
         $loaderDefinition->addMethodCall(