Add container attributes to HasContainer trait and update render test…

…s. (#184)
php-forge · Dec 31, 2023 · 0fee41b · 0fee41b
1 parent 9362547
commit 0fee41b
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 102 deletions.
diff --git a/src/Attribute/Custom/HasContainer.php b/src/Attribute/Custom/HasContainer.php
@@ -17,7 +17,9 @@
 trait HasContainer
 {
     protected array $containerAttributes = [];
+    protected bool $container = false;
     protected string $containerTemplate = '';
+    protected string $containerTag = 'div';
 
     /**
      * Enable or disable the container tag.

diff --git a/src/Input/Base/AbstractButton.php b/src/Input/Base/AbstractButton.php
@@ -37,11 +37,16 @@ abstract class AbstractButton extends Element implements LabelInterface, InputIn
     use Attribute\Input\HasValue;
 
     protected array $attributes = [];
-    protected bool $container = true;
-    protected string $containerTag = 'div';
     protected string $template = '{prefix}\n{label}\n{tag}\n{suffix}';
     protected string $type = 'button';
 
+    public function loadDefaultDefinitions(): array
+    {
+        return [
+            'container()' => [true],
+        ];
+    }
+
     protected function run(): string
     {
         $this->validateStringValue($this->getValue());

diff --git a/src/Input/Base/AbstractButtonGroup.php b/src/Input/Base/AbstractButtonGroup.php
@@ -18,8 +18,6 @@ abstract class AbstractButtonGroup extends Element
      * @psalm-var Button[]
      */
     protected array $buttons = [];
-    protected bool $container = true;
-    protected string $containerTag = 'div';
     protected bool $individualContainer = false;
 
     /**
@@ -50,6 +48,13 @@ public function individualContainer(bool $value): static
         return $new;
     }
 
+    public function loadDefaultDefinitions(): array
+    {
+        return [
+            'container()' => [true],
+        ];
+    }
+
     protected function run(): string
     {
         return $this->renderContainerTag(null, $this->renderButtons());

diff --git a/src/Input/Base/AbstractChoiceList.php b/src/Input/Base/AbstractChoiceList.php
@@ -32,14 +32,19 @@ abstract class AbstractChoiceList extends Element implements InputInterface, Lab
     use Attribute\Input\HasValue;
 
     protected array $attributes = [];
-    protected bool $container = true;
-    protected string $containerTag = 'div';
     /**
      * @psalm-var Checkbox[]|Radio[] $items
      */
     protected array $items = [];
     protected string $separator = '';
 
+    public function loadDefaultDefinitions(): array
+    {
+        return [
+            'container()' => [true],
+        ];
+    }
+
     public function items(Checkbox|Radio ...$items): static
     {
         $new = clone $this;

diff --git a/tests/Attribute/Custom/HasContainerTest.php b/tests/Attribute/Custom/HasContainerTest.php
@@ -15,9 +15,6 @@ public function testClass(): void
         $instance = new class () {
             use HasContainer;
 
-            protected bool $container = true;
-            protected string $containerTag = 'div';
-
             public function getContainerClass(): string
             {
                 return $this->containerAttributes['class'] ?? '';
@@ -43,9 +40,6 @@ public function testException(): void
     {
         $instance = new class () {
             use HasContainer;
-
-            protected bool $container = true;
-            protected string $containerTag = '';
         };
 
         $this->expectException(InvalidArgumentException::class);
@@ -58,9 +52,6 @@ public function testContainerGetId(): void
     {
         $instance = new class () {
             use HasContainer;
-
-            protected bool $container = true;
-            protected string $containerTag = 'div';
         };
 
         $this->assertNull($instance->getContainerId());