Use TypeCheck interface for object manipulation

jsonrainbow · Jan 18, 2017 · 9bbf292 · 9bbf292
1 parent 1cab31d
commit 9bbf292
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/JsonSchema/Constraints/TypeCheck/LooseTypeCheck.php b/src/JsonSchema/Constraints/TypeCheck/LooseTypeCheck.php
@@ -27,6 +27,16 @@ public static function propertyGet($value, $property)
         return $value[$property];
     }
 
+    public static function propertySet($value, $property, $data)
+    {
+        if (is_object($value)) {
+            $value->{$property} = $data;
+        }
+
+        $value[$property] = $data;
+    }
+
+
     public static function propertyExists($value, $property)
     {
         if (is_object($value)) {

diff --git a/src/JsonSchema/Constraints/TypeCheck/StrictTypeCheck.php b/src/JsonSchema/Constraints/TypeCheck/StrictTypeCheck.php
@@ -19,6 +19,11 @@ public static function propertyGet($value, $property)
         return $value->{$property};
     }
 
+    public static function propertySet($value, $property, $data)
+    {
+        $value->{$property} = $data;
+    }
+
     public static function propertyExists($value, $property)
     {
         return property_exists($value, $property);

diff --git a/src/JsonSchema/Constraints/TypeCheck/TypeCheckInterface.php b/src/JsonSchema/Constraints/TypeCheck/TypeCheckInterface.php
@@ -10,6 +10,8 @@ public static function isArray($value);
 
     public static function propertyGet($value, $property);
 
+    public static function propertySet($value, $property, $data);
+
     public static function propertyExists($value, $property);
 
     public static function propertyCount($value);

diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -123,11 +123,11 @@ protected function validateCommonProperties(&$value, $schema = null, JsonPointer
         if ($coerce && $this->factory->getCheckMode() & self::CHECK_MODE_APPLY_DEFAULTS) {
             if ($this->getTypeCheck()->isObject($value) && isset($schema->properties)) {
                 foreach ($schema->properties as $i => $propertyDefinition) {
-                    if (!isset($value->$i) && isset($propertyDefinition->default)) {
-                        $value->$i = $propertyDefinition->default;
+                    if (!$this->getTypeCheck()->propertyExists($value, $i) && isset($propertyDefinition->default)) {
+                        $this->getTypeCheck()->propertySet($value, $i, $propertyDefinition->default);
                     }
                 }
-            } elseif (is_array($value)) {
+            } elseif ($this->getTypeCheck()->isArray($value)) {
                 if (isset($schema->properties)) {
                     foreach ($schema->properties as $i => $propertyDefinition) {
                         if (!isset($value[$i]) && isset($propertyDefinition->default)) {