Fix optional structures can be null.

briedis · Mar 22, 2017 · edad841 · edad841
1 parent cb623ed
commit edad841
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Briedis/ApiBuilder/StructureValidator.php b/src/Briedis/ApiBuilder/StructureValidator.php
@@ -87,6 +87,10 @@ private function validateParam($name, $value)
         }
 
         if ($item instanceof StructureItem) {
+            if ($item->isOptional && is_null($value)) {
+                return;
+            }
+
             if ($item->isArray) {
                 $this->validateArrayOfStructures($item, $value);
                 return;

diff --git a/tests/MultiDepthValidatorTest.php b/tests/MultiDepthValidatorTest.php
@@ -245,4 +245,15 @@ public function testStructureOfArrayReceivesInvalidStructure()
 
         self::assertFalse(true, 'This should not execute');
     }
+
+    public function testOptionalStructuresCanBeNull()
+    {
+        $item = (new StructureBuilder('MyStructure'));
+
+        $whole = (new SB)->struct('item', $item)->optional();
+
+        $structureValidator = new StructureValidator($whole);
+
+        self::assertTrue($structureValidator->validate(['item' => null]));
+    }
 }