Merge branch '2.4-develop' into ACQE-functional-deployment-version15

Author: chandrakalahanchinal

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml

@@ -69,6 +69,7 @@
             <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
             <!-- Log out -->
             <comment userInput="Log out" stepKey="commentLogOut"/>
+            <deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Login to the Storefront as created customer -->

app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml

@@ -87,6 +87,7 @@
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
 
             <!-- Admin logout -->
+            <deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

@@ -32,6 +32,9 @@
         </before>
         <after>
             <!--Logging out-->
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
+                <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckPriceForDynamicBundleProductWithMixedDiscountsTest.xml

@@ -173,6 +173,9 @@
             <deleteData createDataKey="sixthProduct" stepKey="deleteSixthProduct"/>
             <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteCatalogPriceRules"/>
+            <deleteData createDataKey="category1" stepKey="deletecategory1"/>
+            <deleteData createDataKey="category2" stepKey="deletecategory2"/>
+            <deleteData createDataKey="category3" stepKey="deletecategory3"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Go to storefront category page -->

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckPriceForFixedBundleProductWithCatalogRuleTest.xml

@@ -147,6 +147,7 @@
             <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteBundleProduct"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteCatalogPriceRules"/>
             <!-- logout admin -->
+            <deleteData createDataKey="category1" stepKey="deletecategory1"/> 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- check product prices on category and product page -->

app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml

@@ -30,6 +30,9 @@
                 <argument name="sku" value="Simple"/>
             </actionGroup>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteCategory">
+                <argument name="categoryName" value="New"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 

app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php

@@ -3,14 +3,23 @@
  * Copyright 2015 Adobe
  * All Rights Reserved.
  */
+
 namespace Magento\Catalog\Model\CustomOptions;
 
+use Magento\Catalog\Api\Data\CustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option\Type\File\ImageContentProcessor;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 use Magento\Quote\Api\Data\ProductOptionExtensionFactory;
 use Magento\Quote\Model\Quote\ProductOptionFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CustomOptionProcessor implements CartItemProcessorInterface
 {
     /**
@@ -45,41 +54,63 @@ class CustomOptionProcessor implements CartItemProcessorInterface
      */
     private $serializer;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ImageContentProcessor
+     */
+    private $imageContentProcessor;
+
     /**
      * @param DataObject\Factory $objectFactory
      * @param ProductOptionFactory $productOptionFactory
      * @param ProductOptionExtensionFactory $extensionFactory
      * @param CustomOptionFactory $customOptionFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param ProductRepositoryInterface|null $productRepository
+     * @param ImageContentProcessor|null $imageContentProcessor
      */
     public function __construct(
         \Magento\Framework\DataObject\Factory $objectFactory,
         \Magento\Quote\Model\Quote\ProductOptionFactory $productOptionFactory,
         \Magento\Quote\Api\Data\ProductOptionExtensionFactory $extensionFactory,
         \Magento\Catalog\Model\CustomOptions\CustomOptionFactory $customOptionFactory,
-        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null
+        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ?ProductRepositoryInterface $productRepository = null,
+        ?ImageContentProcessor $imageContentProcessor = null
     ) {
         $this->objectFactory = $objectFactory;
         $this->productOptionFactory = $productOptionFactory;
         $this->extensionFactory = $extensionFactory;
         $this->customOptionFactory = $customOptionFactory;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->productRepository = $productRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ProductRepositoryInterface::class);
+        $this->imageContentProcessor = $imageContentProcessor
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(ImageContentProcessor::class);
     }
 
     /**
      * @inheritDoc
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
-        if ($cartItem->getProductOption()
-            && $cartItem->getProductOption()->getExtensionAttributes()
-            && $cartItem->getProductOption()->getExtensionAttributes()->getCustomOptions()) {
+        if ($cartItem->getProductOption()?->getExtensionAttributes()?->getCustomOptions()) {
             $customOptions = $cartItem->getProductOption()->getExtensionAttributes()->getCustomOptions();
-            if (!empty($customOptions) && is_array($customOptions)) {
+            if (!empty($customOptions)) {
                 $requestData = [];
+                $productOptions = $this->getProductCustomOptions($cartItem);
                 foreach ($customOptions as $option) {
-                    $requestData['options'][$option->getOptionId()] = $option->getOptionValue();
+                    $requestData['options'][$option->getOptionId()] = $this->getCustomOptionValue(
+                        $option,
+                        $productOptions[$option->getOptionId()] ?? null
+                    );
                 }
                 return $this->objectFactory->create($requestData);
             }
@@ -99,7 +130,6 @@ public function processOptions(CartItemInterface $cartItem)
                 ? $cartItem->getProductOption()
                 : $this->productOptionFactory->create();
 
-            /** @var  \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
             $extensibleAttribute = $productOption->getExtensionAttributes()
                 ? $productOption->getExtensionAttributes()
                 : $this->extensionFactory->create();
@@ -136,7 +166,7 @@ protected function getOptions(CartItemInterface $cartItem)
     protected function updateOptionsValues(array &$options)
     {
         foreach ($options as $optionId => &$optionValue) {
-            /** @var \Magento\Catalog\Model\CustomOptions\CustomOption $option */
+            /** @var CustomOption $option */
             $option = $this->customOptionFactory->create();
             $option->setOptionId($optionId);
             if (is_array($optionValue)) {
@@ -204,4 +234,55 @@ private function getUrlBuilder()
         }
         return $this->urlBuilder;
     }
