fix RefResolver to better support extend and $ref

Author: janmentzel

src/JsonSchema/RefResolver.php

@@ -83,12 +83,15 @@ public function resolve($schema, $sourceUri = null)
             return;
         }
 
-        if (null === $sourceUri && ! empty($schema->id)) {
-            $sourceUri = $schema->id;
+        if (!empty($schema->id)) {
+            $sourceUri = $this->getUriRetriever()->resolve($schema->id, $sourceUri);
         }
 
         // Resolve $ref first
         $this->resolveRef($schema, $sourceUri);
+        // Resolve extends first
+        $this->resolveExtends($schema, $sourceUri);
+
 
         // These properties are just schemas
         // eg.  items can be a schema or an array of schemas
@@ -189,6 +192,69 @@ public function resolveRef($schema, $sourceUri)
         }
     }
 
+    /**
+     * Look for the $ref property in the object.  If found, remove the
+     * reference and augment this object with the contents of another
+     * schema.
+     *
+     * @param object $schema    JSON Schema to flesh out
+     * @param string $sourceUri URI where this schema was located
+     */
+    public function resolveExtends($schema, $sourceUri)
+    {
+        if (empty($schema->extends)) {
+            return;
+        }
+        if(is_object($schema->extends)) {
+            self::merge($schema, $schema->extends);
+        } else {
+            if(is_array($schema->extends)) {
+                foreach($schema->extends as $extends) {
+                    // yeah, some copy paste here
+                    if(is_object($schema)) {
+                        self::merge($schema, $schema);
+                    } else {
+                        $refSchema = $this->fetchRef($extends, $sourceUri);
+                        $refSchema = $this->getUriRetriever()->resolvePointer($refSchema, $extends);
+                        self::merge($schema, $refSchema);
+                    }
+                }
+            } else {
+                $refSchema = $this->fetchRef($schema->extends, $sourceUri);
+                $refSchema = $this->getUriRetriever()->resolvePointer($refSchema, $schema->extends);
+                self::merge($schema, $refSchema);
+            }
+        }
+        unset($schema->extends);
+    }
+
+    /**
+    * recursively merges all fields of $b into $a
+    * fields in a win
+    * @param stdObject $a
+    * @param stdObject $b
+    * @return void
+    */
+    static function merge($a, $b) {
+        if(!$a) return;
+        if(!$b) return;
+        foreach($b as $k=>$v) {
+            if(is_object($v)) {
+                if(!isset($a->$k)) $a->$k = new \stdClass;
+                self::merge($a->$k, $b->$k);
+            } elseif(is_array($v)) {
+                if(!isset($a->$k)) {
+                    $a->$k = $b->$k;
+                } elseif(is_array($a->$k)) {
+                    $a->$k = array_merge_recursive($b->$k, $a->$k); // a should win
+                }
+            } else {
+                if(isset($a->$k)) continue; // a should win
+                $a->$k = $b->$k;
+            }
+        }
+    }
+
     /**
      * Set URI Retriever for use with the Ref Resolver
      *

tests/JsonSchema/Tests/RefResolverTest.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JsonSchema\Tests;
+namespace JsonSchema;
 
 class RefResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -184,4 +184,71 @@ public function refProvider() {
 			),
 		);
 	}
+
+	public function testMerge() {
+		$a = (object) array('a' => '1');
+		$b = new \stdClass;
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a'=>'1'), $a);
+
+		$a = (object) array('a' => '1');
+		$b = (object) array('a' => '2');
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a'=>'1'), $a);
+
+		$a = (object) array('a' => array(1,2,3));
+		$b = (object) array('a' => array(4));
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a'=>array(4,1,2,3)), $a); // $b values are prependet :(  not nice but no issue
+
+		$a = new \stdClass;
+		$b = (object) array('a' => array(4));
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a'=>array(4)), $a);
+
+		$a = (object) array('a' => array(1,2,3));
+		$b = new \stdClass;
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a'=>array(1,2,3)), $a);
+
+		$a = (object) array('a' => 'in a');
+		$b = (object) array('b' => 'from b');
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object)array('a' => 'in a', 'b' => 'from b'), $a);
+
+		$a = null;
+		$b = (object) array('b' => 'from b');
+		RefResolver::merge($a, $b);
+		$this->assertEquals(null, $a);
+
+		$a = (object) array('a' => 'in a');
+		$b = null;
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('a' => 'in a'), $a);
+
+		$a = (object) array('a' => '1', 'c'=>(object)array('d'=>'from a'));
+		$b = (object) array('a' => '1', 'c'=>(object)array('d'=>'from b'));
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('a' => '1', 'c'=>(object)array('d'=>'from a')), $a);
+
+		$a = (object) array('a' => '1');
+		$b = (object) array('a' => '1', 'c'=>(object)array('d'=>'from b'));
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('a' => '1', 'c'=>(object)array('d'=>'from b')), $a);
+
+		$a = (object) array('a' => '1');
+		$b = (object) array('a' => '1', 'c'=>'from b');
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('a' => '1', 'c'=>'from b'), $a);
+
+		$a = (object) array('a' => '1', 'c'=>'from a');
+		$b = (object) array('a' => '1');
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('a' => '1', 'c'=>'from a'), $a);
+
+		$a = (object) array('fields' => array('1 from a', '2 from a'));
+		$b = (object) array('fields' => array('1 from b', '2 from b'));
+		RefResolver::merge($a, $b);
+		$this->assertEquals((object) array('fields' => array('1 from b', '2 from b', '1 from a', '2 from a')), $a);
+	}
 }