[FRAM-126] Handle empty string on DateTimeElement and BooleanStringEl…

…ement (#9) * fix: Handle empty string on DateTimeElement and BooleanStringElement (#FRAM-126) * ci: fix psalm error
b2pweb · Jul 26, 2023 · a6dec95 · a6dec95
1 parent 18c41e9
commit a6dec95
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 3 deletions.
diff --git a/src/Leaf/BooleanStringElement.php b/src/Leaf/BooleanStringElement.php
@@ -18,14 +18,26 @@
  */
 class BooleanStringElement extends AbstractBooleanElement
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @return scalar|null
+     * @psalm-suppress ImplementedReturnTypeMismatch
+     */
+    protected function sanitize($rawValue)
+    {
+        // Does not cast to string, to allow boolean value
+        return is_scalar($rawValue) ? $rawValue : null;
+    }
+
     /**
      * {@inheritdoc}
      *
      * @return bool|null
      */
     protected function toPhp($httpValue): ?bool
     {
-        if ($httpValue === null) {
+        if ($httpValue === null || $httpValue === '') {
             return null;
         }
 
@@ -34,7 +46,7 @@ protected function toPhp($httpValue): ?bool
         }
 
         /** @var bool|null */
-        return filter_var($httpValue, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+        return filter_var((string) $httpValue, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
     }
 
     /**

diff --git a/src/Leaf/Date/DateTimeElement.php b/src/Leaf/Date/DateTimeElement.php
@@ -89,7 +89,7 @@ public function dateTimeClassName(): string
      */
     protected function toPhp($httpValue): ?DateTimeInterface
     {
-        if ($httpValue === null) {
+        if ($httpValue === null || $httpValue === '') {
             return null;
         }
 

diff --git a/tests/Leaf/BooleanStringElementTest.php b/tests/Leaf/BooleanStringElementTest.php
@@ -89,6 +89,22 @@ public function test_submit_null()
         $this->assertTrue($element->error()->empty());
     }
 
+    /**
+     *
+     */
+    public function test_submit_empty()
+    {
+        $element = new BooleanStringElement();
+
+        $this->assertTrue($element->submit('')->valid());
+        $this->assertNull($element->value());
+        $this->assertTrue($element->error()->empty());
+
+        $this->assertTrue($element->submit([])->valid());
+        $this->assertNull($element->value());
+        $this->assertTrue($element->error()->empty());
+    }
+
     /**
      *
      */

diff --git a/tests/Leaf/Date/DateTimeElementTest.php b/tests/Leaf/Date/DateTimeElementTest.php
@@ -117,6 +117,22 @@ public function test_submit_null()
         $this->assertTrue($element->error()->empty());
     }
 
+    /**
+     *
+     */
+    public function test_submit_empty()
+    {
+        $element = new DateTimeElement();
+
+        $this->assertTrue($element->submit('')->valid());
+        $this->assertNull($element->value());
+        $this->assertTrue($element->error()->empty());
+
+        $this->assertTrue($element->submit([])->valid());
+        $this->assertNull($element->value());
+        $this->assertTrue($element->error()->empty());
+    }
+
     /**
      *
      */