Merge branch '2.4-develop' into L3-PR-2023-09-06

Author: mirceaRosmeteniuc

app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml

@@ -31,6 +31,11 @@
         <data key="fixedPriceFormatted">$10.00</data>
         <data key="defaultAttribute">Default</data>
     </entity>
+    <entity name="BundleProductWithSlashSku" type="product">
+        <data key="name">BundleProduct</data>
+        <data key="sku">bu/ndle</data>
+        <data key="status">1</data>
+    </entity>
     <entity name="FixedBundleProduct" type="product2">
         <data key="name" unique="suffix">FixedBundleProduct</data>
         <data key="sku" unique="suffix">fixed-bundle-product</data>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaCheckoutWithEnabledCaptchaTest.xml

@@ -57,7 +57,7 @@
         </actionGroup>
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
-        <actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
         <actionGroup ref="AssertCaptchaVisibleOnSecondCheckoutStepActionGroup" stepKey="assertCaptchaIsVisible"/>
         <waitForPageLoad stepKey="waitForSpinner"/>
         <actionGroup ref="StorefrontFillCaptchaFieldOnCheckoutActionGroup" stepKey="placeOrderWithIncorrectValue">

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -448,9 +448,9 @@ private function getLinkResolver()
     }
 
     /**
-     * Remove ids of non selected websites from $websiteIds array and return filtered data
+     * Remove ids of non-selected websites from $websiteIds array and return filtered data
      *
-     * $websiteIds parameter expects array with website ids as keys and 1 (selected) or 0 (non selected) as values
+     * $websiteIds parameter expects array with website ids as keys and id (selected) or 0 (non-selected) as values
      * Only one id (default website ID) will be set to $websiteIds array when the single store mode is turned on
      *
      * @param array $websiteIds
@@ -461,7 +461,8 @@ private function filterWebsiteIds($websiteIds)
         if (!$this->storeManager->isSingleStoreMode()) {
             $websiteIds = array_filter((array) $websiteIds);
         } else {
-            $websiteIds[$this->storeManager->getWebsite(true)->getId()] = 1;
+            $websiteId = $this->storeManager->getWebsite(true)->getId();
+            $websiteIds[$websiteId] = $websiteId;
         }
 
         return $websiteIds;

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -476,10 +476,19 @@ private function retrieveGroupValue(string $code)
             $item = array_shift($items);
 
             if (!$item) {
+                $this->customerGroupsByCode[$code] = false;
                 return false;
             }
 
-            $this->customerGroupsByCode[strtolower($item->getCode())] = $item->getId();
+            $itemCode = $item->getCode();
+            $itemId = $item->getId();
+
+            if (strtolower($itemCode) !== $code) {
+                $this->customerGroupsByCode[$code] = false;
+                return false;
+            }
+
+            $this->customerGroupsByCode[strtolower($itemCode)] = $itemId;
         }
 
         return $this->customerGroupsByCode[$code];

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

@@ -94,8 +94,8 @@
 
         <!-- 4. Run cron to reindex -->
         <wait time="60" stepKey="waitForChanges"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCron"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCronTwice"/>
+        <magentoCron groups="index" stepKey="runCron" />
+        <magentoCron groups="index" stepKey="runCronTwice" />
 
         <!-- 5. Open category A on Storefront again -->
         <actionGroup ref="ReloadPageActionGroup" stepKey="reloadCategoryA"/>
@@ -124,8 +124,8 @@
 
         <!-- 8. Run cron reindex (Ensure that at least one minute passed since last cron run) -->
         <wait time="60" stepKey="waitOneMinute"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCron1"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCronTwice1"/>
+        <magentoCron groups="index" stepKey="runCron1" />
+        <magentoCron groups="index" stepKey="runCronTwice1" />
 
         <!-- 9. Open category A on Storefront again -->
         <actionGroup ref="ReloadPageActionGroup" stepKey="refreshCategoryAPage"/>
@@ -180,8 +180,8 @@
 
         <!-- 14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
         <wait time="60" stepKey="waitMinute"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCron2"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCronTwice2"/>
+        <magentoCron groups="index" stepKey="runCron2" />
+        <magentoCron groups="index" stepKey="runCronTwice2" />
 
         <!--  15. Open category B on Storefront  -->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="onPageCategoryB">
@@ -240,8 +240,8 @@
 
         <!-- 17.14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
         <wait time="60" stepKey="waitForOneMinute"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCron3"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCronTwice3"/>
+        <magentoCron groups="index" stepKey="runCron3" />
+        <magentoCron groups="index" stepKey="runCronTwice3" />
 
         <!--  17.15. Open category B on Storefront  -->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openPageCategoryB">
@@ -302,8 +302,8 @@
 
         <!-- 18.14. Run cron to reindex  (Ensure that at least one minute passed since last cron run) -->
         <wait time="60" stepKey="waitExtraMinute"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCron4"/>
-        <magentoCLI command="cron:run --group index" stepKey="runCronTwice4"/>
+        <magentoCron groups="index" stepKey="runCron4" />
+        <magentoCron groups="index" stepKey="runCronTwice4" />
 
         <!--  18.15. Open category B on Storefront  -->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="navigateToPageCategoryB">

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

@@ -82,7 +82,8 @@
         </actionGroup>
 
         <!-- Run cron -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <magentoCron stepKey="runCron" />
+        <magentoCron stepKey="runCronTwice" />
 
         <!-- Check product is present in category after cron run -->
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -388,8 +388,8 @@ public function initializeDataProvider()
         return [
             [
                 'single_store' => false,
-                'website_ids' => ['1' => 1, '2' => 1],
-                'expected_website_ids' => ['1' => 1, '2' => 1],
+                'website_ids' => ['1' => 1, '2' => 2],
+                'expected_website_ids' => ['1' => 1, '2' => 2],
                 'links' => [],
                 'linkTypes' => ['related', 'upsell', 'crosssell'],
                 'expected_links' => [],
@@ -423,8 +423,8 @@ public function initializeDataProvider()
             // Related links
             [
                 'single_store' => false,
-                'website_ids' => ['1' => 1, '2' => 1],
-                'expected_website_ids' => ['1' => 1, '2' => 1],
+                'website_ids' => ['1' => 1, '2' => 2],
+                'expected_website_ids' => ['1' => 1, '2' => 2],
                 'links' => [
                     'related' => [
                         0 => [
@@ -449,8 +449,8 @@ public function initializeDataProvider()
             // Custom link
             [
                 'single_store' => false,
-                'website_ids' => ['1' => 1, '2' => 1],
-                'expected_website_ids' => ['1' => 1, '2' => 1],
+                'website_ids' => ['1' => 1, '2' => 2],
+                'expected_website_ids' => ['1' => 1, '2' => 2],
                 'links' => [
                     'customlink' => [
                         0 => [
@@ -475,8 +475,8 @@ public function initializeDataProvider()
             // Both links
             [
                 'single_store' => false,
-                'website_ids' => ['1' => 1, '2' => 1],
-                'expected_website_ids' => ['1' => 1, '2' => 1],
+                'website_ids' => ['1' => 1, '2' => 2],
+                'expected_website_ids' => ['1' => 1, '2' => 2],
                 'links' => [
                     'related' => [
                         0 => [
@@ -515,8 +515,8 @@ public function initializeDataProvider()
             // Undefined link type
             [
                 'single_store' => false,
-                'website_ids' => ['1' => 1, '2' => 1],
-                'expected_website_ids' => ['1' => 1, '2' => 1],
+                'website_ids' => ['1' => 1, '2' => 2],
+                'expected_website_ids' => ['1' => 1, '2' => 2],
                 'links' => [
                     'related' => [
                         0 => [

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -98,7 +98,7 @@ public function __construct(
     public function build(array $args, bool $includeAggregation): SearchCriteriaInterface
     {
         $searchCriteria = $this->builder->build('products', $args);
-        $isSearch = !empty($args['search']);
+        $isSearch = isset($args['search']);
         $this->updateRangeFilters($searchCriteria);
         if ($includeAggregation) {
             $attributeData = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
@@ -122,7 +122,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
         }
 
         $this->addEntityIdSort($searchCriteria);
-        $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']));
+        $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']['category_id']));
 
         $searchCriteria->setCurrentPage($args['currentPage']);
         $searchCriteria->setPageSize($args['pageSize']);

app/code/Magento/CatalogGraphQl/Test/Unit/DataProvider/Product/SearchCriteriaBuilderTest.php

@@ -97,51 +97,63 @@ public function testBuild(): void
         $filter = $this->createMock(Filter::class);
 
         $searchCriteria = $this->getMockBuilder(SearchCriteriaInterface::class)
-                                ->disableOriginalConstructor()
-                                ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $attributeInterface = $this->getMockBuilder(Attribute::class)
-                                    ->disableOriginalConstructor()
-                                    ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $attributeInterface->setData(['is_filterable' => 0]);
 
         $this->builder->expects($this->any())
-                    ->method('build')
-                    ->with('products', $args)
-                    ->willReturn($searchCriteria);
+            ->method('build')
+            ->with('products', $args)
+            ->willReturn($searchCriteria);
         $searchCriteria->expects($this->any())->method('getFilterGroups')->willReturn([]);
         $this->eavConfig->expects($this->any())
-                        ->method('getAttribute')
-                        ->with(Product::ENTITY, 'price')
-                        ->willReturn($attributeInterface);
-
-        $this->sortOrderBuilder->expects($this->once())
-                                ->method('setField')
-                                ->with('_id')
-                                ->willReturnSelf();
-        $this->sortOrderBuilder->expects($this->once())
-                                ->method('setDirection')
-                                ->with('DESC')
-                                ->willReturnSelf();
-        $this->sortOrderBuilder->expects($this->any())
-                                ->method('create')
-                                ->willReturn([]);
-
-        $this->filterBuilder->expects($this->once())
-                            ->method('setField')
-                            ->with('visibility')
-                            ->willReturnSelf();
-        $this->filterBuilder->expects($this->once())
-                            ->method('setValue')
-                            ->with("")
-                            ->willReturnSelf();
-        $this->filterBuilder->expects($this->once())
-                            ->method('setConditionType')
-                            ->with('in')
-                            ->willReturnSelf();
-
-        $this->filterBuilder->expects($this->once())->method('create')->willReturn($filter);
-
+            ->method('getAttribute')
+            ->with(Product::ENTITY, 'price')
+            ->willReturn($attributeInterface);
+        $sortOrderList = ['relevance','_id'];
+        $sortIncrementIndex = 0;
+        foreach ($sortOrderList as $sortList) {
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('setField')
+                ->with($sortList)
+                ->willReturnSelf();
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('setDirection')
+                ->with('DESC')
+                ->willReturnSelf();
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('create')
+                ->willReturn([]);
+        }
+        $filterOrderList = [1=>'search_term', 2=>'visibility'];
+        $filterIncrementIndex = 0;
+        foreach ($filterOrderList as $index => $filterList) {
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                ->method('setField')
+                ->with($filterList)
+                ->willReturnSelf();
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                ->method('setValue')
+                ->with('')
+                ->willReturnSelf();
+            if ($index==2) {
+                $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                    ->method('setConditionType')
+                    ->with('in')
+                    ->willReturnSelf();
+            } else {
+                $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                    ->method('setConditionType')
+                    ->with('')
+                    ->willReturnSelf();
+            }
+
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))->method('create')->willReturn($filter);
+        }
         $this->filterGroupBuilder->expects($this->any())
             ->method('addFilter')
             ->with($filter)

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php

@@ -33,7 +33,7 @@ class QuoteItemQtyList
     public function getQty($productId, $quoteItemId, $quoteId, $itemQty)
     {
         $qty = $itemQty;
-        if (isset($this->_checkedQuoteItems[$quoteId][$productId]['qty']) && !in_array(
+        if (isset($this->_checkedQuoteItems[$quoteId][$productId]['qty']) && $quoteItemId !== null && !in_array(
             $quoteItemId,
             $this->_checkedQuoteItems[$quoteId][$productId]['items']
         )