From da20f3a25b1c9a68353ad3b21f9517628abc6e9e Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <terabytesoftw@gmail.com>
Date: Sat, 21 Feb 2026 17:44:19 -0300
Subject: [PATCH 1/3] fix(form): Remove `BaseChoice` class and related mixins;
 update `InputCheckbox`, `InputFile`, and `InputRadio` to extend `BaseInput`.

---
 CHANGELOG.md                            |   1 +
 src/Form/Base/BaseChoice.php            | 126 ---------
 src/Form/InputCheckbox.php              |  41 ++-
 src/Form/InputFile.php                  |  26 +-
 src/Form/InputRadio.php                 |  41 ++-
 src/Form/Mixin/CanBeEnclosedByLabel.php |  39 ---
 src/Form/Mixin/HasUnchecked.php         |  51 ----
 tests/Form/InputCheckboxTest.php        | 344 +-----------------------
 tests/Form/InputFileTest.php            |  40 +--
 tests/Form/InputRadioTest.php           | 344 +-----------------------
 10 files changed, 78 insertions(+), 975 deletions(-)
 delete mode 100644 src/Form/Base/BaseChoice.php
 delete mode 100644 src/Form/Mixin/CanBeEnclosedByLabel.php
 delete mode 100644 src/Form/Mixin/HasUnchecked.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8e184c..558b0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - Enh #52: Add `InputColor` class for HTML `<input type="color">` element with attributes and rendering capabilities (@terabytesoftw)
 - Enh #53: Add `TextArea` class for HTML `<textarea>` element with attributes and rendering capabilities (@terabytesoftw)
 - Bug #54: Update exception test method names for consistency and clarity (@terabytesoftw)
+- Bug #55: Remove `BaseChoice` class and related mixins; update `InputCheckbox`, `InputFile`, and `InputRadio` to extend `BaseInput` class (@terabytesoftw)
 
 ## 0.3.0 March 31, 2024
 
diff --git a/src/Form/Base/BaseChoice.php b/src/Form/Base/BaseChoice.php
deleted file mode 100644
index f1440e5..0000000
--- a/src/Form/Base/BaseChoice.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace UIAwesome\Html\Form\Base;
-
-use UIAwesome\Html\Attribute\Form\CanBeRequired;
-use UIAwesome\Html\Attribute\Global\{CanBeAutofocus, HasTabindex};
-use UIAwesome\Html\Attribute\HasValue;
-use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Core\Html;
-use UIAwesome\Html\Form\InputHidden;
-use UIAwesome\Html\Form\Mixin\{CanBeEnclosedByLabel, HasCheckedState, HasUnchecked};
-use UIAwesome\Html\Mixin\HasLabelCollection;
-use UIAwesome\Html\Phrasing\Label;
-
-use function array_key_exists;
-
-/**
- * Provides a shared base for checkbox and radio input elements.
- *
- * Handles unchecked hidden input rendering, label rendering (enclosed or separate), and checked-state and value
- * attributes through mixins.
- *
- * @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input
- *
- * @copyright Copyright (C) 2026 Terabytesoftw.
- * @license https://opensource.org/license/bsd-3-clause BSD 3-Clause License.
- */
-abstract class BaseChoice extends BaseInput
-{
-    use CanBeAutofocus;
-    use CanBeEnclosedByLabel;
-    use CanBeRequired;
-    use HasCheckedState;
-    use HasLabelCollection;
-    use HasTabindex;
-    use HasUnchecked;
-    use HasValue;
-
-    /**
-     * Returns the array of HTML attributes for the element.
-     *
-     * @return array Attributes array assigned to the element.
-     *
-     * @phpstan-return mixed[]
-     */
-    public function getAttributes(): array
-    {
-        return $this->buildAttributes(parent::getAttributes());
-    }
-
-    /**
-     * Renders the `<input>` element with its attributes.
-     *
-     * @return string Rendered HTML for the `<input>` element.
-     */
-    protected function run(): string
-    {
-        /** @var string|null $id */
-        $id = $this->getAttribute('id', null);
-
-        $unchecked = '';
-        $uncheckedValue = $this->getUncheckedValue();
-
-        if ($uncheckedValue !== null) {
-            /** @phpstan-var string $name */
-            $name = $this->getAttribute('name', '');
-
-            $unchecked = InputHidden::tag()
-                ->id(null)
-                ->name($name)
-                ->value($uncheckedValue)
-                ->render();
-        }
-
-        $label = $this->getLabel();
-
-        if ($this->isLabel() === false) {
-            return $this->buildElement(
-                '',
-                [
-                    '{label}' => '',
-                    '{unchecked}' => $unchecked,
-                ],
-            );
-        }
-
-        $labelAttributes = $this->getLabelAttributes();
-        $labelTag = Label::tag()->attributes($labelAttributes);
-
-        if ($this->enclosedByLabel === false) {
-            if (array_key_exists('for', $labelAttributes) === false) {
-                $labelTag = $labelTag->for($id);
-            }
-
-            $labelTag = $labelTag->content($label);
-
-            return $this->buildElement(
-                '',
-                [
-                    '{label}' => $labelTag,
-                    '{unchecked}' => $unchecked,
-                ],
-            );
-        }
-
-        $labelTag = $labelTag
-            ->html(
-                "\n",
-                Html::element($this->getTag(), '', $this->getAttributes()),
-                "\n",
-                $label,
-                "\n",
-            );
-
-        return $this->buildElement(
-            '',
-            [
-                '{tag}' => $labelTag,
-                '{label}' => '',
-                '{unchecked}' => $unchecked,
-            ],
-        );
-    }
-}
diff --git a/src/Form/InputCheckbox.php b/src/Form/InputCheckbox.php
index 0c8073f..c678244 100644
--- a/src/Form/InputCheckbox.php
+++ b/src/Form/InputCheckbox.php
@@ -4,8 +4,12 @@
 
 namespace UIAwesome\Html\Form;
 
