Merge branch '2.4-develop' into ACQE-functional-deployment-v4-9

Author: Karishmathakare19

app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php

@@ -27,7 +27,7 @@ abstract protected function isEnable();
     /**
      * @inheritdoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $isEnable = $this->isEnable();
         $types = $this->getRequestedTypes($input);

app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php

@@ -58,7 +58,7 @@ abstract protected function getDisplayMessage();
      * @param OutputInterface $output
      * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $types = $this->getRequestedTypes($input);
         $this->performAction($types);

app/code/Magento/Backend/Console/Command/CacheStatusCommand.php

@@ -31,7 +31,7 @@ protected function configure()
     /**
      * @inheritdoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Current status:');
         foreach ($this->cacheManager->getStatus() as $cache => $status) {

app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php

@@ -11,7 +11,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
- * Class ProductAttributesCleanUp
+ * Console command for cleaning up unused product attributes from database tables
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductAttributesCleanUp extends \Symfony\Component\Console\Command\Command
@@ -64,7 +65,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -73,9 +74,9 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->setDecorated(true);
         $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL);
@@ -113,6 +114,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
+     * Get list of product attribute table names
+     *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -134,6 +137,8 @@ private function getAttributeTables()
     }
 
     /**
+     * Get attribute value IDs that should be removed from the specified attribute table
+     *
      * @param AdapterInterface $connection
      * @param string $attributeTableName
      * @return array

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml

@@ -54,7 +54,9 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryAdminPage"/>
         <actionGroup ref="AdminCategoriesExpandAllActionGroup" stepKey="expandAllCategories"/>
         <see userInput="{{_defaultCategory.name}}" selector="{{AdminCategorySidebarTreeSection.treeContainer}}" stepKey="assertCategoryOnAdminPage"/>
-
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <!-- Check on storefront that category was created -->
         <actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="goToCategoryStorefrontPage">
             <argument name="categoryUrl" value="{{_defaultCategory.urlKey}}"/>

app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php

@@ -71,7 +71,7 @@ protected function setUp(): void
      * Test method testGetValue
      *
      * @param float|bool $price
-     * @dataProvider testGetValueDataProvider
+     * @dataProvider getValueDataProvider
      */
     public function testGetValue($price)
     {
@@ -93,7 +93,7 @@ public function testGetValue($price)
      *
      * @return array
      */
-    public static function testGetValueDataProvider()
+    public static function getValueDataProvider()
     {
         return [
             'With price' => [100.00],

app/code/Magento/Checkout/view/frontend/web/js/cart/ensure-subtotal-sync.js

@@ -15,7 +15,11 @@ define([
     return function initEnsureSubtotalSync(config, element)
     {
         const $root = $(element || document);
-        let clicked = false;
+
+        // Check if already synced on the body element (persists across form replacements)
+        if ($('body').data('cart-synced')) {
+            return;
+        }
 
         function parsePrice(text)
         {
@@ -44,7 +48,7 @@ define([
             // Sum of row totals on the table
             let sum = 0;
 
-            $root.find('#shopping-cart-table .col.subtotal .cart-price').each(function () {
+            $root.find('#shopping-cart-table .col.subtotal .price-excluding-tax .cart-price').each(function () {
                 const text = $(this).text(), val = parsePrice(text);
 
                 if (!isNaN(val)) {
@@ -70,19 +74,35 @@ define([
                 return;
             }
 
-            if (clicked) {
-                return;
-            }
-
             const central = getCentralSubtotal(), summary = getSummarySubtotal();
 
             if (!isNaN(central) && !isNaN(summary) && central !== summary) {
-                const $updateBtn = $root.find('.cart.main.actions button.action.update');
-
-                if ($updateBtn.length) {
-                    clicked = true;
-                    $updateBtn.trigger('click');
-                }
+                // Mark as synced immediately to prevent multiple calls
+                $('body').data('cart-synced', true);
+
+                // Reload cart content via AJAX
+                $('body').trigger('processStart');
+                $.ajax({
+                    url: window.location.href,
+                    type: 'GET',
+                    data: { ajax: 1 },
+                    success: function (response) {
+                        // Extract and replace cart form
+                        const newContent = $(response).find('#form-validate');
+
+                        // Replace the form with the new content
+                        $('#form-validate').replaceWith(newContent);
+                        // Reinitialize widgets on new content
+                        $('#form-validate').trigger('contentUpdated');
+                    },
+                    error: function () {
+                        $('body').trigger('processStop');
+                        $('body').data('cart-synced', false);
+                    },
+                    complete: function () {
+                        $('body').trigger('processStop');
+                    }
+                });
             }
         }
 
@@ -98,7 +118,7 @@ define([
                 const obs = new MutationObserver(function () {
                     trySync();
 
-                    if (clicked) {
+                    if ($('body').data('cart-synced')) {
                         obs.disconnect();
                     }
                 });

app/code/Magento/Cms/Command/WysiwygRestrictCommand.php

@@ -58,7 +58,7 @@ protected function configure()
     /**
      * @inheritDoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $restrictArg = mb_strtolower((string)$input->getArgument('restrict'));
         $restrict = $restrictArg === 'y' ? '1' : '0';

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2017 Adobe
+ * Copyright 2024 Adobe
  * All Rights Reserved.
  */
 
@@ -159,7 +159,7 @@ protected function configure()
      * @throws RuntimeException
      * @since 101.0.0
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (!$this->deploymentConfig->isAvailable()) {
             $output->writeln(

app/code/Magento/Config/Console/Command/ConfigShowCommand.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2017 Adobe
+ * Copyright 2024 Adobe
  * All Rights Reserved.
  */
 namespace Magento\Config\Console\Command;
@@ -170,7 +170,7 @@ protected function configure()
      * @inheritdoc
      * @since 101.0.0
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
             $this->scope = $input->getOption(self::INPUT_OPTION_SCOPE);