Merge remote-tracking branch 'magento-commerce/2.4-develop' into ACP2E-3941

katmoon · katmoon · commit fbf3b22b1047 · 2025-06-24T19:58:02.000-05:00
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessageActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessageActionGroup.xml
@@ -17,6 +17,6 @@
         </arguments>
 
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{StorefrontBundledSection.validationMessageBox}}" userInput="{{message}}" stepKey="seeErrorHoldMessage"/>
+        <see selector="{{StorefrontBundledSection.selectOptionError}}" userInput="{{message}}" stepKey="seeErrorHoldMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessagesCountActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AssertStorefrontBundleValidationMessagesCountActionGroup.xml
@@ -14,7 +14,7 @@
         </annotations>
 
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <seeElement selector="{{StorefrontBundledSection.validationMessageBox}}" stepKey="seeErrorBox"/>
-        <seeNumberOfElements selector="{{StorefrontBundledSection.validationMessageBox}}" userInput="1" stepKey="seeOneErrorBox"/>
+        <seeElement selector="{{StorefrontBundledSection.selectOptionError}}" stepKey="seeErrorBox"/>
+        <seeNumberOfElements selector="{{StorefrontBundledSection.selectOptionError}}" userInput="1" stepKey="seeOneErrorBox"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -51,5 +51,6 @@
         <element name="dropDownQuantityValidation" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input/following-sibling::div[@class='mage-error']" parameterized="true"/>
         <element name="radioButtonQuantityValidation" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input/following-sibling::div[@class='mage-error']" parameterized="true"/>
         <element name="dropDrownOptionQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input/following-sibling::div//div//div//input" parameterized="true"/>
+        <element name="selectOptionError" type="text" selector="//div[contains(@class, 'field')]//div[contains(@class, 'mage-error')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCheckBoxOptionValidationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCheckBoxOptionValidationTest.xml
@@ -17,11 +17,7 @@
             <testCaseId value="MC-35133"/>
             <severity value="MINOR"/>
             <group value="Bundle"/>
-            <group value="pr_exclude"/>
             <group value="cloud"/>
-            <skip>
-                <issueId value="AC-10826"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simpleProduct1" before="bundleProduct"/>
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -219,9 +219,18 @@ public function execute($product, $arguments = [])
                     $clearImages[] = $image['file'];
                 } elseif (empty($image['value_id']) || !empty($image['recreate'])) {
                     $newFile = $this->moveImageFromTmp($image['file'] ?? '');
-                    $image['new_file'] = $newFile;
-                    $newImages[$image['file']] = $image;
-                    $image['file'] = $newFile;
+                    if (!empty($image['recreate']) && $newFile !== $image['file']) {
+                        //delete old image
+                        $this->mediaDirectory->renameFile(
+                            $this->mediaConfig->getMediaPath($newFile),
+                            $this->mediaConfig->getMediaPath($image['file'])
+                        );
+                        $existImages[$image['file']] = $image;
+                    } else {
+                        $image['new_file'] = $newFile;
+                        $newImages[$image['file']] = $image;
+                        $image['file'] = $newFile;
+                    }
                 } else {
                     $existImages[$image['file']] = $image;
                 }
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertCategoryCountInCategoryTreeWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertCategoryCountInCategoryTreeWidgetActionGroup.xml
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductQtyIncrementsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductQtyIncrementsTest.xml
@@ -20,9 +20,6 @@
             <group value="catalog"/>
             <group value="CatalogInventory"/>
             <group value="product_attributes"/>
-            <skip>
-            <issueId value="ACQE-4352"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -48,8 +45,11 @@
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
         <actionGroup ref="SortProductsByIdDescendingActionGroup" stepKey="sortProductsByIdDescending"/>
+        <waitForElementClickable selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="waitForSelectCheckbox1"/>
         <checkOption selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckbox1"/>
         <checkOption selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckbox2"/>
+        <seeCheckboxIsChecked selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="seeProduct1IsChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="seeProduct2IsChecked"/>
         <!-- Mass update qty increments -->
         <actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickMassUpdateProductAttributes"/>
         <actionGroup ref="AdminMassUpdateProductQtyIncrementsActionGroup" stepKey="updateQtyIncrements">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateMixedNestedCategoryInWidgetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateMixedNestedCategoryInWidgetTest.xml
@@ -105,8 +105,13 @@
         </actionGroup>
 
         <!-- Check the total number of expanded categories in the category tree widget ensuring all of them are loaded. -->
