Merge pull request #78 from swaggest/broken-mapping

Restore proper $ref handling in mapped classes (broken in v0.12.6)

Author: vearutop

src/Schema.php

@@ -665,7 +665,14 @@ private function processObject($data, Context $options, $path, $result = null)
                 $dereference = true;
 
                 if ($this->properties !== null && isset($array[self::PROP_REF])) {
-                    $refProperty = $this->properties[self::PROP_REF];
+                    $refPropName = self::PROP_REF;
+                    if ($hasMapping) {
+                        if (isset($this->properties->__dataToProperty[$options->mapping][self::PROP_REF])) {
+                            $refPropName = $this->properties->__dataToProperty[$options->mapping][self::PROP_REF];
+                        }
+                    }
+
+                    $refProperty = $this->properties[$refPropName];
 
                     if (isset($refProperty) && ($refProperty->format !== Format::URI_REFERENCE)) {
                         $dereference = false;

src/Structure/ObjectItemTrait.php

@@ -16,6 +16,7 @@ trait ObjectItemTrait
     /** @var ObjectItemContract[] */
     protected $__nestedObjects;
     protected $__documentPath;
+    /** @var null|string[] */
     protected $__fromRef;
 
     public function getNestedObject($className)
@@ -112,7 +113,7 @@ public function setDocumentPath($path)
     }
 
     /**
-     * @return string
+     * @return string|null
      * @deprecated use ObjectItemContract::getFromRefs
      * @see ObjectItemContract::getFromRefs
      * @todo remove