Merge remote-tracking branch 'magento-chaika/MC-19013' into MPI-PR

# Conflicts:
#	dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php

Author: arnobsh

app/code/Magento/Catalog/Model/Product/Hydrator.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Framework\EntityManager\HydratorInterface;
+
+/**
+ * Class is used to extract data and populate entity with data
+ */
+class Hydrator implements HydratorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function extract($entity)
+    {
+        return $entity->getData();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hydrate($entity, array $data)
+    {
+        $lockedAttributes = $entity->getLockedAttributes();
+        $entity->unlockAttributes();
+        $entity->setData(array_merge($entity->getData(), $data));
+        foreach ($lockedAttributes as $attribute) {
+            $entity->lockAttribute($attribute);
+        }
+
+        return $entity;
+    }
+}

app/code/Magento/Catalog/etc/di.xml

@@ -867,7 +867,7 @@
             <argument name="hydrators" xsi:type="array">
                 <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
                 <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
-                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
+                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Catalog\Model\Product\Hydrator</item>
             </argument>
         </arguments>
     </type>

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductHydratorTest.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test Product Hydrator
+ */
+class ProductHydratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Bootstrap
+     */
+    private $objectManager;
+
+    /**
+     * @var HydratorPool
+     */
+    private $hydratorPool;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->hydratorPool = $this->objectManager->create(HydratorPool::class);
+    }
+
+    /**
+     * Test that Hydrator correctly populates entity with data
+     */
+    public function testProductHydrator()
+    {
+        $addAttributes = [
+            'sku' => 'product_updated',
+            'name' => 'Product (Updated)',
+            'type_id' => 'simple',
+            'status' => 1,
+        ];
+
+        /** @var Product $product */
+        $product = $this->objectManager->create(Product::class);
+        $product->setId(42)
+            ->setSku('product')
+            ->setName('Product')
+            ->setPrice(10)
+            ->setQty(123);
+        $product->lockAttribute('sku');
+        $product->lockAttribute('type_id');
+        $product->lockAttribute('price');
+
+        /** @var HydratorInterface $hydrator */
+        $hydrator = $this->hydratorPool->getHydrator(ProductInterface::class);
+        $hydrator->hydrate($product, $addAttributes);
+
+        $expected = [
+            'entity_id' => 42,
+            'sku' => 'product_updated',
+            'name' => 'Product (Updated)',
+            'type_id' => 'simple',
+            'status' => 1,
+            'price' => 10,
+            'qty' => 123,
+        ];
+        $this->assertEquals($expected, $product->getData());
+    }
+}