[TwigComponent] Fix ComponentAttributes rendering when using StimulusAttributes as default attributes

Author: Kocal

src/TwigComponent/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.25.2
+
+-   Fix `ComponentAttributes` rendering when using `StimulusAttributes` as default attributes
+
 ## 2.25.1
 
 -   [SECURITY] `ComponentAttributes` now requires a `Twig\Runtime\EscaperRuntime`

src/TwigComponent/src/ComponentAttributes.php

@@ -144,7 +144,7 @@ public function all(): array
     public function defaults(iterable $attributes): self
     {
         if ($attributes instanceof StimulusAttributes) {
-            $attributes = $attributes->toEscapedArray();
+            $attributes = $attributes->toArray();
         }
 
         if ($attributes instanceof \Traversable) {

src/TwigComponent/tests/Unit/ComponentAttributesTest.php

@@ -143,16 +143,18 @@ public function testCanAddStimulusControllerViaStimulusAttributes(): void
         ], new EscaperRuntime());
 
         $stimulusAttributes = new StimulusAttributes(new Environment(new ArrayLoader()));
-        $stimulusAttributes->addController('foo', ['name' => 'ryan', 'some_array' => ['a', 'b']]);
+        $stimulusAttributes->addController('foo', ['name' => 'ryan', 'some_array' => ['a', 'b'], 'some_array_with_keys' => ['key1' => 'value1', 'key2' => 'value2']]);
         $attributes = $attributes->defaults($stimulusAttributes);
 
         $this->assertEquals([
             'class' => 'foo',
             'data-controller' => 'foo live',
             'data-live-data-value' => '{}',
             'data-foo-name-value' => 'ryan',
-            'data-foo-some-array-value' => '["a","b"]',
+            'data-foo-some-array-value' => '["a","b"]',
+            'data-foo-some-array-with-keys-value' => '{"key1":"value1","key2":"value2"}',
         ], $attributes->all());
+        $this->assertSame(' data-controller="foo live" data-foo-name-value="ryan" data-foo-some-array-value="["a","b"]" data-foo-some-array-with-keys-value="{"key1":"value1","key2":"value2"}" class="foo" data-live-data-value="{}"', (string) $attributes);
     }
 
     public function testCanAddStimulusActionViaStimulusAttributes(): void
@@ -175,6 +177,7 @@ public function testCanAddStimulusActionViaStimulusAttributes(): void
             'class' => 'foo',
             'data-action' => 'foo#barMethod live#foo',
         ], $attributes->all());
+        $this->assertSame(' data-action="foo#barMethod live#foo" class="foo"', (string) $attributes);
     }
 
     public function testBooleanBehaviour(): void