+use UIAwesome\Html\Attribute\Form\CanBeRequired;
+use UIAwesome\Html\Attribute\Global\{CanBeAutofocus, HasTabindex};
+use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
-use UIAwesome\Html\Form\Base\BaseChoice;
+use UIAwesome\Html\Core\Element\BaseInput;
+use UIAwesome\Html\Form\Mixin\HasCheckedState;
 use UIAwesome\Html\Interop\{VoidInterface, Voids};
 
 /**
@@ -28,8 +32,26 @@
  * @copyright Copyright (C) 2026 Terabytesoftw.
  * @license https://opensource.org/license/bsd-3-clause BSD 3-Clause License.
  */
-final class InputCheckbox extends BaseChoice
+final class InputCheckbox extends BaseInput
 {
+    use CanBeAutofocus;
+    use CanBeRequired;
+    use HasCheckedState;
+    use HasTabindex;
+    use HasValue;
+
+    /**
+     * Returns the array of HTML attributes for the element.
+     *
+     * @return array Attributes array assigned to the element.
+     *
+     * @phpstan-return mixed[]
+     */
+    public function getAttributes(): array
+    {
+        return $this->buildAttributes(parent::getAttributes());
+    }
+
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
@@ -49,9 +71,16 @@ protected function getTag(): VoidInterface
      */
     protected function loadDefault(): array
     {
-        return [
-            'template' => ['{prefix}\n{unchecked}\n{tag}\n{label}\n{suffix}'],
-            'type' => [Type::CHECKBOX],
-        ] + parent::loadDefault();
+        return parent::loadDefault() + ['type' => [Type::CHECKBOX]];
+    }
+
+    /**
+     * Renders the `<input>` element with its attributes.
+     *
+     * @return string Rendered HTML for the `<input>` element.
+     */
+    protected function run(): string
+    {
+        return $this->buildElement();
     }
 }
