Also dereference array definitions prior to default value check

jsonrainbow · Feb 13, 2018 · 8a5ac14 · 8a5ac14
1 parent 91f5891
commit 8a5ac14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -265,6 +265,7 @@ protected function applyDefaultValues(&$value, $schema, $path)
             }
             // $value is an array, and items are defined - treat as plain array
             foreach ($items as $currentItem => $itemDefinition) {
+                $itemDefinition = $this->factory->getSchemaStorage()->resolveRefSchema($itemDefinition);
                 if (
                     !array_key_exists($currentItem, $value)
                     && property_exists($itemDefinition, 'default')

diff --git a/tests/Constraints/DefaultPropertiesTest.php b/tests/Constraints/DefaultPropertiesTest.php
@@ -126,7 +126,7 @@ public function getValidTests()
             ),
             array(// #16 infinite recursion via $ref (array)
                 '[]',
-                '{"items":[{"$ref":"#","default":[]}]}',
+                '{"items":[{"$ref":"#","default":"valueOne"}], "default": []}',
                 '[[]]'
             ),
             array(// #17 default top value does not overwrite defined null