Merge branch '2.4-develop' into spartans_pr_21042025

Author: magento-devops-queue-mgr-svc

.github/app-projects-boards-automation.config.yaml

@@ -219,6 +219,7 @@ automations:
       - ['merged', 'eq', true]
     actions:
       - moveTo: [23, 'Recently Merged'] #['Pull Requests Dashboard', 'Recently Merged']
+      - moveTo: [22, 'Recently Merged'] #['Community Dashboard', 'Recently Merged']
 
   # 18. Whenever a pull request is closed:
   #   a. it must be removed from the "Pull Requests Dashboard" project

app/code/Magento/Catalog/etc/db_schema.xml

@@ -135,6 +135,10 @@
         <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID" indexType="btree">
             <column name="attribute_id"/>
         </index>
+        <index referenceId="CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_ENTITY_ID" indexType="btree">
+            <column name="attribute_id"/>
+            <column name="entity_id"/>
+        </index>
         <index referenceId="CATALOG_PRODUCT_ENTITY_INT_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>

app/code/Magento/Catalog/etc/db_schema_whitelist.json

@@ -69,6 +69,7 @@
         },
         "index": {
             "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID": true,
+            "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_ENTITY_ID": true,
             "CATALOG_PRODUCT_ENTITY_INT_STORE_ID": true,
             "CATALOG_PRODUCT_ENTITY_INT_ATTRIBUTE_ID_STORE_ID_VALUE": true
         },

app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/QuantityResolver.php

@@ -1,15 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\StockState;
 use Magento\CatalogInventory\Model\Config\Source\NotAvailableMessage;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,16 +35,16 @@ class QuantityResolver implements ResolverInterface
     private const CONFIG_PATH_NOT_AVAILABLE_MESSAGE = "cataloginventory/options/not_available_message";
 
     /**
+     * QuantityResolver Constructor
+     *
      * @param ProductRepositoryInterface $productRepositoryInterface
      * @param ScopeConfigInterface $scopeConfig
-     * @param StockState $stockState
      * @param ProductStock $productStock
      */
     public function __construct(
         private readonly ProductRepositoryInterface $productRepositoryInterface,
         private readonly ScopeConfigInterface $scopeConfig,
-        private readonly StockState $stockState,
-        private readonly ProductStock $productStock,
+        private readonly ProductStock $productStock
     ) {
     }
 
@@ -69,7 +68,7 @@ public function resolve(
         }
 
         if (isset($value['cart_item']) && $value['cart_item'] instanceof Item) {
-            return $this->productStock->getProductAvailableStock($value['cart_item']);
+            return $this->productStock->getSaleableQtyByCartItem($value['cart_item'], null);
         }
 
         if (!isset($value['model'])) {
@@ -82,6 +81,7 @@ public function resolve(
         if ($product->getTypeId() === self::PRODUCT_TYPE_CONFIGURABLE) {
             $product = $this->productRepositoryInterface->get($product->getSku());
         }
-        return $this->stockState->getStockQty($product->getId());
+
+        return $this->productStock->getSaleableQty($product, null);
     }
 }

app/code/Magento/Checkout/Model/Sidebar.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\Checkout\Model;
 
@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\LocalizedToNormalized;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\NumberFormatter;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Model\Quote\Address\Total;
 
@@ -129,8 +130,12 @@ public function updateQuoteItem($itemId, $itemQty)
     protected function normalize($itemQty)
     {
         if ($itemQty) {
+            if (is_string($itemQty) && str_contains($itemQty, ',')) {
+                $itemQty = (double)str_replace(',', '.', $itemQty);
+            }
+
             $filter = new LocalizedToNormalized(
-                ['locale' => $this->resolver->getLocale()]
+                ['locale' => $this->resolver->getLocale(), 'decimal_style' => NumberFormatter::DECIMAL]
             );
             return $filter->filter((string)$itemQty);
         }

app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.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);
 
@@ -140,19 +140,29 @@ public function testRemoveQuoteItem()
         $this->assertEquals($this->sidebar, $this->sidebar->removeQuoteItem($itemId));
     }
 
-    public function testUpdateQuoteItem()
-    {
-        $itemId = 1;
-        $itemQty = 2;
-
+    /**
+     * @param string $locale
+     * @param int|string $itemId
+     * @param int|string|float $expectedItemQty
+     * @param int|string|float $itemQty
+     *
+     * @dataProvider dataProviderUpdateQuoteItem
+     */
+    public function testUpdateQuoteItem(
+        string $locale,
+        int|string $itemId,
+        int|string|float $expectedItemQty,
+        int|string|float $itemQty
+    ) {
         $this->resolverMock->expects($this->once())
             ->method('getLocale')
-            ->willReturn('en');
+            ->willReturn($locale);
 
         $this->cartMock->expects($this->once())
             ->method('updateItems')
-            ->with([$itemId => ['qty' => $itemQty]])
+            ->with([$itemId => ['qty' => $expectedItemQty]])
             ->willReturnSelf();
+
         $this->cartMock->expects($this->once())
             ->method('save')
             ->willReturnSelf();
@@ -178,4 +188,18 @@ public function testUpdateQuoteItemWithZeroQty()
 
         $this->assertEquals($this->sidebar, $this->sidebar->updateQuoteItem($itemId, $itemQty));
     }
+
+    /**
+     * @return array
+     */
+    public static function dataProviderUpdateQuoteItem(): array
+    {
+        return [
+            //locale, itemId, expectedItemQty, ItemQty
+            [ 'en_US', 1, 2, 2],
+            [ 'en_US', 1, 0.5, 0.5],
+            [ 'en_US', 1,"0.5","0.5"],
+            [ 'nl_NL', 1,"0.5","0,5"]
+        ];
+    }
 }

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -46,14 +46,38 @@ public function getValue()
     {
         $pattern = $this->identifier->getMarketingParameterPatterns();
         $replace = array_fill(0, count($pattern), '');
+        $url = preg_replace($pattern, $replace, (string)$this->request->getUriString());
+        list($baseUrl, $query) = $this->reconstructUrl($url);
         $data = [
             $this->request->isSecure(),
-            preg_replace($pattern, $replace, (string)$this->request->getUriString()),
+            $baseUrl,
+            $query,
             $this->context->getVaryString()
         ];
 
         $data = $this->identifierStoreReader->getPageTagsWithStoreCacheTags($data);
-
         return sha1($this->serializer->serialize($data));
     }