diff --git a/src/Form/InputFile.php b/src/Form/InputFile.php
index ee0010c..e8ffe23 100644
--- a/src/Form/InputFile.php
+++ b/src/Form/InputFile.php
@@ -9,7 +9,6 @@
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
 use UIAwesome\Html\Form\Attribute\HasCapture;
-use UIAwesome\Html\Form\Mixin\HasUnchecked;
 use UIAwesome\Html\Helper\Naming;
 use UIAwesome\Html\Interop\{VoidInterface, Voids};
 
@@ -49,7 +48,6 @@ final class InputFile extends BaseInput
     use HasCapture;
     use HasForm;
     use HasTabindex;
-    use HasUnchecked;
 
     /**
      * Returns the array of HTML attributes for the element.
@@ -61,6 +59,7 @@ final class InputFile extends BaseInput
     public function getAttributes(): array
     {
         $attributes = parent::getAttributes();
+
         $attributes['name'] = $this->generateNameWithMultiple();
 
         // value attribute is not allowed for the `<input type="file">` element, so we remove it if it exists.
@@ -88,12 +87,10 @@ protected function getTag(): VoidInterface
      */
     protected function loadDefault(): array
     {
-        return [
-            'template' => ['{prefix}\n{unchecked}\n{tag}\n{suffix}'],
-            'type' => [Type::FILE],
-        ] + parent::loadDefault();
+        return parent::loadDefault() + ['type' => [Type::FILE]];
     }
 
+
     /**
      * Renders the `<input>` element with its attributes.
      *
@@ -101,22 +98,7 @@ protected function loadDefault(): array
      */
     protected function run(): string
     {
-        $uncheckedValue = $this->getUncheckedValue();
-
-        if ($uncheckedValue !== null && $uncheckedValue !== '') {
-            $unchecked = InputHidden::tag()
-                ->id(null)
-                ->name($this->generateNameWithMultiple())
-                ->value($uncheckedValue)
-                ->render();
-        }
-
-        return $this->buildElement(
-            '',
-            [
-                '{unchecked}' => $unchecked ?? '',
-            ],
-        );
+        return $this->buildElement();
     }
 
     /**
diff --git a/src/Form/InputRadio.php b/src/Form/InputRadio.php
index 9d56381..76fa85a 100644
--- a/src/Form/InputRadio.php
+++ b/src/Form/InputRadio.php
@@ -4,8 +4,12 @@
 
 namespace UIAwesome\Html\Form;
 
+use UIAwesome\Html\Attribute\Form\CanBeRequired;
+use UIAwesome\Html\Attribute\Global\{CanBeAutofocus, HasTabindex};
+use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
-use UIAwesome\Html\Form\Base\BaseChoice;
+use UIAwesome\Html\Core\Element\BaseInput;
+use UIAwesome\Html\Form\Mixin\HasCheckedState;
 use UIAwesome\Html\Interop\{VoidInterface, Voids};
 
 /**
@@ -28,8 +32,26 @@
  * @copyright Copyright (C) 2026 Terabytesoftw.
  * @license https://opensource.org/license/bsd-3-clause BSD 3-Clause License.
  */
-final class InputRadio extends BaseChoice
+final class InputRadio extends BaseInput
 {
+    use CanBeAutofocus;
+    use CanBeRequired;
+    use HasCheckedState;
+    use HasTabindex;
+    use HasValue;
+
+    /**
+     * Returns the array of HTML attributes for the element.
+     *
+     * @return array Attributes array assigned to the element.
+     *
+     * @phpstan-return mixed[]
+     */
+    public function getAttributes(): array
+    {
+        return $this->buildAttributes(parent::getAttributes());
+    }
+
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
@@ -49,9 +71,16 @@ protected function getTag(): VoidInterface
      */
     protected function loadDefault(): array
     {
-        return [
-            'template' => ['{prefix}\n{unchecked}\n{tag}\n{label}\n{suffix}'],
-            'type' => [Type::RADIO],
-        ] + parent::loadDefault();
+        return parent::loadDefault() + ['type' => [Type::RADIO]];
+    }
+
+    /**
+     * Renders the `<input>` element with its attributes.
+     *
+     * @return string Rendered HTML for the `<input>` element.
+     */
+    protected function run(): string
+    {
+        return $this->buildElement();
     }
 }
