checkbox now return '0' or '1'

select tag update
VitexSoftware · Nov 27, 2024 · 6d3445a · 6d3445a
1 parent d6f36eb
commit 6d3445a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/src/Ease/Html/CheckboxTag.php b/src/Ease/Html/CheckboxTag.php
@@ -70,12 +70,12 @@ public function setValue($value = true): void
     }
 
     /**
-     * Obtains curent checkbox state.
+     * Obtains current checkbox state.
      *
-     * @return bool $value
+     * @return string $value '0' or '1'
      */
-    public function getValue()
+    public function getValue(): ?string
     {
-        return $this->getTagProperty('checked') === 'true';
+        return $this->getTagProperty('checked') ? '1' : '0';
     }
 }
diff --git a/src/Ease/Html/Input.php b/src/Ease/Html/Input.php
@@ -32,5 +32,5 @@ public function setValue(string $value);
      *
      * @return string $value
      */
-    public function getValue();
+    public function getValue(): ?string;
 }
diff --git a/src/Ease/Html/InputTag.php b/src/Ease/Html/InputTag.php
@@ -60,9 +60,9 @@ public function setValue($value): void
     /**
      * Returns the value of an input field.
      *
-     * @return string $value
+     * @return null|string $value
      */
-    public function getValue()
+    public function getValue(): ?string
     {
         return $this->getTagProperty('value');
     }

diff --git a/src/Ease/Html/SelectTag.php b/src/Ease/Html/SelectTag.php
@@ -40,18 +40,18 @@ class SelectTag extends PairTag implements Input
     /**
      * Html select box.
      *
-     * @param string $name         name
-     * @param array  $items        items
-     * @param string $defaultValue default item id
-     * @param array  $properties   select tag properties
+     * @param string                $name         name
+     * @param array<string, string> $items        items
+     * @param string                $defaultValue default item id
+     * @param array<string, string> $properties   select tag properties
      */
     public function __construct(string $name, array $items = [], string $defaultValue = '', array $properties = [])
     {
         parent::__construct('select', $properties);
         $this->defaultValue = $defaultValue;
         $this->setTagName($name);
 
-        if (\is_array($items)) {
+        if ($items) {
             $this->addItems($items);
         }
     }
@@ -68,7 +68,7 @@ public function addItems(array $items): array
         foreach ($items as $itemName => $itemValue) {
             $added[$itemName] = $this->addItem(new OptionTag((string) $itemValue, (string) $itemName));
 
-            if ($this->defaultValue === $itemName) {
+            if ($this->defaultValue === (string) $itemName) {
                 $this->lastItem()->setDefault();
             }
         }
@@ -160,14 +160,18 @@ public function disableItem($itemID): void
      * Get value of selected item.
      */
     #[\Override]
-    public function getValue(): string
+    public function getValue(): ?string
     {
+        $value = null;
+
         foreach ($this->pageParts as $option) {
             $pos = array_search('selected', $option->tagProperties, true);
 
             if (($pos !== false) && is_numeric($pos)) {
-                return $option->getValue();
+                $value = $option->getValue();
             }
         }
+
+        return $value;
     }
 }
diff --git a/tests/src/Ease/Html/BodyTagTest.php b/tests/src/Ease/Html/BodyTagTest.php
@@ -22,7 +22,8 @@ class BodyTagTest extends PairTagTest
 {
     public string $rendered = '<body></body>';
     public string $renderedEmpty = '<body></body>';
-    public string $renderedWithJS = '<body>
+    public string $renderedWithJS = <<<'EOD'
+<body>
 
 <script>
 // <![CDATA[
@@ -36,8 +37,8 @@ class BodyTagTest extends PairTagTest
 $(document).ready(function () { alert("hallo"); });
 // ]]>
 </script>
-</body>';
-    
+</body>
+EOD;
     protected $object;
 
     /**

diff --git a/tests/src/Ease/Html/CheckboxTagTest.php b/tests/src/Ease/Html/CheckboxTagTest.php
@@ -46,9 +46,9 @@ protected function tearDown(): void
     public function testSetValue(): void
     {
         $this->object->setValue(true);
-        $this->assertTrue($this->object->getValue());
+        $this->assertEquals('1', $this->object->getValue());
         $this->object->setValue(false);
-        $this->assertFalse($this->object->getValue());
+        $this->assertEquals('0', $this->object->getValue());
     }
 
     /**
@@ -57,9 +57,9 @@ public function testSetValue(): void
     public function testGetValue(): void
     {
         $this->object->setValue(true);
-        $this->assertTrue($this->object->getValue());
+        $this->assertEquals('1', $this->object->getValue());
         $this->object->setValue(false);
-        $this->assertFalse($this->object->getValue());
+        $this->assertEquals('0', $this->object->getValue());
     }
 
     /**

diff --git a/tests/src/Ease/Html/SubmitButtonTest.php b/tests/src/Ease/Html/SubmitButtonTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
     }
-    
+
     /**
      * @covers \Ease\Html\SubmitButton::__construct
      */