Allow more flexible twig expressions as component attributes

Author: veewee

src/Twig/ComponentNode.php

@@ -4,7 +4,7 @@
 
 use Twig\Compiler;
 use Twig\Node\EmbedNode;
-use Twig\Node\Expression\ArrayExpression;
+use Twig\Node\Expression\AbstractExpression;
 
 /**
  * @author Fabien Potencier <[email protected]>
@@ -16,7 +16,7 @@
  */
 final class ComponentNode extends EmbedNode
 {
-    public function __construct(string $component, string $template, int $index, ArrayExpression $variables, bool $only, int $lineno, string $tag)
+    public function __construct(string $component, string $template, int $index, AbstractExpression $variables, bool $only, int $lineno, string $tag)
     {
         parent::__construct($template, $index, $variables, $only, false, $lineno, $tag);
 

tests/Fixtures/templates/flexible_component_attributes.html.twig

@@ -0,0 +1,7 @@
+{% set attributes1 = {propA: 'A1', propB: 'B1' } %}
+{% set attributes3 = {propA: 'A3', propB: 'B3' } %}
+
+{{ component('component_a', attributes1) }}
+{{ component('component_a', {propA: 'A2', propB: 'B0' }|merge({propB: 'B2'})) }}
+{% component 'component_a' with attributes3 %}{% endcomponent %}
+{% component 'component_a' with ({propA: 'A4', propB: 'B0' })|merge({propB: 'B4'}) %}{% endcomponent %}

tests/Fixtures/templates/invalid_flexible_component.html.twig

@@ -0,0 +1,2 @@
+{% set attributes = 'wrong' %}
+{{ component('component_a', attributes) }}

tests/Integration/ComponentExtensionTest.php

@@ -44,6 +44,27 @@ public function testCanRenderTheSameComponentMultipleTimes(): void
         $this->assertStringContainsString('service: service a value', $output);
     }
 
+    public function testCanRenderComponentWithMoreAdvancedTwigExpressions(): void
+    {
+        $output = self::getContainer()->get(Environment::class)->render('flexible_component_attributes.html.twig');
+
+        $this->assertStringContainsString('propA: A1', $output);
+        $this->assertStringContainsString('propB: B1', $output);
+        $this->assertStringContainsString('propA: A2', $output);
+        $this->assertStringContainsString('propB: B2', $output);
+        $this->assertStringContainsString('propA: A3', $output);
+        $this->assertStringContainsString('propB: B3', $output);
+        $this->assertStringContainsString('propA: A4', $output);
+        $this->assertStringContainsString('propB: B4', $output);
+        $this->assertStringContainsString('service: service a value', $output);
+    }
+
+    public function testCanNotRenderComponentWithInvalidExpressions(): void
+    {
+        $this->expectException(\TypeError::class);
+        self::getContainer()->get(Environment::class)->render('invalid_flexible_component.html.twig');
+    }
+
     public function testCanCustomizeTemplateWithAttribute(): void
     {
         $output = $this->renderComponent('component_b', ['value' => 'b value 1']);