refactor

Author: kbond

src/TwigComponent/src/AttributeBag.php renamed to src/TwigComponent/src/ComponentAttributes.php

@@ -16,42 +16,40 @@
  *
  * @experimental
  */
-final class AttributeBag
+final class ComponentAttributes
 {
+    /** @var array<string, string> */
+    public array $attributes;
+
     /**
      * @param array<string, string> $attributes
      */
-    public function __construct(public array $attributes)
-    {
-    }
-
-    public static function create(array|self $attributes): self
+    public function __construct(array $attributes)
     {
-        return $attributes instanceof self ? $attributes : new self($attributes);
+        $this->attributes = $attributes;
     }
 
     public function __toString(): string
     {
-        return \array_reduce(
-            \array_keys($this->attributes),
-            fn(string $carry, string $key) => \sprintf('%s %s="%s"', $carry, $key, $this->attributes[$key]),
+        return array_reduce(
+            array_keys($this->attributes),
+            fn (string $carry, string $key) => sprintf('%s %s="%s"', $carry, $key, $this->attributes[$key]),
             ''
         );
     }
 
-    public function prepend(array $with): self
+    /**
+     * @return array<string, string>
+     */
+    public function all(): array
     {
-        foreach ($this->attributes as $key => $value) {
-            $with[$key] = isset($with[$key]) ? "{$with[$key]} {$value}" : $value;
-        }
-
-        return new self($with);
+        return $this->attributes;
     }
 
-    public function append(array $with): self
+    public function merge(array $with): self
     {
         foreach ($this->attributes as $key => $value) {
-            $with[$key] = isset($with[$key]) ? "{$value} {$with[$key]}" : $value;
+            $with[$key] = isset($with[$key]) ? "{$with[$key]} {$value}" : $value;
         }
 
         return new self($with);
@@ -62,15 +60,15 @@ public function only(string ...$keys): self
         $attributes = [];
 
         foreach ($this->attributes as $key => $value) {
-            if (in_array($key, $keys, true)) {
+            if (\in_array($key, $keys, true)) {
                 $attributes[$key] = $value;
             }
         }
 
         return new self($attributes);
     }
 
-    public function reject(string ...$keys): self
+    public function without(string ...$keys): self
     {
         $clone = clone $this;
 

src/TwigComponent/src/HasAttributesTrait.php

@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Symfony\UX\TwigComponent;
 
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\TwigComponent\Attribute\PreMount;
 
 /**
@@ -12,21 +21,24 @@
  */
 trait HasAttributesTrait
 {
-    public AttributeBag $attributes;
+    #[LiveProp(hydrateWith: 'hydrateAttributes', dehydrateWith: 'dehydrateAttributes')]
+    public ComponentAttributes $attributes;
 
     #[PreMount]
     public function mapAttributes(array $data): array
     {
-        $data['attributes'] = $this->initAttributes($data['attributes'] ?? []);
+        $data['attributes'] = new ComponentAttributes($data['attributes'] ?? []);
 
         return $data;
     }
 
-    /**
-     * Override to add your own attribute initialization.
-     */
-    protected function initAttributes(array $attributes): AttributeBag
+    public static function dehydrateAttributes(ComponentAttributes $attributes): array
+    {
+        return $attributes->all();
+    }
+
+    public static function hydrateAttributes(array $attributes): ComponentAttributes
     {
-        return AttributeBag::create($attributes);
+        return new ComponentAttributes($attributes);
     }
 }

src/TwigComponent/src/Twig/ComponentRuntime.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\UX\TwigComponent\Twig;
 
-use Symfony\UX\TwigComponent\AttributeBag;
+use Symfony\UX\TwigComponent\ComponentAttributes;
 use Symfony\UX\TwigComponent\ComponentFactory;
 use Symfony\UX\TwigComponent\ComponentRenderer;
 use Twig\Environment;
@@ -37,7 +37,7 @@ public function __construct(ComponentFactory $componentFactory, ComponentRendere
     public function render(Environment $twig, string $name, array $props = []): string
     {
         if (!$this->safeClassesRegistered) {
-            $twig->getExtension(EscaperExtension::class)->addSafeClass(AttributeBag::class, ['html']);
+            $twig->getExtension(EscaperExtension::class)->addSafeClass(ComponentAttributes::class, ['html']);
 
             $this->safeClassesRegistered = true;
         }