fixed tests

Author: vearutop

src/MagicMap.php

@@ -117,4 +117,12 @@ public function rewind()
     }
 
 
+    public function __isset($name)
+    {
+        if (isset($this->__arrayOfData[$name])) {
+            return true;
+        } else {
+            return isset($this->$name);
+        }
+    }
 }

src/Schema.php

@@ -428,15 +428,19 @@ public function process($data, Context $options, $path = '#', $result = null)
                 }
 
                 $found = false;
-                if (isset($this->dependencies->$key)) {
-                    $dependencies = $this->dependencies->$key;
-                    if ($dependencies instanceof Schema) {
-                        $dependencies->process($data, $options, $path . '->dependencies:' . $key);
-                    } else {
-                        foreach ($dependencies as $item) {
-                            if (!property_exists($data, $item)) {
-                                $this->fail(new ObjectException('Dependency property missing: ' . $item,
-                                    ObjectException::DEPENDENCY_MISSING), $path);
+
+                if (!empty($this->dependencies)) {
+                    $deps = $this->dependencies;
+                    if (isset($deps->$key)) {
+                        $dependencies = $deps->$key;
+                        if ($dependencies instanceof Schema) {
+                            $dependencies->process($data, $options, $path . '->dependencies:' . $key);
+                        } else {
+                            foreach ($dependencies as $item) {
+                                if (!property_exists($data, $item)) {
+                                    $this->fail(new ObjectException('Dependency property missing: ' . $item,
+                                        ObjectException::DEPENDENCY_MISSING), $path);
+                                }
                             }
                         }
                     }

tests/src/PHPUnit/ClassStructure/ObjectItemTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace PHPUnit\ClassStructure;
+
+
+use Swaggest\JsonSchema\Structure\ObjectItem;
+
+class ObjectItemTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIndirectIsset()
+    {
+        $o = new ObjectItem();
+        $this->assertSame(false, isset($o->a));
+        $this->assertSame(false, isset($o->a->b));
+
+        $o->a = (object)array();
+        $this->assertSame(true, isset($o->a));
+        $this->assertSame(false, isset($o->a->b));
+
+        $o->a->b = 1;
+        $this->assertSame(true, isset($o->a->b));
+    }
+
+}

tests/src/PHPUnit/Constraint/DependenciesTest.php

@@ -3,6 +3,7 @@
 namespace Swaggest\JsonSchema\Tests\PHPUnit\Constraint;
 
 
+use Swaggest\JsonSchema\InvalidValue;
 use Swaggest\JsonSchema\Schema;
 
 class DependenciesTest extends \PHPUnit_Framework_TestCase
@@ -32,4 +33,26 @@ public function testSubschemaDeps()
         $this->assertSame(2, $imported->bar);
     }
 
+    public function testMissingDependencies() {
+        $schemaJson = <<<JSON
+{
+    "dependencies": {
+        "bar": [
+            "foo"
+        ]
+    }
+}
+JSON;
+        $dataJson = <<<JSON
+{
+    "bar": 2
+}
+JSON;
+
+
+        $schema = Schema::import(json_decode($schemaJson));
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in(json_decode($dataJson));
+    }
+
 }