diff --git a/src/Form/Mixin/CanBeEnclosedByLabel.php b/src/Form/Mixin/CanBeEnclosedByLabel.php
deleted file mode 100644
index 617038f..0000000
--- a/src/Form/Mixin/CanBeEnclosedByLabel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace UIAwesome\Html\Form\Mixin;
-
-/**
- * Provides methods to configure whether the element is enclosed by a label.
- *
- * @copyright Copyright (C) 2026 Terabytesoftw.
- * @license https://opensource.org/license/bsd-3-clause BSD 3-Clause License.
- */
-trait CanBeEnclosedByLabel
-{
-    /**
-     * Whether the element is enclosed by a label.
-     */
-    protected bool $enclosedByLabel = false;
-
-    /**
-     * Sets whether the element is enclosed by a label.
-     *
-     * Usage example:
-     * ```php
-     * $element->enclosedByLabel(true);
-     * ```
-     *
-     * @param bool $value Whether the element is enclosed by a label.
-     *
-     * @return static New instance with the updated `enclosedByLabel` value.
-     */
-    public function enclosedByLabel(bool $value): static
-    {
-        $new = clone $this;
-        $new->enclosedByLabel = $value;
-
-        return $new;
-    }
-}
diff --git a/src/Form/Mixin/HasUnchecked.php b/src/Form/Mixin/HasUnchecked.php
deleted file mode 100644
index 591d467..0000000
--- a/src/Form/Mixin/HasUnchecked.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace UIAwesome\Html\Form\Mixin;
-
-use Stringable;
-use UnitEnum;
-
-/**
- * Provides methods to configure whether the element can be unchecked.
- *
- * @copyright Copyright (C) 2026 Terabytesoftw.
- * @license https://opensource.org/license/bsd-3-clause BSD 3-Clause License.
- */
-trait HasUnchecked
-{
-    /**
-     * Value to be submitted when the element is not checked.
-     *
-     * If set, an additional hidden input will be rendered with the same name as the element and this value.
-     *
-     * This ensures that a value is always submitted for the element, even when it is unchecked.
-     */
-    private bool|float|int|string|Stringable|UnitEnum|null $uncheckedValue = null;
-
-    /**
-     * Set the value that should be submitted when the element is not checked.
-     *
-     * @param bool|float|int|string|Stringable|UnitEnum|null $value Value to be submitted.
-     *
-     * @return static New instance with the updated `uncheckedValue` value.
-     */
-    public function uncheckedValue(bool|float|int|string|Stringable|UnitEnum|null $value): static
-    {
-        $new = clone $this;
-        $new->uncheckedValue = $value;
-
-        return $new;
-    }
-
-    /**
-     * Get the value that should be submitted when the element is not checked.
-     *
-     * @return bool|float|int|string|Stringable|UnitEnum|null Value to be submitted.
-     */
-    private function getUncheckedValue(): bool|float|int|string|Stringable|UnitEnum|null
-    {
-        return $this->uncheckedValue;
-    }
-}
diff --git a/tests/Form/InputCheckboxTest.php b/tests/Form/InputCheckboxTest.php
index b0a1686..25ba7e2 100644
--- a/tests/Form/InputCheckboxTest.php
+++ b/tests/Form/InputCheckboxTest.php
@@ -47,8 +47,8 @@ public function testGetAttributesReturnsAssignedAttributes(): void
     {
         self::assertSame(
             [
-                'type' => Type::CHECKBOX,
                 'id' => null,
+                'type' => Type::CHECKBOX,
                 'class' => 'value',
             ],
             InputCheckbox::tag()
@@ -503,113 +503,6 @@ public function testRenderWithDisabled(): void
         );
     }
 
-    public function testRenderWithEnclosedByLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label>
-            <input id="inputcheckbox" type="checkbox">
-            Label
-            </label>
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and label content.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndCustomTemplate(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <div class="value">
-            <label>
-            <input id="inputcheckbox" type="checkbox">
-            Label
-            </label>
-            </div>
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->template('<div class="value">' . PHP_EOL . '{tag}' . PHP_EOL . '</div>')
-                ->render(),
-            'Failed asserting that element renders correctly with a custom template wrapper.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndLabelContentEmpty(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id('inputcheckbox')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and empty label content.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndLabelFor(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label for="inputcheckbox">
-            <input id="inputcheckbox" type="checkbox">
-            Label
-            </label>
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelFor('inputcheckbox')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and label "for" attribute.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelIsIdempotent(): void
-    {
-        $checkbox = InputCheckbox::tag()
-            ->enclosedByLabel(true)
-            ->id('inputcheckbox')
-            ->label('Label');
-
-        $first = $checkbox->render();
-        $second = $checkbox->render();
-
-        self::assertSame(
-            $first,
-            $second,
-            'Rendering the same instance twice should produce identical output.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelWithoutId(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label>
-            <input type="checkbox">
-            Label
-            </label>
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id(null)
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and no ID.',
-        );
-    }
-
     public function testRenderWithEvents(): void
     {
         self::assertSame(
@@ -705,152 +598,6 @@ public function testRenderWithId(): void
         );
     }
 
-    public function testRenderWithLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with label.',
-        );
-    }
-
-    public function testRenderWithLabelAttributes(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->render(),
-            'Failed asserting that element renders correctly with label attributes.',
-        );
-    }
-
-    public function testRenderWithLabelClass(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelClass('value')
-                ->render(),
-            'Failed asserting that element renders correctly with label class.',
-        );
-    }
-
-    public function testRenderWithLabelClassNullValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass(null)
-                ->render(),
-            "Failed asserting that element renders correctly with label class set to 'null'.",
-        );
-    }
-
-    public function testRenderWithLabelClassOverridesFalse(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value value-override" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass('value-override')
-                ->render(),
-            "Failed asserting that element renders correctly with label class overrides set to 'false'.",
-        );
-    }
-
-    public function testRenderWithLabelClassOverridesTrue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value-override" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass('value-override', true)
-                ->render(),
-            "Failed asserting that element renders correctly with label class overrides set to 'true'.",
-        );
-    }
-
-    public function testRenderWithLabelClassUsingEnum(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label class="value" for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelClass(BackedString::VALUE)
-                ->render(),
-            'Failed asserting that element renders correctly with label class.',
-        );
-    }
-
-    public function testRenderWithLabelFor(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label for="inputcheckbox">Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelFor('inputcheckbox')
-                ->render(),
-            "Failed asserting that element renders correctly with label 'for' attribute.",
-        );
-    }
-
-    public function testRenderWithLabelForNullValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            <label>Label</label>
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->labelFor(null)
-                ->render(),
-            "Failed asserting that element renders correctly with label 'for' attribute set to 'null'.",
-        );
-    }
-
     public function testRenderWithLang(): void
     {
         self::assertSame(
@@ -893,21 +640,6 @@ public function testRenderWithName(): void
         );
     }
 
-    public function testRenderWithNotLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputcheckbox" type="checkbox">
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->notLabel()
-                ->render(),
-            "Failed asserting that element renders correctly with 'notLabel()' method.",
-        );
-    }
-
     public function testRenderWithRemoveAriaAttribute(): void
     {
         self::assertSame(
@@ -1133,45 +865,6 @@ public function testRenderWithTranslateUsingEnum(): void
         );
     }
 
