Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-4058

Author: aplapana

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -188,7 +188,9 @@ private function createDirectoryRecursively(string $path): bool
         $parentDir = dirname($path);
 
         while (!$this->isDirectory($parentDir)) {
-            $this->createDirectoryRecursively($parentDir);
+            if (!$this->createDirectoryRecursively($parentDir)) {
+                return false;
+            }
         }
 
         if (!$this->isDirectory($path)) {

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -18,6 +18,7 @@
 
 /**
  * @see AwsS3
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AwsS3Test extends TestCase
 {
@@ -497,6 +498,23 @@ public function testCreateDirectory(): void
         self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
     }
 
+    /**
+     * This test ensures that the method does not loop infinitely in case of an exception
+     *
+     * @return void
+     * @throws FileSystemException
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testShouldFailSafelyIfUnableToCreateDirectory(): void
+    {
+        $this->adapterMock->expects(self::once())
+            ->method('createDirectory')
+            ->willThrowException($this->createMock(\League\Flysystem\FilesystemException::class))
+            ->with('test');
+
+        self::assertFalse($this->driver->createDirectory(self::URL . 'test/test2/'));
+    }
+
     public function testRename(): void
     {
         $this->adapterMock->expects(self::once())

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -457,6 +457,15 @@ public function getCurrentSelectionName()
         if ($this->getCurrentWebsiteName() !== '') {
             return $this->getCurrentWebsiteName();
         }
+
+        if (!$this->hasDefaultOption()) {
+            $websites = $this->getWebsites();
+            if (!empty($websites)) {
+                $websiteArray = array_values($websites);
+                return $websiteArray[0]->getName();
+            }
+        }
+
         return $this->getDefaultSelectionName();
     }
 

app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php

@@ -8,12 +8,14 @@
 use Magento\Bundle\Api\Data\OptionInterfaceFactory as OptionFactory;
 use Magento\Bundle\Api\Data\LinkInterfaceFactory as LinkFactory;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface as ProductRepository;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Framework\App\RequestInterface;
 
 /**
- * Class Bundle
+ * Plugin class to initialize Bundle product
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Bundle
@@ -106,12 +108,14 @@ public function afterInitialize(
                 $product->setBundleOptionsData($result['bundle_options']);
             }
 
+            if (!$result['bundle_selections']) {
+                $this->resetBundleProductOptions($product);
+            }
+
             $this->processBundleOptionsData($product);
             $this->processDynamicOptionsData($product);
         } elseif (!$compositeReadonly) {
-            $extension = $product->getExtensionAttributes();
-            $extension->setBundleProductOptions([]);
-            $product->setExtensionAttributes($extension);
+            $this->resetBundleProductOptions($product);
         }
 
         $affectProductSelections = (bool)$this->request->getPost('affect_bundle_product_selections');
@@ -120,6 +124,8 @@ public function afterInitialize(
     }
 
     /**
+     * Process Bundle Options Data
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -161,10 +167,11 @@ protected function processBundleOptionsData(\Magento\Catalog\Model\Product $prod
         $extension = $product->getExtensionAttributes();
         $extension->setBundleProductOptions($options);
         $product->setExtensionAttributes($extension);
-        return;
     }
 
     /**
+     * Process Dynamic Options Data
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return void
      */
@@ -198,9 +205,10 @@ protected function processDynamicOptionsData(\Magento\Catalog\Model\Product $pro
     }
 
     /**
+     * Build product link
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $linkData
-     *
      * @return \Magento\Bundle\Api\Data\LinkInterface
      */
     private function buildLink(
@@ -228,4 +236,18 @@ private function buildLink(
 
         return $link;
     }
+
+    /**
+     * Resets bundle product options inside product extension attributes
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function resetBundleProductOptions(ProductInterface $product) : void
+    {
+        $extension = $product->getExtensionAttributes();
+        $extension->setBundleProductOptions([]);
+        $product->setExtensionAttributes($extension);
+        $product->setDropOptions(true);
+    }
 }

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -96,7 +96,9 @@ public function execute($entity, $arguments = [])
         /** @var OptionInterface[] $bundleProductOptions */
         $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
         //Only processing bundle products.
-        if ($entity->getTypeId() !== Type::TYPE_CODE || empty($bundleProductOptions)) {
+        if ($entity->getTypeId() !== Type::TYPE_CODE
+            || (empty($bundleProductOptions) && !$entity->getDropOptions())
+        ) {
             return $entity;
         }
 

app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php

@@ -173,6 +173,13 @@ public function testAfterInitializeIfBundleSelectionsAndCustomOptionsExist()
             ->method('setBundleOptionsData')
             ->with($this->bundleOptionsCleaned);
         $this->productMock->expects($this->never())->method('setBundleSelectionsData');
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setBundleProductOptions'])
+            ->getMockForAbstractClass();
+        $extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
         $this->productMock->expects($this->once())->method('getPriceType')->willReturn(2);
         $this->productMock->expects($this->any())->method('getOptionsReadonly')->willReturn(true);
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);

app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php

@@ -143,6 +143,7 @@ public function execute()
             $this->validateProductAttributes($attributesData);
             $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
             $this->messageManager->addSuccessMessage(__('Message is added to queue'));
+            $this->attributeHelper->setProductIds([]);
         } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {

app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php

@@ -184,4 +184,22 @@ private function getUsedImagesSelect(): Select
 
         return $select;
     }
+
+    /**
+     * Get related website IDs for a given image file path.
+     *
+     * @param string $filepath
+     * @return array
+     */
+    public function getRelatedWebsiteIds(string $filepath): array
+    {
+        $select = $this->getUsedImagesSelect();
+        $select->where('images.value = ?', $filepath);
+        $result = array_map(
+            fn ($ids) => array_map('intval', explode(',', $ids)),
+            $this->connection->fetchPairs($select)
+        );
+
+        return $result[$filepath] ?? [];
+    }
 }

app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

@@ -486,5 +486,11 @@
         <data key="is_used_for_promo_rules">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="multiSelectAttributeWithThreeOptions" extends="productDropDownAttribute" type="ProductAttribute">
+        <data key="frontend_input">multiselect</data>
+        <data key="option1">1</data>
+        <data key="option2">2</data>
+        <data key="option3">3</data>
+    </entity>
 </entities>
 

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormSection.xml

@@ -92,5 +92,6 @@
         <element name="customSelectAttribute" type="select" selector="//select[@name='product[{{attribute_code}}]']" parameterized="true"/>
         <element name="customSwitcherAttribute" type="checkbox" selector="//input[@name='product[{{attribute_code}}]' and @value='{{checked_value}}']/parent::div[@data-role='switcher']" parameterized="true"/>
         <element name="attributeOptionUncheckDefaultValue" type="checkbox" selector="input[name='use_default[{{attribute_code}}]']" parameterized="true"/>
+        <element name="customAttributeUnderMassUpdate" type="select" selector="//select[@name='attributes[{{attribute_code}}][]']" parameterized="true"/>
     </section>
 </sections>