-        <actionGroup ref="AdminAssertCategoryCountInCategoryTreeWidgetActionGroup" stepKey="checkCategoryCount">
-            <argument name="ExpectedCount" value="9"/>
-        </actionGroup>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createBaseCategory.name$$')}}" stepKey="waitForBaseCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelTwoCategory.name$$')}}" stepKey="waitForLevelTwoCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelThreeCategory.name$$')}}" stepKey="waitForLevelThreeCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFourCategory.name$$')}}" stepKey="waitForLevelFourCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveCategory.name$$')}}" stepKey="waitForLevelFiveCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelSixCategory.name$$')}}" stepKey="waitForLevelSixCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveSubCategory.name$$')}}" stepKey="waitForLevelFiveSubCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveOneSubCategory.name$$')}}" stepKey="waitForLevelFiveOneSubCategoryVisible"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/CmsNewWidgetUpdateLayoutSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/CmsNewWidgetUpdateLayoutSection.xml
@@ -16,5 +16,6 @@
         <element name="CategoryChooserButton" type="button" selector="//*[@id='anchor_categories_ids_0']/p/a[1]/img"/>
         <element name="BranchCat" type="button" selector="//a[contains(text(),'{{var}}')]/..//i[contains(@class,'jstree-ocl')]" parameterized="true"/>
         <element name="CountAllNestedCat" type="button" selector="//*[@class='jstree-node jstree-last jstree-open' or @class='jstree-node  jstree-leaf jstree-last']//*[@class='jstree-icon jstree-ocl']"/>
+        <element name="CategoryName" type="text" selector="(//*[contains(@class, 'jstree-node') and contains(@class, 'jstree-last')])//a[contains(@class, 'jstree-anchor') and contains(normalize-space(text()), concat('{{CategoryName}}', ' '))]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Directory\Model;
@@ -438,10 +438,6 @@ private function formatCurrency(string $price, array $options): string
             $this->getCode() ?? $this->numberFormatter->getTextAttribute(\NumberFormatter::CURRENCY_CODE)
         );
 
-        if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
-            && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
-            $formattedCurrency = str_replace(' ', '', $formattedCurrency);
-        }
         if (preg_match('/^(\x{200F})/u', $formattedCurrency, $match)) {
             $formattedCurrency = preg_replace('/^' . $match[1] . '/u', '', $formattedCurrency);
         }
@@ -488,6 +484,8 @@ private function setOptions(array $options): void
         if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
             && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL) {
             $this->numberFormatter->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, '');
+            $this->numberFormatter->setTextAttribute(\NumberFormatter::POSITIVE_PREFIX, '');
+            $this->numberFormatter->setTextAttribute(\NumberFormatter::POSITIVE_SUFFIX, '');
         }
         if (array_key_exists('precision', $options)) {
             $this->numberFormatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $options['precision']);
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -241,6 +241,8 @@ public static function getFormatTxtNumberFormatterDataProvider(): array
                 ['precision' => 2, 'symbol' => '#', 'display' => CurrencyData::NO_SYMBOL],
                 '9,999.99'
             ],
+            ['he_IL', 'USD', '9999', [], '9,999.00 ‏$'],
+            ['he_IL', 'USD', '9999', ['display' => CurrencyData::NO_SYMBOL], '9,999.00'],
         ];
     }
 
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Action/Rows.php b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Action/Rows.php
@@ -89,7 +89,9 @@ public function afterExecute(
             if (!empty($productIds)) {
                 $indexer = $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID);
                 if ($indexer->isScheduled()) {
-                    $indexer->getView()->getChangelog()->addList($productIds);
+                    $changelog = $indexer->getView()->getChangelog();
+                    $changelog->create();
+                    $changelog->addList($productIds);
                 } else {
                     $indexer->invalidate();
                 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForCheckout.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForCheckout.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -57,7 +57,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
         try {
             $cart = $this->getCartForUser->execute($cartHash, $customerId, $storeId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e, $e->getCode());
         }
         $this->checkoutAllowance->execute($cart);
 
diff --git a/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/GetCartForCheckoutTest.php b/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/GetCartForCheckoutTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Test\Unit\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForCheckout;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use PHPUnit\Framework\MockObject\Exception;
+use PHPUnit\Framework\TestCase;
+
+class GetCartForCheckoutTest extends TestCase
+{
+    /**
+     * Verifies that when GetCartForUser::execute throws a NoSuchEntityException with a specific code,
+     * GetCartForCheckout::execute rethrows it as a GraphQlNoSuchEntityException, preserving the original
+     * exception message and code.
+     *
+     * @return void
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlInputException
+     * @throws Exception
+     */
+    public function testExecuteThrowsGraphQlNoSuchEntityExceptionWithOriginalCode()
+    {
+        $cartHash = 'test_hash';
+        $customerId = 1;
+        $storeId = 2;
+        $originalCode = 1234;
+        $originalMessage = 'Cart not found';
+
+        $getCartForUser = $this->createMock(GetCartForUser::class);
+        $getCartForUser->method('execute')
+            ->willThrowException(new NoSuchEntityException(__($originalMessage), null, $originalCode));
+
+        $checkoutAllowance = $this->createMock(CheckCartCheckoutAllowance::class);
+
+        $getCartForCheckout = new GetCartForCheckout($checkoutAllowance, $getCartForUser);
+
+        $this->expectException(GraphQlNoSuchEntityException::class);
+        $this->expectExceptionMessage($originalMessage);
+        $this->expectExceptionCode($originalCode);
+
+        $getCartForCheckout->execute($cartHash, $customerId, $storeId);
+    }
+}
diff --git a/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php b/app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Vault\Model\Ui\Adminhtml;
@@ -200,15 +200,16 @@ public function getTokensComponents($vaultPaymentCode)
         if ($quote) {
             $websiteId = $quote->getStore()->getWebsite()->getId();
         }
-
         $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
                     ->setValue($websiteId)
                     ->create(),
+                $this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
+                    ->setConditionType('null')
+                    ->create(),
             ]
         );