-    public function testRenderWithUncheckedValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value" type="hidden" value="0">
-            <input id="inputcheckbox" name="value" type="checkbox" value="1">
-            HTML,
-            InputCheckbox::tag()
-                ->id('inputcheckbox')
-                ->name('value')
-                ->uncheckedValue('0')
-                ->value('1')
-                ->render(),
-            "Failed asserting that element renders correctly with 'uncheckedValue' attribute.",
-        );
-    }
-
-    public function testRenderWithUncheckedValueAndEnclosedByLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value" type="hidden" value="0">
-            <label>
-            <input id="inputcheckbox" name="value" type="checkbox" value="1">
-            Label
-            </label>
-            HTML,
-            InputCheckbox::tag()
-                ->enclosedByLabel(true)
-                ->id('inputcheckbox')
-                ->label('Label')
-                ->name('value')
-                ->uncheckedValue('0')
-                ->value('1')
-                ->render(),
-            "Failed asserting that element renders correctly with 'uncheckedValue' attribute and enclosed label.",
-        );
-    }
-
     public function testRenderWithUserOverridesGlobalDefaults(): void
     {
         SimpleFactory::setDefaults(
@@ -1219,40 +912,5 @@ public function testReturnNewInstanceWhenSettingAttribute(): void
             $inputCheckbox->checked(true),
             'Should return a new instance when setting the attribute, ensuring immutability.',
         );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->enclosedByLabel(true),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->label(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->labelAttributes([]),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->labelClass(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->labelFor(null),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->notLabel(),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputCheckbox,
-            $inputCheckbox->uncheckedValue(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
     }
 }
diff --git a/tests/Form/InputFileTest.php b/tests/Form/InputFileTest.php
index ff905d5..d16324d 100644
--- a/tests/Form/InputFileTest.php
+++ b/tests/Form/InputFileTest.php
@@ -42,8 +42,8 @@ public function testGetAttributesReturnsAssignedAttributes(): void
     {
         self::assertSame(
             [
-                'type' => Type::FILE,
                 'id' => null,
+                'type' => Type::FILE,
                 'class' => 'value',
                 'name' => '',
             ],
@@ -643,23 +643,6 @@ public function testRenderWithMultiple(): void
         );
     }
 
-    public function testRenderWithMultipleAndUnchecked(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value[]" type="hidden" value="0">
-            <input id="inputfile" name="value[]" type="file" multiple>
-            HTML,
-            InputFile::tag()
-                ->id('inputfile')
-                ->multiple(true)
-                ->name('value')
-                ->uncheckedValue('0')
-                ->render(),
-            "Failed asserting that element renders correctly with 'multiple' attribute and unchecked value.",
-        );
-    }
-
     public function testRenderWithName(): void
     {
         self::assertSame(
@@ -901,22 +884,6 @@ public function testRenderWithTranslateUsingEnum(): void
         );
     }
 
-    public function testRenderWithUncheckedValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value" type="hidden" value="0">
-            <input id="inputfile" name="value" type="file">
-            HTML,
-            InputFile::tag()
-                ->id('inputfile')
-                ->name('value')
-                ->uncheckedValue('0')
-                ->render(),
-            'Failed asserting that element renders correctly with unchecked value.',
-        );
-    }
-
     public function testRenderWithUserOverridesGlobalDefaults(): void
     {
         SimpleFactory::setDefaults(
@@ -964,10 +931,5 @@ public function testReturnNewInstanceWhenSettingAttribute(): void
             $inputFile->capture(''),
             'Should return a new instance when setting the attribute, ensuring immutability.',
         );
-        self::assertNotSame(
-            $inputFile,
-            $inputFile->uncheckedValue(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
     }
 }
diff --git a/tests/Form/InputRadioTest.php b/tests/Form/InputRadioTest.php
index 7cf694a..af7b752 100644
--- a/tests/Form/InputRadioTest.php
+++ b/tests/Form/InputRadioTest.php
@@ -49,8 +49,8 @@ public function testGetAttributesReturnsAssignedAttributes(): void
     {
         self::assertSame(
             [
-                'type' => Type::RADIO,
                 'id' => null,
+                'type' => Type::RADIO,
                 'class' => 'value',
             ],
             InputRadio::tag()
@@ -512,113 +512,6 @@ public function testRenderWithDisabled(): void
         );
     }
 
-    public function testRenderWithEnclosedByLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label>
-            <input id="inputradio" type="radio">
-            Label
-            </label>
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id('inputradio')
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and label content.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndCustomTemplate(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <div class="value">
-            <label>
-            <input id="inputradio" type="radio">
-            Label
-            </label>
-            </div>
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id('inputradio')
-                ->label('Label')
-                ->template('<div class="value">' . PHP_EOL . '{tag}' . PHP_EOL . '</div>')
-                ->render(),
-            'Failed asserting that element renders correctly with a custom template wrapper.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndLabelContentEmpty(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id('inputradio')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and empty label content.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelAndLabelFor(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label for="inputradio">
-            <input id="inputradio" type="radio">
-            Label
-            </label>
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id('inputradio')
-                ->label('Label')
-                ->labelFor('inputradio')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and label "for" attribute.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelIsIdempotent(): void
-    {
-        $radio = InputRadio::tag()
-            ->enclosedByLabel(true)
-            ->id('inputradio')
-            ->label('Label');
-
-        $first = $radio->render();
-        $second = $radio->render();
-
-        self::assertSame(
-            $first,
-            $second,
-            'Rendering the same instance twice should produce identical output.',
-        );
-    }
-
-    public function testRenderWithEnclosedByLabelWithoutId(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <label>
-            <input type="radio">
-            Label
-            </label>
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id(null)
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with enclosed label and no ID.',
-        );
-    }
-
     public function testRenderWithEvents(): void
     {
         self::assertSame(
@@ -714,152 +607,6 @@ public function testRenderWithId(): void
         );
     }
 
-    public function testRenderWithLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->render(),
-            'Failed asserting that element renders correctly with label.',
-        );
-    }
-
-    public function testRenderWithLabelAttributes(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->render(),
-            'Failed asserting that element renders correctly with label attributes.',
-        );
-    }
-
-    public function testRenderWithLabelClass(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelClass('value')
-                ->render(),
-            'Failed asserting that element renders correctly with label class.',
-        );
-    }
-
-    public function testRenderWithLabelClassNullValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass(null)
-                ->render(),
-            "Failed asserting that element renders correctly with label class set to 'null'.",
-        );
-    }
-
-    public function testRenderWithLabelClassOverridesFalse(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value value-override" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass('value-override')
-                ->render(),
-            "Failed asserting that element renders correctly with label class overrides set to 'false'.",
-        );
-    }
-
-    public function testRenderWithLabelClassOverridesTrue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value-override" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelAttributes(['class' => 'value'])
-                ->labelClass('value-override', true)
-                ->render(),
-            "Failed asserting that element renders correctly with label class overrides set to 'true'.",
-        );
-    }
-
-    public function testRenderWithLabelClassUsingEnum(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label class="value" for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelClass(BackedString::VALUE)
-                ->render(),
-            'Failed asserting that element renders correctly with label class.',
-        );
-    }
-
-    public function testRenderWithLabelFor(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label for="inputradio">Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelFor('inputradio')
-                ->render(),
-            "Failed asserting that element renders correctly with label 'for' attribute.",
-        );
-    }
-
-    public function testRenderWithLabelForNullValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            <label>Label</label>
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->labelFor(null)
-                ->render(),
-            "Failed asserting that element renders correctly with label 'for' attribute set to 'null'.",
-        );
-    }
-
     public function testRenderWithLang(): void
     {
         self::assertSame(
@@ -902,21 +649,6 @@ public function testRenderWithName(): void
         );
     }
 
