Merge branch 'ACP2E-122' of https://github.com/magento-l3/magento2ce into PR-2021-20-08

Author: chittima

app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php

@@ -550,6 +550,7 @@ private function processMediaAttribute(
      * @param array $clearImages
      * @param array $newImages
      * @param array $existImages
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function processMediaAttributeLabel(
         Product $product,
@@ -571,6 +572,9 @@ private function processMediaAttributeLabel(
 
         if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
             $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
+            if ($existImages[$attrData]['label'] == null) {
+                $resetLabel = true;
+            }
         }
 
         if ($attrData === 'no_selection' && !empty($product->getData($mediaAttrCode . '_label'))) {

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php

@@ -16,6 +16,13 @@
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Filesystem;
@@ -25,13 +32,14 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Provides tests for media gallery images update during product save.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
+class UpdateHandlerTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -133,6 +141,8 @@ protected function setUp(): void
      * @magentoDataFixture Magento/Catalog/_files/product_image.php
      *
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testExecuteWithIllegalFilename(): void
     {
@@ -161,6 +171,8 @@ public function testExecuteWithIllegalFilename(): void
      * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
      * @magentoDbIsolation enabled
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testExecuteWithOneImage(): void
     {
@@ -176,6 +188,38 @@ public function testExecuteWithOneImage(): void
         $this->assertEquals('1', $updatedImage['disabled_default']);
     }
 
+    /**
+     * Tests updating image label and label default during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDbIsolation enabled
+     * @return void
+     * @throws LocalizedException
+     */
+    public function testExecuteImageWithUpdatedAttributeLabel(): void
+    {
+        $product = $this->getProduct();
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        $updatedImage = reset($productImages);
+        $this->assertIsArray($updatedImage);
+        $this->assertEquals('Image Alt Text', $updatedImage['label']);
+        $this->assertEquals('Image Alt Text', $updatedImage['label_default']);
+        $this->updateProductGalleryImages($product, ['label' => 'New image']);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        $updatedImage = reset($productImages);
+        $this->assertIsArray($updatedImage);
+        $this->assertEquals('New image', $updatedImage['label']);
+        $this->assertEquals('New image', $updatedImage['label_default']);
+        $this->updateProductGalleryImages($product, ['label' => '']);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        $updatedImage = reset($productImages);
+        $this->assertIsArray($updatedImage);
+        $this->assertEquals('', $updatedImage['label']);
+        $this->assertEquals('', $updatedImage['label_default']);
+    }
+
     /**
      * Tests updating image roles during product save.
      *
@@ -184,6 +228,7 @@ public function testExecuteWithOneImage(): void
      * @magentoDbIsolation enabled
      * @param array $roles
      * @return void
+     * @throws LocalizedException
      */
     public function testExecuteWithTwoImagesAndDifferentRoles(array $roles): void
     {
@@ -208,6 +253,9 @@ public function testExecuteWithTwoImagesAndDifferentRoles(array $roles): void
      * @magentoDbIsolation enabled
      * @param array $roles
      * @return void
+     * @throws LocalizedException
+     * @throws ConfigurationMismatchException
+     * @throws NoSuchEntityException
      */
     public function testExecuteWithTwoImagesAndDifferentRolesOnStoreView(array $roles): void
     {
@@ -275,6 +323,7 @@ public function executeWithTwoImagesAndRolesDataProvider(): array
      * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
      * @magentoDbIsolation enabled
      * @return void
+     * @throws LocalizedException
      */
     public function testExecuteWithTwoImagesAndChangedPosition(): void
     {
@@ -303,6 +352,7 @@ public function testExecuteWithTwoImagesAndChangedPosition(): void
      * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
      * @magentoDbIsolation enabled
      * @return void
+     * @throws LocalizedException
      */
     public function testExecuteWithImageToDelete(): void
     {
@@ -332,6 +382,8 @@ public function testExecuteWithImageToDelete(): void
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDbIsolation enabled
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testExecuteWithTwoImagesOnStoreView(): void
     {
@@ -382,6 +434,7 @@ public function testExecuteWithTwoImagesOnStoreView(): void
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      *
      * @return void
+     * @throws LocalizedException
      */
     public function testDeleteSharedImage(): void
     {
@@ -416,6 +469,7 @@ protected function tearDown(): void
      * @param int|null $storeId
      * @param string|null $sku
      * @return ProductInterface|Product
+     * @throws NoSuchEntityException
      */
     private function getProduct(?int $storeId = null, ?string $sku = null): ProductInterface
     {
@@ -441,6 +495,11 @@ private function updateProductGalleryImages(ProductInterface $product, array $im
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
      * @magentoDbIsolation disabled
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws StateException
      */
     public function testDeleteWithMultiWebsites(): void
     {
@@ -518,6 +577,9 @@ public function testDeleteWithMultiWebsites(): void
      * @param string $expectedFile
      * @param bool $exist
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws FileSystemException
      */
     public function testUpdateImage(string $newFile, string $expectedFile, bool $exist): void
     {
@@ -607,6 +669,8 @@ public function updateImageDataProvider(): array
      * @param array $expectedImages
      * @param array $select
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testAddImages(
         string $addFromStore,
@@ -697,6 +761,7 @@ public function addImagesDataProvider(): array
      * @param ProductInterface $product
      * @param string $imagePath
      * @return void
+     * @throws FileSystemException
      */
     private function checkProductImageExist(ProductInterface $product, string $imagePath): void
     {
@@ -735,6 +800,8 @@ private function prepareRemoveImage(ProductInterface $product): ProductInterface
      * @param string $imagePath
      * @param string $productSku
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     private function duplicateMediaGalleryForProduct(string $imagePath, string $productSku): void
     {