Merge branch 'next-16783/template-include-interpolation' into 'trunk'

NEXT-16783 - template inheritance with interpolation

See merge request shopware/6/product/platform!7320

changelog/_unreleased/2022-01-26-changed-sw-include-node.md

@@ -0,0 +1,8 @@
+---
+title: Changed SwInclude Node
+issue: NEXT-16783
+author: Stefan Sluiter
+author_github: ssltg
+---
+# Core
+* Changed `Shopware\Core\Framework\Adapter\Twig\Node\SwInclude` to not resolve namespace of include template because it will be resolved later in the finder.

src/Core/Framework/Adapter/Twig/Node/SwInclude.php

@@ -15,9 +15,7 @@ protected function addGetTemplate(Compiler $compiler): void
             ->indent()
                 ->write('$finder = $this->env->getExtension(\'' . NodeExtension::class . '\')->getFinder();')->raw("\n\n")
                 ->write('$includeTemplate = $finder->find(')
-                    ->raw('$finder->getTemplateName(')
                         ->subcompile($this->getNode('expr'))
-                    ->raw(')')
                 ->raw(");\n\n")
                 ->write('return $this->loadTemplate(')
                     ->raw('$includeTemplate ?? null, ')

src/Core/Framework/Test/Adapter/Twig/TwigSwIncludeTest.php

@@ -8,6 +8,7 @@
 use Shopware\Core\Framework\Adapter\Twig\NamespaceHierarchy\BundleHierarchyBuilder;
 use Shopware\Core\Framework\Adapter\Twig\NamespaceHierarchy\NamespaceHierarchyBuilder;
 use Shopware\Core\Framework\Adapter\Twig\TemplateFinder;
+use Shopware\Core\Framework\Adapter\Twig\TwigEnvironment;
 use Shopware\Core\Framework\Test\Adapter\Twig\fixtures\BundleFixture;
 use Shopware\Core\Framework\Test\TestCaseBase\KernelTestBehaviour;
 use Shopware\Core\Kernel;
@@ -30,6 +31,19 @@ public function testMultipleInheritance(): void
         static::assertSame('innerblockplugin2innerblockplugin1innerblock', $template->render([]));
     }
 
+    public function testInterpolatedInheritance(): void
+    {
+        // order storefront, TestPlugin2, TestPlugin1 is important for this test. Do not change.
+        $twig = $this->initTwig([
+            new BundleFixture('Storefront', __DIR__ . '/fixtures/Storefront/'),
+            new BundleFixture('TestPlugin2', __DIR__ . '/fixtures/Plugins/TestPlugin2'),
+            new BundleFixture('TestPlugin1', __DIR__ . '/fixtures/Plugins/TestPlugin1'),
+        ]);
+
+        $template = $twig->loadTemplate($twig->getTemplateClass('@TestPlugin1/storefront/frontend/include_base.html.twig'), '@TestPlugin1/storefront/frontend/include_base.html.twig');
+        static::assertSame('--(Textfield base)(Textfield Extend)-(Textfield base)(Textfield Extend)--', $template->render([]));
+    }
+
     public function testIncludeWithVars(): void
     {
         $twig = $this->initTwig([
@@ -111,7 +125,7 @@ private function initTwig(array $bundles): Environment
             $loader->addPath($directory, $bundle->getName());
         }
 
-        $twig = new Environment($loader, ['cache' => false]);
+        $twig = new TwigEnvironment($loader, ['cache' => false]);
 
         $kernel = $this->createMock(Kernel::class);
         $kernel->expects(static::any())

src/Core/Framework/Test/Adapter/Twig/fixtures/Plugins/TestPlugin1/Resources/views/storefront/frontend/include_base.html.twig

@@ -0,0 +1 @@
+{% block foo %}--{% set type = 'textfield' %}{% sw_include '@TestPlugin1/storefront/frontend/' ~ type ~ '.html.twig' %}-{% sw_include '@TestPlugin1/storefront/frontend/textfield.html.twig' %}--{% endblock %}

src/Core/Framework/Test/Adapter/Twig/fixtures/Plugins/TestPlugin1/Resources/views/storefront/frontend/textfield.html.twig

@@ -0,0 +1 @@
+{% block component_field_types_text %}(Textfield base){% endblock %}

src/Core/Framework/Test/Adapter/Twig/fixtures/Plugins/TestPlugin2/Resources/views/storefront/frontend/textfield.html.twig

@@ -0,0 +1,4 @@
+{% sw_extends '@TestPlugin1/storefront/frontend/textfield.html.twig' %}
+
+{% block component_field_types_text %}{{ parent() }}(Textfield Extend){% endblock %}
+

src/Core/Framework/Test/Adapter/Twig/fixtures/Storefront/Resources/views/storefront/frontend/include_base.html.twig

@@ -0,0 +1 @@
+{% block base_content %}dd{% endblock %}