Fix checkbox and radio input rendering. (#173)

php-forge · Dec 22, 2023 · 73f5a33 · 73f5a33
1 parent 0c5272b
commit 73f5a33
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/src/Input/Base/AbstractChoice.php b/src/Input/Base/AbstractChoice.php
@@ -47,10 +47,11 @@ protected function run(): string
         }
 
         $attributes['value'] = is_bool($value) ? (int) $value : $value;
+        $checkedValue = is_bool($this->checkedValue) ? (int) $this->checkedValue : $this->checkedValue;
 
-        $attributes['checked'] = match (empty($this->checkedValue)) {
+        $attributes['checked'] = match (empty($checkedValue)) {
             true => $this->checked,
-            default => $attributes['value'] === $this->checkedValue,
+            default => $attributes['value'] === $checkedValue,
         };
 
         $inputCheckboxTag = $this->buildInputTag($attributes, $this->type, $this->generateUncheckTag());

diff --git a/tests/Input/Checkbox/RenderTest.php b/tests/Input/Checkbox/RenderTest.php
@@ -612,7 +612,7 @@ public function testValue(): void
         Assert::equalsWithoutLE(
             <<<HTML
             <label for="text-6582f2d099e8b">
-            <input id="text-6582f2d099e8b" type="checkbox" value="1">
+            <input id="text-6582f2d099e8b" type="checkbox" value="1" checked>
             Active
             </label>
             HTML,

diff --git a/tests/Input/Color/RenderTest.php b/tests/Input/Color/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Color;
+namespace PHPForge\Html\Tests\Input\Color;
 
 use PHPForge\Html\Input\Color;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Date/RenderTest.php b/tests/Input/Date/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Date;
+namespace PHPForge\Html\Tests\Input\Date;
 
 use PHPForge\Html\Input\Date;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Datetime/RenderTest.php b/tests/Input/Datetime/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Datetime;
+namespace PHPForge\Html\Tests\Input\Datetime;
 
 use PHPForge\Html\Input\Datetime;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/DatetimeLocal/RenderTest.php b/tests/Input/DatetimeLocal/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\DatetimeLocal;
+namespace PHPForge\Html\Tests\Input\DatetimeLocal;
 
 use PHPForge\Html\Input\DatetimeLocal;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Month/RenderTest.php b/tests/Input/Month/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Month;
+namespace PHPForge\Html\Tests\Input\Month;
 
 use PHPForge\Html\Input\Month;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Radio/RenderTest.php b/tests/Input/Radio/RenderTest.php
@@ -589,7 +589,7 @@ public function testValue(): void
         Assert::equalsWithoutLE(
             <<<HTML
             <label for="radio-6582f2d099e8b">
-            <input id="radio-6582f2d099e8b" type="radio" value="1">
+            <input id="radio-6582f2d099e8b" type="radio" value="1" checked>
             Active
             </label>
             HTML,

diff --git a/tests/Input/Range/RenderTest.php b/tests/Input/Range/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Range;
+namespace PHPForge\Html\Tests\Input\Range;
 
 use PHPForge\Html\Input\Range;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Text/RenderTest.php b/tests/Input/Text/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Text;
+namespace PHPForge\Html\Tests\Input\Text;
 
 use PHPForge\Html\Input\Text;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Time/RenderTest.php b/tests/Input/Time/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Time;
+namespace PHPForge\Html\Tests\Input\Time;
 
 use PHPForge\Html\Input\Time;
 use PHPForge\Support\Assert;

diff --git a/tests/Input/Week/RenderTest.php b/tests/Input/Week/RenderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\WeeK;
+namespace PHPForge\Html\Tests\Input\Week;
 
 use PHPForge\Html\Input\Week;
 use PHPForge\Support\Assert;