Add test case to reproduce missing class if allOf is present

Author: vearutop

src/Schema.php

@@ -593,7 +593,7 @@ private function processObject($data, Context $options, $path, $result = null)
 
                 if ($this->useObjectAsArray) {
                     $result = array();
-                } elseif (!$result instanceof ObjectItemContract) {
+                } else/*if (!$result instanceof ObjectItemContract || null !== $this->objectItemClass)*/ {
                     //* todo check performance impact
                     if (null === $this->objectItemClass) {
                         $result = new ObjectItem();

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);
+    }
+
 
 }