checkbox now return '0' or '1'

Vitexus · Vitexus · commit 6d3445a0e435 · 2024-11-27T12:04:45.000+01:00
select tag update
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
      */

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ public function setValue($value = true): void`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`73`		`- * Obtains curent checkbox state.`
	`73`	`+ * Obtains current checkbox state.`
`74`	`74`	`*`
`75`		`- * @return bool $value`
	`75`	`+ * @return string $value '0' or '1'`
`76`	`76`	`*/`
`77`		`- public function getValue()`
	`77`	`+ public function getValue(): ?string`
`78`	`78`	`{`
`79`		`- return $this->getTagProperty('checked') === 'true';`
	`79`	`+ return $this->getTagProperty('checked') ? '1' : '0';`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ public function setValue(string $value);`
`32`	`32`	`*`
`33`	`33`	`* @return string $value`
`34`	`34`	`*/`
`35`		`- public function getValue();`
	`35`	`+ public function getValue(): ?string;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ public function setValue($value): void`
`60`	`60`	`/**`
`61`	`61`	`* Returns the value of an input field.`
`62`	`62`	`*`
`63`		`- * @return string $value`
	`63`	`+ * @return null\|string $value`
`64`	`64`	`*/`
`65`		`- public function getValue()`
	`65`	`+ public function getValue(): ?string`
`66`	`66`	`{`
`67`	`67`	`return $this->getTagProperty('value');`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,18 +40,18 @@ class SelectTag extends PairTag implements Input`
`40`	`40`	`/**`
`41`	`41`	`* Html select box.`
`42`	`42`	`*`
`43`		`- * @param string $name name`
`44`		`- * @param array $items items`
`45`		`- * @param string $defaultValue default item id`
`46`		`- * @param array $properties select tag properties`
	`43`	`+ * @param string $name name`
	`44`	`+ * @param array<string, string> $items items`
	`45`	`+ * @param string $defaultValue default item id`
	`46`	`+ * @param array<string, string> $properties select tag properties`
`47`	`47`	`*/`
`48`	`48`	`public function __construct(string $name, array $items = [], string $defaultValue = '', array $properties = [])`
`49`	`49`	`{`
`50`	`50`	`parent::__construct('select', $properties);`
`51`	`51`	`$this->defaultValue = $defaultValue;`
`52`	`52`	`$this->setTagName($name);`
`53`	`53`
`54`		`- if (\is_array($items)) {`
	`54`	`+ if ($items) {`
`55`	`55`	`$this->addItems($items);`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -68,7 +68,7 @@ public function addItems(array $items): array`
`68`	`68`	`foreach ($items as $itemName => $itemValue) {`
`69`	`69`	`$added[$itemName] = $this->addItem(new OptionTag((string) $itemValue, (string) $itemName));`
`70`	`70`
`71`		`- if ($this->defaultValue === $itemName) {`
	`71`	`+ if ($this->defaultValue === (string) $itemName) {`
`72`	`72`	`$this->lastItem()->setDefault();`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -160,14 +160,18 @@ public function disableItem($itemID): void`
`160`	`160`	`* Get value of selected item.`
`161`	`161`	`*/`
`162`	`162`	`#[\Override]`
`163`		`- public function getValue(): string`
	`163`	`+ public function getValue(): ?string`
`164`	`164`	`{`
	`165`	`+ $value = null;`
	`166`	`+`
`165`	`167`	`foreach ($this->pageParts as $option) {`
`166`	`168`	`$pos = array_search('selected', $option->tagProperties, true);`
`167`	`169`
`168`	`170`	`if (($pos !== false) && is_numeric($pos)) {`
`169`		`- return $option->getValue();`
	`171`	`+ $value = $option->getValue();`
`170`	`172`	`}`
`171`	`173`	`}`
	`174`	`+`
	`175`	`+ return $value;`
`172`	`176`	`}`
`173`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ protected function tearDown(): void`
`46`	`46`	`public function testSetValue(): void`
`47`	`47`	`{`
`48`	`48`	`$this->object->setValue(true);`
`49`		`- $this->assertTrue($this->object->getValue());`
	`49`	`+ $this->assertEquals('1', $this->object->getValue());`
`50`	`50`	`$this->object->setValue(false);`
`51`		`- $this->assertFalse($this->object->getValue());`
	`51`	`+ $this->assertEquals('0', $this->object->getValue());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`@@ -57,9 +57,9 @@ public function testSetValue(): void`
`57`	`57`	`public function testGetValue(): void`
`58`	`58`	`{`
`59`	`59`	`$this->object->setValue(true);`
`60`		`- $this->assertTrue($this->object->getValue());`
	`60`	`+ $this->assertEquals('1', $this->object->getValue());`
`61`	`61`	`$this->object->setValue(false);`
`62`		`- $this->assertFalse($this->object->getValue());`
	`62`	`+ $this->assertEquals('0', $this->object->getValue());`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected function setUp(): void`
`39`	`39`	`protected function tearDown(): void`
`40`	`40`	`{`
`41`	`41`	`}`
`42`		`-`
	`42`	`+`
`43`	`43`	`/**`
`44`	`44`	`* @covers \Ease\Html\SubmitButton::__construct`
`45`	`45`	`*/`