+
+    /**
+     * Reconstruct url and sort query
+     *
+     * @param string $url
+     * @return array
+     */
+    private function reconstructUrl(string $url): array
+    {
+        if (empty($url)) {
+            return [$url, ''];
+        }
+        $baseUrl = strtok($url, '?');
+        $query = $this->request->getUri()->getQueryAsArray();
+        if (!empty($query)) {
+            ksort($query);
+            $query = http_build_query($query);
+        } else {
+            $query = '';
+        }
+        return [$baseUrl, $query];
+    }
 }

app/code/Magento/PageCache/Test/Unit/Model/App/Request/Http/IdentifierForSaveTest.php

@@ -7,6 +7,8 @@
 
 namespace Magento\PageCache\Test\Unit\Model\App\Request\Http;
 
+use Laminas\Stdlib\Parameters;
+use Laminas\Uri\Http as HttpUri;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\PageCache\Identifier;
@@ -49,6 +51,9 @@ class IdentifierForSaveTest extends TestCase
      */
     private $identifierStoreReader;
 
+    /** @var Parameters|MockObject */
+    private $fileParams;
+
     /**
      * @var Identifier
      */
@@ -76,6 +81,7 @@ function ($value) {
                     return json_encode($value);
                 }
             );
+        $this->fileParams = $this->createMock(Parameters::class);
 
         $this->identifierStoreReader = $this->getMockBuilder(IdentifierStoreReader::class)
             ->onlyMethods(['getPageTagsWithStoreCacheTags'])
@@ -120,10 +126,24 @@ public function testGetValue(): void
             ->method('getUriString')
             ->willReturn('http://example.com/path1/');
 
+        $this->requestMock->expects($this->any())
+            ->method('getQuery')
+            ->willReturn($this->fileParams);
+
+        $this->fileParams->expects($this->any())
+            ->method('toArray')
+            ->willReturn([]);
+
         $this->contextMock->expects($this->any())
             ->method('getVaryString')
             ->willReturn(self::VARY);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->identifierStoreReader->method('getPageTagsWithStoreCacheTags')->willReturnCallback(
             function ($value) {
                 return $value;
@@ -136,6 +156,67 @@ function ($value) {
                     [
                         true,
                         'http://example.com/path1/',
+                        '',
+                        self::VARY
+                    ]
+                )
+            ),
+            $this->model->getValue()
+        );
+    }
+
+    /**
+     * Test get identifier for save value with query parameters.
+     *
+     * @return void
+     */
+    public function testGetValueWithQuery(): void
+    {
+        $this->requestMock->expects($this->any())
+            ->method('isSecure')
+            ->willReturn(true);
+
+        $this->requestMock->expects($this->any())
+            ->method('getUriString')
+            ->willReturn('http://example.com/path1/?b=2&a=1');
+
+        $this->requestMock->expects($this->any())
+            ->method('getQuery')
+            ->willReturn($this->fileParams);
+
+        $this->fileParams->expects($this->any())
+            ->method('toArray')
+            ->willReturn([
+                'b' => 2,
+                'a' => 1,
+            ]);
+
+        $this->contextMock->expects($this->any())
+            ->method('getVaryString')
+            ->willReturn(self::VARY);
+
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn([
+            'b' => 2,
+            'a' => 1,
+        ]);
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
+        $this->identifierStoreReader->method('getPageTagsWithStoreCacheTags')->willReturnCallback(
+            function ($value) {
+                return $value;
+            }
+        );
+
+        $this->assertEquals(
+            sha1(
+                json_encode(
+                    [
+                        true,
+                        'http://example.com/path1/',
+                        'a=1&b=2',
                         self::VARY
                     ]
                 )
@@ -167,18 +248,24 @@ public function testGetValueWithMarketingParameters(): void
             ->method('getVaryString')
             ->willReturn(self::VARY);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn(['abc' => '123']);
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->identifierStoreReader->method('getPageTagsWithStoreCacheTags')->willReturnCallback(
             function ($value) {
                 return $value;
             }
         );
-
         $this->assertEquals(
             sha1(
                 json_encode(
                     [
                         true,
-                        'http://example.com/path1/?abc=123',
+                        'http://example.com/path1/',
+                        'abc=123',
                         self::VARY
                     ]
                 )