add support for minItems when applying defaults

jsonrainbow · Mar 24, 2017 · ea6bf9f · ea6bf9f
1 parent 9eae2ae
commit ea6bf9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -254,11 +254,16 @@ protected function applyDefaultValues(&$value, $schema, $path)
             }
         } elseif (
             isset($schema->items) &&
-            LooseTypeCheck::isArray($schema->items) &&
             LooseTypeCheck::isArray($value)
         ) {
+            $items = [];
+            if (LooseTypeCheck::isArray($schema->items)) {
+                $items = $schema->items;
+            } elseif (isset($schema->minItems) && count($value) < $schema->minItems) {
+                $items = array_fill(count($value), $schema->minItems - 1, $schema->items);
+            }
             // $value is an array, and items are defined - treat as plain array
-            foreach ($schema->items as $currentItem => $itemDefinition) {
+            foreach ($items as $currentItem => $itemDefinition) {
                 if (
                     !array_key_exists($currentItem, $value)
                     && property_exists($itemDefinition, 'default')

diff --git a/tests/Constraints/DefaultPropertiesTest.php b/tests/Constraints/DefaultPropertiesTest.php
@@ -159,6 +159,11 @@ public function getValidTests()
                 '{"items":{"properties":{"propertyOne":{"default":"valueOne"}}}}',
                 '[]'
             ),
+            array(// #23 if items is a schema with a default value and minItems is present, fill the array
+                '["a"]',
+                '{"items":{"default":"b"}, "minItems": 3}',
+                '["a","b","b"]'
+            ),
         );
     }