[TwigComponent] Support ...spread operator with html syntax

symfony · Jul 27, 2023 · 5a781d4 · 5a781d4
1 parent eb7023a
commit 5a781d4
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/src/TwigComponent/CHANGELOG.md b/src/TwigComponent/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.11.0
+
+-   Support ...spread operator with html syntax
+
 ## 2.9.0
 
 -   The `ComponentAttributes::defaults()` method now accepts any iterable argument.

diff --git a/src/TwigComponent/src/Twig/TwigPreLexer.php b/src/TwigComponent/src/Twig/TwigPreLexer.php
@@ -22,7 +22,9 @@ class TwigPreLexer
     private int $length;
     private int $position = 0;
     private int $line;
-    /** @var array<string: name, bool: hasDefaultBlock> */
+    /**
+     * @var array<array{name: string, hasDefaultBlock: bool}>
+     */
     private array $currentComponents = [];
 
     public function __construct(int $startingLine = 1)
@@ -201,6 +203,15 @@ private function consumeAttributes(string $componentName): string
                 break;
             }
 
+            if ($this->check('{{...') || $this->check('{{ ...')) {
+                $this->consume('{{...');
+                $this->consume('{{ ...');
+                $attributes[] = '...'.trim($this->consumeUntil('}}'));
+                $this->consume('}}');
+
+                continue;
+            }
+
             $isAttributeDynamic = false;
 
             // :someProp="dynamicVar"

diff --git a/src/TwigComponent/tests/Unit/TwigPreLexerTest.php b/src/TwigComponent/tests/Unit/TwigPreLexerTest.php
@@ -216,5 +216,31 @@ public function getLexTests(): iterable
             '{% verbatim %}<twig:Alert/>{% endverbatim %}',
             '{% verbatim %}<twig:Alert/>{% endverbatim %}',
         ];
+
+        yield 'component_attr_spreading_self_closing' => [
+            '<twig:foobar bar="baz"{{...attr}}/>',
+            '{{ component(\'foobar\', { bar: \'baz\', ...attr }) }}',
+        ];
+        yield 'component_attr_spreading_self_closing2' => [
+            '<twig:foobar bar="baz"{{ ...customAttrs }} />',
+            '{{ component(\'foobar\', { bar: \'baz\', ...customAttrs }) }}',
+        ];
+        yield 'component_attr_spreading_self_closing3' => [
+            '<twig:foobar bar="baz" {{...attr }} />',
+            '{{ component(\'foobar\', { bar: \'baz\', ...attr }) }}',
+        ];
+
+        yield 'component_attr_spreading_with_content1' => [
+            '<twig:foobar bar="baz"{{...attr}}>content</twig:foobar>',
+            '{% component \'foobar\' with { bar: \'baz\', ...attr } %}{% block content %}content{% endblock %}{% endcomponent %}',
+        ];
+        yield 'component_attr_spreading_with_content2' => [
+            '<twig:foobar bar="baz"{{ ...customAttrs }}>content</twig:foobar>',
+            '{% component \'foobar\' with { bar: \'baz\', ...customAttrs } %}{% block content %}content{% endblock %}{% endcomponent %}',
+        ];
+        yield 'component_attr_spreading_with_content3' => [
+            '<twig:foobar bar="baz" {{ ...attr }}>content</twig:foobar>',
+            '{% component \'foobar\' with { bar: \'baz\', ...attr } %}{% block content %}content{% endblock %}{% endcomponent %}',
+        ];
     }
 }