overriding mapping classes

Author: vearutop

README.md

@@ -324,4 +324,31 @@ $options->skipValidation = true;
 
 $res = $schema->in(json_decode('{"one":4}'), $options);
 $this->assertSame(4, $res->one);
+```
+
+
+#### Overriding mapping classes
+
+If you want to map data to a different class you can register mapping at top level of your importer structure.
+
+```
+class CustomSwaggerSchema extends SwaggerSchema
+{
+    public static function setUpProperties($properties, JsonBasicSchema $ownerSchema)
+    {
+        parent::setUpProperties($properties, $ownerSchema);
+        self::$objectItemClassMapping[Schema::className()] = CustomSchema::className();
+    }
+}
+```
+
+Or specify it in processing context
+
+```
+$context = new Context();
+$context->objectItemClassMapping[Schema::className()] = CustomSchema::className();
+$schema = SwaggerSchema::schema()->in(json_decode(
+    file_get_contents(__DIR__ . '/../../../../spec/petstore-swagger.json')
+), $context);
+$this->assertInstanceOf(CustomSchema::className(), $schema->definitions['User']);
 ```

src/Schema.php

@@ -371,12 +371,13 @@ public function process($data, Context $options, $path = '#', $result = null)
                     ) {
                         $refString = $data->{self::REF};
                         // TODO consider process # by reference here ?
-                        $preRefScope = $options->refResolver->getResolutionScope();
+                        $refResolver = $options->refResolver;
+                        $preRefScope = $refResolver->getResolutionScope();
                         /** @noinspection PhpUnusedLocalVariableInspection */
-                        $deferRefScope = new ScopeExit(function () use ($preRefScope, $options) {
-                            $options->refResolver->setResolutionScope($preRefScope);
+                        $deferRefScope = new ScopeExit(function () use ($preRefScope, $refResolver) {
+                            $refResolver->setResolutionScope($preRefScope);
                         });
-                        $ref = $options->refResolver->resolveReference($refString);
+                        $ref = $refResolver->resolveReference($refString);
                         if ($ref->isImported()) {
                             $refResult = $ref->getImported();
                             return $refResult;
@@ -597,27 +598,6 @@ public function setUseObjectAsArray($useObjectAsArray)
         return $this;
     }
 
-    /**
-     * @param bool|Schema $additionalProperties
-     * @return Schema
-     */
-    public function setAdditionalProperties($additionalProperties)
-    {
-        $this->additionalProperties = $additionalProperties;
-        return $this;
-    }
-
-    /**
-     * @param Schema|Schema[] $items
-     * @return Schema
-     */
-    public function setItems($items)
-    {
-        $this->items = $items;
-        return $this;
-    }
-
-
     private function fail(InvalidValue $exception, $path)
     {
         if ($path !== '#') {
@@ -676,13 +656,6 @@ public static function null()
     }
 
 
-    public static function create()
-    {
-        $schema = new static();
-        return $schema;
-    }
-
-
     /**
      * @param Properties $properties
      * @return Schema

src/Structure/ClassStructure.php

@@ -70,13 +70,14 @@ public static function properties()
      */
     public static function import($data, Context $options = null)
     {
+        $schema = static::schema();
         if (static::$objectItemClassMapping !== null) {
             if ($options === null) {
                 $options = new Context();
             }
             $options->objectItemClassMapping = static::$objectItemClassMapping;
         }
-        return static::schema()->in($data, $options);
+        return $schema->in($data, $options);
     }
 
     /**

tests/src/Helper/CustomSchema.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\Helper;
+
+use Swaggest\JsonSchema\SwaggerSchema\Schema;
+
+class CustomSchema extends Schema
+{
+
+}

tests/src/Helper/CustomSwaggerSchema.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\Helper;
+
+
+use Swaggest\JsonSchema\Schema as JsonBasicSchema;
+use Swaggest\JsonSchema\SwaggerSchema\Schema;
+use Swaggest\JsonSchema\SwaggerSchema\SwaggerSchema;
+
+class CustomSwaggerSchema extends SwaggerSchema
+{
+    public static function setUpProperties($properties, JsonBasicSchema $ownerSchema)
+    {
+        parent::setUpProperties($properties, $ownerSchema);
+        self::$objectItemClassMapping[Schema::className()] = CustomSchema::className();
+    }
+}

tests/src/PHPUnit/CustomMapping/CustomMappingTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Swaggest\JsonSchema\Tests\PHPUnit\CustomMapping;
+
+
+use Swaggest\JsonSchema\Context;
+use Swaggest\JsonSchema\SwaggerSchema\Schema;
+use Swaggest\JsonSchema\SwaggerSchema\SwaggerSchema;
+use Swaggest\JsonSchema\Tests\Helper\CustomSchema;
+use Swaggest\JsonSchema\Tests\Helper\CustomSwaggerSchema;
+
+class CustomMappingTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMapping() {
+        $schema = CustomSwaggerSchema::import(json_decode(
+            file_get_contents(__DIR__ . '/../../../../spec/petstore-swagger.json')
+        ));
+
+        $this->assertInstanceOf(CustomSchema::className(), $schema->definitions['User']);
+    }
+
+    public function testMappingWithContext() {
+        $context = new Context();
+        $context->objectItemClassMapping[Schema::className()] = CustomSchema::className();
+        $schema = SwaggerSchema::schema()->in(json_decode(
+            file_get_contents(__DIR__ . '/../../../../spec/petstore-swagger.json')
+        ), $context);
+        $this->assertInstanceOf(CustomSchema::className(), $schema->definitions['User']);
+
+    }
+
+}

tests/src/PHPUnit/Schema/ObjectStructure.php renamed to tests/src/PHPUnit/Schema/ObjectStructureTest.php

@@ -5,7 +5,7 @@
 
 use Swaggest\JsonSchema\Schema;
 
-class ObjectStructure extends \PHPUnit_Framework_TestCase
+class ObjectStructureTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testObjectAsArray()