Merge remote-tracking branch 'origin/MAGETWO-52105' into MAGETWO-52835

Author: NadiyaS

lib/internal/Magento/Framework/EntityManager/MetadataPool.php

@@ -106,4 +106,15 @@ public function getHydrator($entityType)
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         return $objectManager->get(HydratorPool::class)->getHydrator($entityType);
     }
+
+    /**
+     * Check if entity type configuration was set to metadata
+     *
+     * @param string $entityType
+     * @return bool
+     */
+    public function hasConfiguration($entityType)
+    {
+        return isset($this->metadata[$entityType]);
+    }
 }

lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php

@@ -17,10 +17,16 @@ class TypeResolverTest extends \PHPUnit_Framework_TestCase
      */
     private $resolver;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
     public function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->resolver = new \Magento\Framework\EntityManager\TypeResolver();
+        $this->metadataPoolMock = $this->getMock('\Magento\Framework\EntityManager\MetadataPool', [], [], '', false);
+        $this->resolver = new \Magento\Framework\EntityManager\TypeResolver($this->metadataPoolMock);
     }
 
     /**
@@ -31,6 +37,13 @@ public function setUp()
     public function testResolve($dataObject, $interfaceName)
     {
         $customerDataObject = $this->objectManager->getObject($dataObject);
+        $this->metadataPoolMock->expects($this->any())
+            ->method('hasConfiguration')
+            ->willReturnMap(
+                [
+                   [$interfaceName, true]
+                ]
+            );
         $this->assertEquals($interfaceName, $this->resolver->resolve($customerDataObject));
     }
 

lib/internal/Magento/Framework/EntityManager/TypeResolver.php

@@ -10,6 +10,11 @@
  */
 class TypeResolver
 {
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @var array
      */
@@ -18,6 +23,15 @@ class TypeResolver
         \Magento\SalesRule\Model\Rule\Interceptor::class => \Magento\SalesRule\Api\Data\RuleInterface::class
     ];
 
+    /**
+     * TypeResolver constructor.
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(MetadataPool $metadataPool)
+    {
+        $this->metadataPool = $metadataPool;
+    }
+
     /**
      * @param object $type
      * @return string
@@ -45,6 +59,12 @@ public function resolve($type)
             throw new \Exception('Unable to determine data interface for ' . $className);
         }
 
-        return reset($dataInterfaces);
+        foreach ($dataInterfaces as $dataInterface) {
+            if ($this->metadataPool->hasConfiguration($dataInterface)) {
+                $this->typeMapping[$className] = $dataInterface;
+            }
+        }
+
+        return $this->typeMapping[$className];
     }
 }