Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-mftf-pr3

Author: zakdma

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -6,8 +6,11 @@
  */
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\Data\ProductExtension;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\Api\ImageContentValidatorInterface;
 use Magento\Framework\Api\ImageProcessorInterface;
@@ -16,8 +19,10 @@
 use Magento\Framework\DB\Adapter\DeadlockException;
 use Magento\Framework\DB\Adapter\LockWaitException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryState\CouldNotSaveException as TemporaryCouldNotSaveException;
 use Magento\Framework\Exception\ValidatorException;
 
 /**
@@ -294,10 +299,10 @@ protected function getCacheKey($data)
      * Add product to internal cache and truncate cache if it has more than cacheLimit elements.
      *
      * @param string $cacheKey
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param ProductInterface $product
      * @return void
      */
-    private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterface $product)
+    private function cacheProduct($cacheKey, ProductInterface $product)
     {
         $this->instancesById[$product->getId()][$cacheKey] = $product;
         $this->saveProductInLocalCache($product, $cacheKey);
@@ -314,7 +319,7 @@ private function cacheProduct($cacheKey, \Magento\Catalog\Api\Data\ProductInterf
      *
      * @param array $productData
      * @param bool $createNew
-     * @return \Magento\Catalog\Api\Data\ProductInterface|Product
+     * @return ProductInterface|Product
      * @throws NoSuchEntityException
      */
     protected function initializeProductData(array $productData, $createNew)
@@ -361,12 +366,12 @@ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product
     /**
      * Process product links, creating new links, updating and deleting existing links
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param ProductInterface $product
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $newLinks
      * @return $this
      * @throws NoSuchEntityException
      */
-    private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $product, $newLinks)
+    private function processLinks(ProductInterface $product, $newLinks)
     {
         if ($newLinks === null) {
             // If product links were not specified, don't do anything
@@ -421,7 +426,7 @@ private function processLinks(\Magento\Catalog\Api\Data\ProductInterface $produc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveOptions = false)
+    public function save(ProductInterface $product, $saveOptions = false)
     {
         $tierPrices = $product->getData('tier_price');
 
@@ -435,12 +440,18 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             if (!$product->hasData(Product::STATUS)) {
                 $product->setStatus($existingProduct->getStatus());
             }
+
+            /** @var ProductExtension $extensionAttributes */
+            $extensionAttributes = $product->getExtensionAttributes();
+            if (empty($extensionAttributes->__toArray())) {
+                $product->setExtensionAttributes($existingProduct->getExtensionAttributes());
+            }
         } catch (NoSuchEntityException $e) {
             $existingProduct = null;
         }
 
         $productDataArray = $this->extensibleDataObjectConverter
-            ->toNestedArray($product, [], \Magento\Catalog\Api\Data\ProductInterface::class);
+            ->toNestedArray($product, [], ProductInterface::class);
         $productDataArray = array_replace($productDataArray, $product->getData());
         $ignoreLinksFlag = $product->getData('ignore_links_flag');
         $productLinks = null;
@@ -471,53 +482,21 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             );
         }
 
-        try {
-            if ($tierPrices !== null) {
-                $product->setData('tier_price', $tierPrices);
-            }
-            $this->removeProductFromLocalCache($product->getSku());
-            unset($this->instancesById[$product->getId()]);
-            $this->resourceModel->save($product);
-        } catch (ConnectionException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database connection error'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (DeadlockException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database deadlock found when trying to get lock'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (LockWaitException $exception) {
-            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
-                __('Database lock wait timeout exceeded'),
-                $exception,
-                $exception->getCode()
-            );
-        } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) {
-            throw \Magento\Framework\Exception\InputException::invalidFieldValue(
-                $exception->getAttributeCode(),
-                $product->getData($exception->getAttributeCode()),
-                $exception
-            );
-        } catch (ValidatorException $e) {
-            throw new CouldNotSaveException(__($e->getMessage()));
-        } catch (LocalizedException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\CouldNotSaveException(__('Unable to save product'), $e);
+        if ($tierPrices !== null) {
+            $product->setData('tier_price', $tierPrices);
         }
+
+        $this->saveProduct($product);
         $this->removeProductFromLocalCache($product->getSku());
         unset($this->instancesById[$product->getId()]);
+
         return $this->get($product->getSku(), false, $product->getStoreId());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function delete(\Magento\Catalog\Api\Data\ProductInterface $product)
+    public function delete(ProductInterface $product)
     {
         $sku = $product->getSku();
         $productId = $product->getId();
@@ -707,4 +686,52 @@ private function prepareSku(string $sku): string
     {
         return mb_strtolower(trim($sku));
     }
+
+    /**
+     * Save product resource model.
+     *
+     * @param ProductInterface|Product $product
+     * @throws TemporaryCouldNotSaveException
+     * @throws InputException
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function saveProduct($product)
+    {
+        try {
+            $this->removeProductFromLocalCache($product->getSku());
+            unset($this->instancesById[$product->getId()]);
+            $this->resourceModel->save($product);
+        } catch (ConnectionException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database connection error'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (DeadlockException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database deadlock found when trying to get lock'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (LockWaitException $exception) {
+            throw new TemporaryCouldNotSaveException(
+                __('Database lock wait timeout exceeded'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (AttributeException $exception) {
+            throw InputException::invalidFieldValue(
+                $exception->getAttributeCode(),
+                $product->getData($exception->getAttributeCode()),
+                $exception
+            );
+        } catch (ValidatorException $e) {
+            throw new CouldNotSaveException(__($e->getMessage()));
+        } catch (LocalizedException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__('Unable to save product'), $e);
+        }
+    }
 }