Merge pull request #37 from jutein/fix-boolean-required

fix(Parameter): allow required boolean with value false
RETFU · Nov 23, 2020 · d0aa2ef · d0aa2ef
2 parents 020d03b + 6866f95
commit d0aa2ef
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Parameter.php b/src/Parameter.php
@@ -257,7 +257,7 @@ public function setDateFormat($dateFormat)
     public function assertValue($value)
     {
         // required?
-        if (empty($value)) {
+        if (!$this->hasValue($value)) {
             if ($this->getRequired()) {
                 $this->throwInvalidParameter($this->getName().' is required');
             }
@@ -361,4 +361,20 @@ protected function throwInvalidParameter($message)
             new Error($message, 'parameter-invalid'),
         ]);
     }
+
+    /**
+     * @param mixed $value
+     */
+    private function hasValue($value): bool
+    {
+        return !empty($value) || $this->isBooleanWithValueFalse($value);
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private function isBooleanWithValueFalse($value): bool
+    {
+        return $this->getType() === self::TYPE_BOOLEAN && is_bool($value) && $value === false;
+    }
 }
diff --git a/tests/units/Parameter.php b/tests/units/Parameter.php
@@ -250,4 +250,14 @@ function () {
             ->isInstanceOf('\RuntimeException')
         ;
     }
+
+    public function testAssertValueOnMandatoryFalseBoolean()
+    {
+        $this->newTestedInstance('name', 'boolean', true);
+        $this
+            ->given($this->testedInstance)
+            ->variable($this->testedInstance->assertValue(false))
+            ->isNull
+        ;
+    }
 }