NEXT-21959 - allowing all .twig files (for also including xml files)

fixes #2513
shopware · Jun 29, 2022 · c1312c5 · c1312c5
1 parent f13d6e7
commit c1312c5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/changelog/_unreleased/2022-06-13-allow-all-twig-files.md b/changelog/_unreleased/2022-06-13-allow-all-twig-files.md
@@ -0,0 +1,8 @@
+---
+title: Allowing all .twig files 
+issue: NEXT-21959
+author_email: christopher@pixupmedia.com
+author_github: christopherPix
+---
+# Core
+* Changed the constant `ALLOWED_FILE_EXTENSIONS` in `src/Core/Framework/App/Template/TemplateLoader.php` from `*.html.twig` to `*.twig`
diff --git a/src/Core/Framework/App/Template/TemplateLoader.php b/src/Core/Framework/App/Template/TemplateLoader.php
@@ -17,7 +17,7 @@ class TemplateLoader extends AbstractTemplateLoader
         'documents',
     ];
 
-    private const ALLOWED_FILE_EXTENSIONS = '*.html.twig';
+    private const ALLOWED_FILE_EXTENSIONS = '*.twig';
 
     /**
      * {@inheritdoc}

diff --git a/...Test/App/Manifest/_fixtures/test/Resources/views/storefront/page/sitemap/sitemap.xml.twig b/...Test/App/Manifest/_fixtures/test/Resources/views/storefront/page/sitemap/sitemap.xml.twig
@@ -0,0 +1,5 @@
+{% sw_extends '@Storefront/storefront/page/sitemap/sitemap.xml.twig' %}
+
+{% block sitemap %}
+    {{ parent() }}
+{% endblock %}
diff --git a/src/Core/Framework/Test/App/Template/TemplateLoaderTest.php b/src/Core/Framework/Test/App/Template/TemplateLoaderTest.php
@@ -30,7 +30,7 @@ public function testGetTemplatePathsForApp(): void
         sort($templates);
 
         static::assertEquals(
-            ['storefront/layout/header/header.html.twig', 'storefront/layout/header/logo.html.twig'],
+            ['storefront/layout/header/header.html.twig', 'storefront/layout/header/logo.html.twig', 'storefront/page/sitemap/sitemap.xml.twig'],
             $templates
         );
     }