Fix empty array validation

briedis · Apr 27, 2015 · 930df6c · 930df6c
1 parent c53e6a2
commit 930df6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Briedis/ApiBuilder/StructureValidator.php b/src/Briedis/ApiBuilder/StructureValidator.php
@@ -55,7 +55,7 @@ public function validate(array $input){
 
 		// Check for missing fields
 		foreach($this->structure->getItems() as $k => $v){
-			if(!array_key_exists($k, $input)){
+			if(!$v->isOptional && !array_key_exists($k, $input)){
 				$exception->addMissingField($k, $v);
 			}
 		}

diff --git a/tests/SingleDepthValidatorTest.php b/tests/SingleDepthValidatorTest.php
@@ -100,4 +100,18 @@ public function testUnexpectedParameter(){
 
 		$this->assertTrue($caught, 'Exception is caught');
 	}
+
+	public function testOptionalParameterMissing(){
+		$this->s->int('missing')->optional();
+		$input = [];
+		$this->assertTrue($this->v->validate($input), 'Optional parameter can be omitted');
+	}
+
+	public function testEmptyArrayIsValid(){
+		$this->s->int('numbers')->multiple();
+		$input = [
+			'numbers' => [],
+		];
+		$this->assertTrue($this->v->validate($input), 'Empty array is a valid type');
+	}
 }