-
         $searchCriteria = $this->searchCriteriaBuilder->create();
 
         foreach ($this->paymentTokenRepository->getList($searchCriteria)->getItems() as $token) {
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -581,10 +581,12 @@ private function createExpectedFilter($field, $value, $atIndex)
             ->method('setField')
             ->with($field)
             ->willReturnSelf();
-        $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
-            ->method('setValue')
-            ->with($value)
-            ->willReturnSelf();
+        if ($value !== null) {
+            $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
+                ->method('setValue')
+                ->with($value)
+                ->willReturnSelf();
+        }
         $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
             ->method('create')
             ->willReturn($filterObject);
@@ -623,11 +625,11 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
         );
 
         $isVisibleFilter = $this->createExpectedFilter(PaymentTokenInterface::IS_VISIBLE, 1, 4);
-        $websiteFilter = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
+        $websiteFilter1 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
+        $websiteFilter2 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, null, 6);
 
-        $this->filterBuilder->expects(static::once())
+        $this->filterBuilder->expects(self::exactly(2))
             ->method('setConditionType')
-            ->with('gt')
             ->willReturnSelf();
 
         $this->searchCriteriaBuilder->expects(self::exactly(6))
@@ -639,7 +641,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
                     [$expiresAtFilter, $this->searchCriteriaBuilder],
                     [$isActiveFilter, $this->searchCriteriaBuilder],
                     [$isVisibleFilter, $this->searchCriteriaBuilder],
-                    [$websiteFilter, $this->searchCriteriaBuilder],
+                    [[$websiteFilter1, $websiteFilter2], $this->searchCriteriaBuilder],
                 ]
             );
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -895,4 +894,41 @@ public function testContentAttributeInGet(): void
         $response = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertArrayHasKey('content', $response);
     }
+
+    /**
+     * Test update() method when existing image gets overwritten and name is not changed
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testUpdateExistingImage()
+    {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple');
+        $imageId = (int)$product->getMediaGalleryImages()->getFirstItem()->getValueId();
+        $requestData = [
+            'sku' => 'simple',
+            'entry' => [
+                'id' => $this->getTargetGalleryEntryId(),
+                'label' => 'Updated Image Text',
+                'position' => 10,
+                'types' => ['thumbnail'],
+                'disabled' => true,
+                'media_type' => 'image',
+                'content' => [
+                    'base64_encoded_data' => base64_encode(file_get_contents($this->testImagePath)),
+                    'type' => 'image/jpeg',
+                    'name' => 'magento_image.jpg',
+                ]
+            ]
+        ];
+
+        $this->updateServiceInfo['rest']['resourcePath'] = $this->updateServiceInfo['rest']['resourcePath']
+            . '/' . $this->getTargetGalleryEntryId();
+
+        $this->assertTrue($this->_webApiCall($this->updateServiceInfo, $requestData, null, 'all'));
+        $updatedImage = $this->assertMediaGalleryData($imageId, '/m/a/magento_image.jpg', 'Updated Image Text');
+        $this->assertEquals(10, $updatedImage['position_default']);
+        $this->assertEquals(1, $updatedImage['disabled_default']);
+    }
 }
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
