Validator: fixed validating empty array as valid map value [closes #17]

schematicon · Mar 20, 2019 · 9ad9759 · 9ad9759
1 parent 0815267
commit 9ad9759
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Validator.php b/src/Validator.php
@@ -241,7 +241,7 @@ public function validate($data): Result
 							}
 						}
 					} elseif ($type === 'map') {
-						if ((is_array($node) || $node instanceof \stdClass) && !Helpers::isArray($node)) {
+						if ((is_array($node) || $node instanceof \stdClass) && ((is_array($node) && count($node) === 0) || !Helpers::isArray($node))) {
 							$isValid = $this->validateInnerProperties($node, $schema, $path, $stack, $errors);
 							if ($isValid) {
 								break;

diff --git a/tests/cases/validate.map.phpt b/tests/cases/validate.map.phpt
@@ -41,6 +41,10 @@ coercion:
 	type: map
 	properties:
 		live: bool
+alloptional:
+	type: map
+	properties:
+		?type: string
 NEON
 );
 
@@ -175,3 +179,16 @@ Assert::same(true, $result->getData()['live']);
 $result = $validator->validate((object) ['live' => '1']);
 Assert::true($result->isValid());
 Assert::same(true, $result->getData()->live);
+
+
+// =====================================================================================================================
+
+
+$validator = new Validator(prepareSchema($config['alloptional']));
+$validator->coerceStringToBool = true;
+
+$result = $validator->validate([]);
+Assert::true($result->isValid());
+
+$result = $validator->validate((object) []);
+Assert::true($result->isValid());