+
+    /**
+     * Get Product Options
+     *
+     * @param CartItemInterface $cartItem
+     * @return ProductCustomOptionInterface[]
+     */
+    private function getProductCustomOptions(CartItemInterface $cartItem): array
+    {
+        try {
+            $product = $this->productRepository->get($cartItem->getSku());
+        } catch (NoSuchEntityException) {
+            $product = null;
+        }
+
+        $options = [];
+        foreach ($product?->getHasOptions() ? $product->getOptions() : [] as $option) {
+            $options[$option->getOptionId()] = $option;
+        }
+        return $options;
+    }
+
+    /**
+     * Get custom option value depending on the type of custom option
+     *
+     * @param CustomOptionInterface $customOption
+     * @param ProductCustomOptionInterface|null $productCustomOption
+     * @return string|array|null
+     */
+    private function getCustomOptionValue(
+        CustomOptionInterface $customOption,
+        ?ProductCustomOptionInterface $productCustomOption = null
+    ): mixed {
+        if ($customOption->getExtensionAttributes()?->getFileInfo()) {
+            if ($productCustomOption
+                && $productCustomOption->getType() === ProductCustomOptionInterface::OPTION_TYPE_FILE
+            ) {
+                return $this->imageContentProcessor->process(
+                    $customOption->getExtensionAttributes()->getFileInfo(),
+                    $productCustomOption
+                );
+            } elseif ($customOption instanceof CustomOption) {
+                // Check if the custom option is an instance of CustomOption for backward compatibility
+                // Bypass CustomOption::getOptionValue as the current implementation would process the file
+                // even if it is not a file option.
+                return $customOption->getData(CustomOptionInterface::OPTION_VALUE);
+            }
+        }
+
+        return $customOption->getOptionValue();
+    }
 }

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -187,15 +187,13 @@ public function execute(): Full
     protected function reindex(): void
     {
         $userFunctions = [];
-
         foreach ($this->storeManager->getStores() as $store) {
             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
                 $userFunctions[$store->getId()] = function () use ($store) {
                     $this->reindexStore($store);
                 };
             }
         }
-
         $this->processManager->execute($userFunctions);
     }
 
@@ -206,6 +204,9 @@ protected function reindex(): void
      */
     private function reindexStore($store): void
     {
+        // Ensure the same adapter instance that created the TEMP table is used for all operations
+        // phpcs:ignore
+        $this->connection = $this->tableMaintainer->getSameAdapterConnection();
         $this->reindexRootCategory($store);
         $this->reindexAnchorCategories($store);
         $this->reindexNonAnchorCategories($store);

app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php

@@ -35,11 +35,15 @@ class TableMaintainer
 
     /**
      * Catalog tmp category index table name
+     *
+     * @var string
      */
     private $tmpTableSuffix = '_tmp';
 
     /**
      * Catalog tmp category index table name
+     *
+     * @var string
      */
     private $additionalTableSuffix = '_replica';
 
@@ -73,6 +77,16 @@ private function getConnection()
         return $this->connection;
     }
 
+    /**
+     * Expose connection so callers can use the same adapter instance that created temporary tables.
+     *
+     * @return AdapterInterface
+     */
+    public function getSameAdapterConnection(): AdapterInterface
+    {
+        return $this->getConnection();
+    }
+
     /**
      * Return validated table name
      *
@@ -120,7 +134,7 @@ private function dropTable($tableName)
     /**
      * Return main index table name
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return string
      */
@@ -134,7 +148,7 @@ public function getMainTable(int $storeId)
     /**
      * Create main and replica index tables for store
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return void
      *
@@ -161,7 +175,7 @@ public function createTablesForStore(int $storeId)
     /**
      * Drop main and replica index tables for store
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return void
      */
@@ -177,7 +191,7 @@ public function dropTablesForStore(int $storeId)
     /**
      * Return replica index table name
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return string
      */
@@ -189,7 +203,7 @@ public function getMainReplicaTable(int $storeId)
     /**
      * Create temporary index table for store
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return void
      */
@@ -206,7 +220,7 @@ public function createMainTmpTable(int $storeId)
     /**
      * Return temporary index table name
      *
-     * @param $storeId
+     * @param int $storeId
      *
      * @return string
      *
@@ -215,7 +229,7 @@ public function createMainTmpTable(int $storeId)
     public function getMainTmpTable(int $storeId)
     {
         if (!isset($this->mainTmpTable[$storeId])) {
-            throw new \Magento\Framework\Exception\NoSuchEntityException('Temporary table does not exist');
+            throw new \Magento\Framework\Exception\NoSuchEntityException(__('Temporary table does not exist'));
         }
         return $this->mainTmpTable[$storeId];
     }