Merge branch 'productRepository-plugin' of github.com:rmsundar1/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php

@@ -49,7 +49,7 @@ public function __construct(
      * @param ProductRepositoryInterface $subject
      * @param ProductInterface $product
      * @param bool $saveOptions
-     * @return array
+     * @return void
      * @throws InputException
      * @throws NoSuchEntityException
      *
@@ -59,34 +59,23 @@ public function beforeSave(
         ProductRepositoryInterface $subject,
         ProductInterface $product,
         $saveOptions = false
-    ): array {
-        $result[] = $product;
-        if ($product->getTypeId() !== Configurable::TYPE_CODE) {
-            return $result;
-        }
-
+    ): void {
         $extensionAttributes = $product->getExtensionAttributes();
-        if ($extensionAttributes === null) {
-            return $result;
-        }
-
-        $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();
-        $configurableOptions = (array) $extensionAttributes->getConfigurableProductOptions();
+        if ($extensionAttributes !== null && $product->getTypeId() === Configurable::TYPE_CODE) {
+            $configurableLinks = (array) $extensionAttributes->getConfigurableProductLinks();
+            $configurableOptions = (array) $extensionAttributes->getConfigurableProductOptions();
 
-        if (empty($configurableLinks) && empty($configurableOptions)) {
-            return $result;
-        }
-
-        $attributeCodes = [];
-        /** @var OptionInterface $configurableOption */
-        foreach ($configurableOptions as $configurableOption) {
-            $eavAttribute = $this->productAttributeRepository->get($configurableOption->getAttributeId());
-            $attributeCode = $eavAttribute->getAttributeCode();
-            $attributeCodes[] = $attributeCode;
+            if (!empty($configurableLinks) || !empty($configurableOptions)) {
+                $attributeCodes = [];
+                /** @var OptionInterface $configurableOption */
+                foreach ($configurableOptions as $configurableOption) {
+                    $eavAttribute = $this->productAttributeRepository->get($configurableOption->getAttributeId());
+                    $attributeCode = $eavAttribute->getAttributeCode();
+                    $attributeCodes[] = $attributeCode;
+                }
+                $this->validateProductLinks($attributeCodes, $configurableLinks);
+            }
         }
-        $this->validateProductLinks($attributeCodes, $configurableLinks);
-
-        return $result;
     }
 
     /**

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductRepositorySaveTest.php

@@ -113,16 +113,13 @@ protected function setUp(): void
      */
     public function testBeforeSaveWhenProductIsSimple(): void
     {
-        $this->product->expects(static::once())
+        $this->product->expects(static::atMost(1))
             ->method('getTypeId')
             ->willReturn('simple');
-        $this->product->expects(static::never())
+        $this->product->expects(static::once())
             ->method('getExtensionAttributes');
 
-        $this->assertEquals(
-            $this->product,
-            $this->plugin->beforeSave($this->productRepository, $this->product)[0]
-        );
+        $this->assertNull($this->plugin->beforeSave($this->productRepository, $this->product));
     }
 
     /**
@@ -150,52 +147,7 @@ public function testBeforeSaveWithoutOptions(): void
         $this->productAttributeRepository->expects(static::never())
             ->method('get');
 
-        $this->assertEquals(
-            $this->product,
-            $this->plugin->beforeSave($this->productRepository, $this->product)[0]
-        );
-    }
-
-    /**
-     * Test saving a configurable product with same set of attribute values
-     *
-     * @return void
-     */
-    public function testBeforeSaveWithLinks(): void
-    {
-        $this->expectException(InputException::class);
-        $this->expectExceptionMessage('Products "5" and "4" have the same set of attribute values.');
-        $links = [4, 5];
-        $this->product->expects(static::once())
-            ->method('getTypeId')
-            ->willReturn(Configurable::TYPE_CODE);
-
-        $this->product->expects(static::once())
-            ->method('getExtensionAttributes')
-            ->willReturn($this->extensionAttributes);
-        $this->extensionAttributes->expects(static::once())
-            ->method('getConfigurableProductOptions')
-            ->willReturn(null);
-        $this->extensionAttributes->expects(static::once())
-            ->method('getConfigurableProductLinks')
-            ->willReturn($links);
-
-        $this->productAttributeRepository->expects(static::never())
-            ->method('get');
-
-        $product = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getData'])
-            ->getMock();
-
-        $this->productRepository->expects(static::exactly(2))
-            ->method('getById')
-            ->willReturn($product);
-
-        $product->expects(static::never())
-            ->method('getData');
-
-        $this->plugin->beforeSave($this->productRepository, $this->product);
+        $this->assertNull($this->plugin->beforeSave($this->productRepository, $this->product));
     }
 
     /**