Merge remote-tracking branch 'goinc/MAGETWO-51951' into pr-613

Author: duhon

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

@@ -7,6 +7,8 @@
  */
 namespace Magento\Catalog\Model\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+
 class Copier
 {
     /**
@@ -24,6 +26,11 @@ class Copier
      */
     protected $productFactory;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    protected $metadataPool;
+
     /**
      * @param CopyConstructorInterface $copyConstructor
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
@@ -73,14 +80,18 @@ public function copy(\Magento\Catalog\Model\Product $product)
             } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
             }
         } while (!$isDuplicateSaved);
-
         $this->getOptionRepository()->duplicate($product, $duplicate);
-        $product->getResource()->duplicate($product->getEntityId(), $duplicate->getEntityId());
+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+        $product->getResource()->duplicate(
+            $product->getData($metadata->getLinkField()),
+            $duplicate->getData($metadata->getLinkField())
+        );
         return $duplicate;
     }
 
     /**
      * @return Option\Repository
+     * @deprecated
      */
     private function getOptionRepository()
     {
@@ -90,4 +101,17 @@ private function getOptionRepository()
         }
         return $this->optionRepository;
     }
+
+    /**
+     * @return \Magento\Framework\EntityManager\MetadataPool
+     * @deprecated
+     */
+    private function getMetadataPool()
+    {
+        if (null === $this->metadataPool) {
+            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\EntityManager\MetadataPool');
+        }
+        return $this->metadataPool;
+    }
 }

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\HydratorPool;
 
 /**
  * Class Repository
@@ -42,6 +43,11 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
      */
     protected $metadataPool;
 
+    /**
+     * @var HydratorPool
+     */
+    protected $hydratorPool;
+
     /**
      * @var Converter
      */
@@ -113,10 +119,12 @@ public function duplicate(
         \Magento\Catalog\Api\Data\ProductInterface $product,
         \Magento\Catalog\Api\Data\ProductInterface $duplicate
     ) {
+        $hydrator = $this->getHydratorPool()->getHydrator(ProductInterface::class);
+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
         return $this->optionResource->duplicate(
             $this->getOptionFactory()->create([]),
-            $product->getId(),
-            $duplicate->getId()
+            $hydrator->extract($product)[$metadata->getLinkField()],
+            $hydrator->extract($duplicate)[$metadata->getLinkField()]
         );
     }
 
@@ -189,6 +197,7 @@ protected function markRemovedValues($newValues, $originalValues)
 
     /**
      * @return \Magento\Catalog\Model\Product\OptionFactory
+     * @deprecated
      */
     private function getOptionFactory()
     {
@@ -201,6 +210,7 @@ private function getOptionFactory()
 
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory
+     * @deprecated
      */
     private function getCollectionFactory()
     {
@@ -213,6 +223,7 @@ private function getCollectionFactory()
 
     /**
      * @return \Magento\Framework\EntityManager\MetadataPool
+     * @deprecated
      */
     private function getMetadataPool()
     {
@@ -222,4 +233,17 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
+
+    /**
+     * @return \Magento\Framework\EntityManager\HydratorPool
+     * @deprecated
+     */
+    private function getHydratorPool()
+    {
+        if (null === $this->hydratorPool) {
+            $this->hydratorPool = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\EntityManager\HydratorPool');
+        }
+        return $this->hydratorPool;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php

@@ -34,6 +34,11 @@ class CopierTest extends \PHPUnit_Framework_TestCase
      */
     protected $productMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadata;
+
     protected function setUp()
     {
         $this->copyConstructorMock = $this->getMock('\Magento\Catalog\Model\Product\CopyConstructorInterface');
@@ -54,22 +59,33 @@ protected function setUp()
         $this->optionRepositoryMock;
         $this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
-        $this->productMock->expects($this->any())->method('getData')->will($this->returnValue('product data'));
 
+        $this->metadata = $this->getMockBuilder('Magento\Framework\EntityManager\EntityMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $metadataPool = $this->getMockBuilder('Magento\Framework\EntityManager\MetadataPool')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $metadataPool->expects($this->any())->method('getMetadata')->willReturn($this->metadata);
         $this->_model = new Copier(
             $this->copyConstructorMock,
             $this->productFactoryMock
         );
 
         $this->setProperties($this->_model, [
-            'optionRepository' => $this->optionRepositoryMock
+            'optionRepository' => $this->optionRepositoryMock,
+            'metadataPool' => $metadataPool,
         ]);
     }
 
     public function testCopy()
     {
         $this->productMock->expects($this->atLeastOnce())->method('getWebsiteIds');
         $this->productMock->expects($this->atLeastOnce())->method('getCategoryIds');
+        $this->productMock->expects($this->any())->method('getData')->willReturnMap([
+            ['', null, 'product data'],
+            ['linkField', null, '1'],
+        ]);
 
         $resourceMock = $this->getMock('\Magento\Catalog\Model\ResourceModel\Product', [], [], '', false);
         $this->productMock->expects($this->once())->method('getResource')->will($this->returnValue($resourceMock));
@@ -80,6 +96,7 @@ public function testCopy()
                 '__wakeup',
                 'setData',
                 'setOptions',
+                'getData',
                 'setIsDuplicate',
                 'setOriginalId',
                 'setStatus',
@@ -123,8 +140,12 @@ public function testCopy()
         $duplicateMock->expects($this->once())->method('getUrlKey')->willReturn('urk-key-1');
         $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2');
         $duplicateMock->expects($this->once())->method('save');
-        $duplicateMock->expects($this->any())->method('getEntityId')->willReturn(2);
-        $this->optionRepositoryMock->expects($this->once())
+
+        $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
+
+        $duplicateMock->expects($this->any())->method('getData')->willReturnMap([
+            ['linkField', null, '2'],
+        ]);        $this->optionRepositoryMock->expects($this->once())
             ->method('duplicate')
             ->with($this->productMock, $duplicateMock);
         $resourceMock->expects($this->once())->method('duplicate')->with(1, 2);

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/SkuTest.php

@@ -38,13 +38,18 @@ public function testGenerateUniqueSkuNotExistingProduct($product)
     }
 
     /**
-     * @param $product \Magento\Catalog\Model\Product
-     * @dataProvider uniqueLongSkuDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoAppArea adminhtml
      * @magentoDbIsolation enabled
      */
-    public function testGenerateUniqueLongSku($product)
+    public function testGenerateUniqueLongSku()
     {
+        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Catalog\Model\ProductRepository'
+        );
+        $product = $repository->get('simple');
+        $product->setSku('0123456789012345678901234567890123456789012345678901234567890123');
+
         /** @var \Magento\Catalog\Model\Product\Copier $copier */
         $copier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Catalog\Model\Product\Copier'
@@ -66,19 +71,6 @@ public function uniqueSkuDataProvider()
         return [[$product]];
     }
 
-    /**
-     * Returns simple product
-     *
-     * @return array
-     */
-    public function uniqueLongSkuDataProvider()
-    {
-        $product = $this->_getProduct();
-        $product->setSku('0123456789012345678901234567890123456789012345678901234567890123');
-        //strlen === 64
-        return [[$product]];
-    }
-
     /**
      * Get product form data provider
      *