Merge pull request #88 from swaggest/keep-proper-object-class

Keep proper object class

Author: vearutop

src/Schema.php

@@ -593,38 +593,38 @@ private function processObject($data, Context $options, $path, $result = null)
 
                 if ($this->useObjectAsArray) {
                     $result = array();
-                } elseif (!$result instanceof ObjectItemContract) {
+                } else {
                     //* todo check performance impact
                     if (null === $this->objectItemClass) {
-                        $result = new ObjectItem();
+                        if (!$result instanceof ObjectItemContract) {
+                            $result = new ObjectItem();
+                            $result->setDocumentPath($path);
+                        }
                     } else {
                         $className = $this->objectItemClass;
                         if ($options->objectItemClassMapping !== null) {
                             if (isset($options->objectItemClassMapping[$className])) {
                                 $className = $options->objectItemClassMapping[$className];
                             }
                         }
-                        $result = new $className;
-                    }
-                    //*/
-
-
-                    if ($result instanceof ClassStructure) {
-                        if ($result->__validateOnSet) {
-                            $result->__validateOnSet = false;
-                            /** @noinspection PhpUnusedLocalVariableInspection */
-                            /* todo check performance impact
-                            $validateOnSetHandler = new ScopeExit(function () use ($result) {
-                                $result->__validateOnSet = true;
-                            });
+                        if (null !== $result && get_class($result) !== $className) {
+                            $result = new $className;
+                            //* todo check performance impact
+                            if ($result instanceof ClassStructure) {
+                                $result->setDocumentPath($path);
+                                if ($result->__validateOnSet) {
+                                    $result->__validateOnSet = false;
+                                    /** @noinspection PhpUnusedLocalVariableInspection */
+                                    /* todo check performance impact
+                                    $validateOnSetHandler = new ScopeExit(function () use ($result) {
+                                        $result->__validateOnSet = true;
+                                    });
+                                    //*/
+                                }
+                            }
                             //*/
                         }
                     }
-
-                    //* todo check performance impact
-                    if ($result instanceof ObjectItemContract) {
-                        $result->setDocumentPath($path);
-                    }
                     //*/
                 }
             }

tests/src/Helper/ClassWithAllOf.php

@@ -0,0 +1,29 @@
+<?php
+
+
+namespace Swaggest\JsonSchema\Tests\Helper;
+
+
+use Swaggest\JsonSchema\Constraint\Properties;
+use Swaggest\JsonSchema\Schema;
+use Swaggest\JsonSchema\Structure\ClassStructure;
+
+class ClassWithAllOf extends ClassStructure
+{
+    public $myProperty;
+
+    /**
+     * @param Properties|static $properties
+     * @param Schema $ownerSchema
+     */
+    public static function setUpProperties($properties, Schema $ownerSchema)
+    {
+        $properties->myProperty = Schema::string();
+
+        $not = new Schema();
+        $not->not = Schema::integer();
+        $ownerSchema->allOf[0] = $not;
+    }
+
+
+}

tests/src/PHPUnit/ClassStructure/ClassStructureTest.php

@@ -4,6 +4,7 @@
 
 
 use Swaggest\JsonSchema\Exception\TypeException;
+use Swaggest\JsonSchema\Tests\Helper\ClassWithAllOf;
 use Swaggest\JsonSchema\Tests\Helper\LevelThreeClass;
 use Swaggest\JsonSchema\Tests\Helper\SampleStructure;
 use Swaggest\JsonSchema\Tests\Helper\StructureWithItems;
@@ -88,5 +89,12 @@ public function testSampleInvalid()
         ));
     }
 
+    public function testAllOfClassInstance()
+    {
+        $value = ClassWithAllOf::import((object)array('myProperty'=>'abc'));
+        $this->assertSame('abc', $value->myProperty);
+        $this->assertTrue($value instanceof ClassWithAllOf);
+    }
+
 
 }