Also fix infinite recursion via $ref for array defaults

Author: erayd

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -121,7 +121,7 @@ protected function validateCommonProperties(&$value, $schema = null, JsonPointer
 
         // Apply default values from schema
         if (!$path->fromDefault()) {
-            $this->applyDefaultValues($value, $schema);
+            $this->applyDefaultValues($value, $schema, $path);
         }
 
         // Verify required values
@@ -187,10 +187,11 @@ protected function validateCommonProperties(&$value, $schema = null, JsonPointer
     /**
      * Apply default values
      *
-     * @param mixed $value
-     * @param mixed $schema
+     * @param mixed       $value
+     * @param mixed       $schema
+     * @param JsonPointer $path
      */
-    protected function applyDefaultValues(&$value, $schema)
+    protected function applyDefaultValues(&$value, $schema, $path)
     {
         // only apply defaults if feature is enabled
         if (!$this->factory->getConfig(self::CHECK_MODE_APPLY_DEFAULTS)) {
@@ -249,10 +250,12 @@ protected function applyDefaultValues(&$value, $schema)
                         $value[$currentItem] = $itemDefinition->default;
                     }
                 }
+                $path->setFromDefault();
             }
         } elseif (($value instanceof self || $value === null) && isset($schema->default) && $shouldApply($schema)) {
             // $value is a leaf, not a container - apply the default directly
             $value = is_object($schema->default) ? clone $schema->default : $schema->default;
+            $path->setFromDefault();
         }
     }
 

tests/Constraints/DefaultPropertiesTest.php

@@ -112,12 +112,17 @@ public function getValidTests()
                 '{"propertyTwo":"valueTwo"}',
                 Constraint::CHECK_MODE_ONLY_REQUIRED_DEFAULTS
             ),
-            array(// #16 infinite recursion via $ref
+            array(// #16 infinite recursion via $ref (object)
                 '{}',
                 '{"properties":{"propertyOne": {"$ref": "#","default": {}}}}',
                 '{"propertyOne":{}}'
             ),
-            array(// #17 default value for null
+            array(// #17 infinite recursion via $ref (array)
+                '[]',
+                '{"items":[{"$ref":"#","default":[]}]}',
+                '[[]]'
+            ),
+            array(// #18 default value for null
                 'null',
                 '{"default":"valueOne"}',
                 '"valueOne"'