-    public function testRenderWithNotLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input id="inputradio" type="radio">
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->label('Label')
-                ->notLabel()
-                ->render(),
-            "Failed asserting that element renders correctly with 'notLabel()' method.",
-        );
-    }
-
     public function testRenderWithRemoveAriaAttribute(): void
     {
         self::assertSame(
@@ -1142,45 +874,6 @@ public function testRenderWithTranslateUsingEnum(): void
         );
     }
 
-    public function testRenderWithUncheckedValue(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value" type="hidden" value="0">
-            <input id="inputradio" name="value" type="radio" value="1">
-            HTML,
-            InputRadio::tag()
-                ->id('inputradio')
-                ->name('value')
-                ->uncheckedValue('0')
-                ->value('1')
-                ->render(),
-            "Failed asserting that element renders correctly with 'uncheckedValue' attribute.",
-        );
-    }
-
-    public function testRenderWithUncheckedValueAndEnclosedByLabel(): void
-    {
-        self::assertSame(
-            <<<HTML
-            <input name="value" type="hidden" value="0">
-            <label>
-            <input id="inputradio" name="value" type="radio" value="1">
-            Label
-            </label>
-            HTML,
-            InputRadio::tag()
-                ->enclosedByLabel(true)
-                ->id('inputradio')
-                ->label('Label')
-                ->name('value')
-                ->uncheckedValue('0')
-                ->value('1')
-                ->render(),
-            "Failed asserting that element renders correctly with 'uncheckedValue' attribute and enclosed label.",
-        );
-    }
-
     public function testRenderWithUserOverridesGlobalDefaults(): void
     {
         SimpleFactory::setDefaults(
@@ -1225,40 +918,5 @@ public function testReturnNewInstanceWhenSettingAttribute(): void
             $inputRadio->checked(true),
             'Should return a new instance when setting the attribute, ensuring immutability.',
         );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->enclosedByLabel(true),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->label(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->labelAttributes([]),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->labelClass(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->labelFor(null),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->notLabel(),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
-        self::assertNotSame(
-            $inputRadio,
-            $inputRadio->uncheckedValue(''),
-            'Should return a new instance when setting the attribute, ensuring immutability.',
-        );
     }
 }

From f99a738609466e0683c916f32f6ebd157c7db22a Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <terabytesoftw@users.noreply.github.com>
Date: Sat, 21 Feb 2026 20:44:43 +0000
Subject: [PATCH 2/3] Apply fixes from StyleCI

---
 src/Form/InputFile.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Form/InputFile.php b/src/Form/InputFile.php
index e8ffe23..90b71aa 100644
--- a/src/Form/InputFile.php
+++ b/src/Form/InputFile.php
@@ -90,7 +90,6 @@ protected function loadDefault(): array
         return parent::loadDefault() + ['type' => [Type::FILE]];
     }
 
