MAGETWO-52105: Edit category does not work

Author: NadiyaS

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

@@ -15,6 +15,14 @@ class TypeResolver
      */
     private $metadataPool;
 
+    /**
+     * @var array
+     */
+    private $typeMapping = [
+        \Magento\SalesRule\Model\Rule::class => \Magento\SalesRule\Api\Data\RuleInterface::class,
+        \Magento\SalesRule\Model\Rule\Interceptor::class => \Magento\SalesRule\Api\Data\RuleInterface::class
+    ];
+
     /**
      * TypeResolver constructor.
      * @param MetadataPool $metadataPool
@@ -24,14 +32,6 @@ public function __construct(MetadataPool $metadataPool)
         $this->metadataPool = $metadataPool;
     }
 
-    /**
-     * @var array
-     */
-    private $typeMapping = [
-        \Magento\SalesRule\Model\Rule::class => \Magento\SalesRule\Api\Data\RuleInterface::class,
-        \Magento\SalesRule\Model\Rule\Interceptor::class => \Magento\SalesRule\Api\Data\RuleInterface::class
-    ];
-
     /**
      * @param object $type
      * @return string
@@ -61,10 +61,10 @@ public function resolve($type)
 
         foreach ($dataInterfaces as $dataInterface) {
             if ($this->metadataPool->hasConfiguration($dataInterface)) {
-                break;
+                $this->typeMapping[$className] = $dataInterface;
             }
         }
 
-        return $dataInterface;
+        return $this->typeMapping[$className];
     }
 }