-
     /**
      * Renders the `<input>` element with its attributes.
      *

From c981cee08d9059502ac079cae0a6443c2c93858a Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <terabytesoftw@gmail.com>
Date: Sat, 21 Feb 2026 17:51:34 -0300
Subject: [PATCH 3/3] Apply Coderabbitai Nitpick comments.

---
 tests/Form/InputCheckboxTest.php | 1 -
 tests/Form/InputRadioTest.php    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tests/Form/InputCheckboxTest.php b/tests/Form/InputCheckboxTest.php
index 25ba7e2..740983d 100644
--- a/tests/Form/InputCheckboxTest.php
+++ b/tests/Form/InputCheckboxTest.php
@@ -25,7 +25,6 @@
  *   `tabindex`, `value`) and renders expected output.
  * - Handles edge cases for `checked` attribute with various data types and value comparisons.
  * - Renders attributes and string casting for a void element.
- * - Renders label configurations, including content, attributes, and tag name.
  * - Resolves default and theme providers, including global defaults and user overrides.
  *
  * @copyright Copyright (C) 2026 Terabytesoftw.
diff --git a/tests/Form/InputRadioTest.php b/tests/Form/InputRadioTest.php
index af7b752..39bf855 100644
--- a/tests/Form/InputRadioTest.php
+++ b/tests/Form/InputRadioTest.php
@@ -27,7 +27,6 @@
  *   `tabindex`, `value`) and renders expected output.
  * - Handles edge cases for `checked` attribute with various data types and value comparisons.
  * - Renders attributes and string casting for a void element.
- * - Renders label configurations, including content, attributes, and tag name.
  * - Resolves default and theme providers, including global defaults and user overrides.
  *
  * @copyright Copyright (C) 2026 Terabytesoftw.