Merge branch 'aprilrelease' of github.com:magento-gl/magento2ce into aprilrelease

Author: glo71317

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Bundle\Pricing\Adjustment;
@@ -173,12 +173,9 @@ private function addMiniMaxPriceList(Product $bundleProduct, $selectionsCollecti
      */
     private function addMaximumMultiSelectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
     {
-        $websiteId = null;
-        if (!$this->catalogData->isPriceGlobal()) {
-            $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
-            if ($websiteId === 0) {
-                $websiteId = $this->websiteRepository->getDefault()->getId();
-            }
+        $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
+        if ($websiteId === 0) {
+            $websiteId = $this->websiteRepository->getDefault()->getId();
         }
         $selectionsCollection->addPriceData(null, $websiteId);
 

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/DefaultSelectionPriceListProviderTest.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);
 
@@ -189,7 +189,10 @@ public function testGetPriceList(): void
         $this->model->getPriceList($this->product, false, false);
     }
 
-    public function testGetPriceListForFixedPriceType(): void
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testGetPriceListForFixedPriceType($websiteId): void
     {
         $optionId = 1;
 
@@ -218,13 +221,19 @@ public function testGetPriceListForFixedPriceType(): void
             ->willReturn($this->store);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
-            ->willReturn(0);
-        $this->websiteRepository->expects($this->once())
-            ->method('getDefault')
-            ->willReturn($this->website);
-        $this->website->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+            ->willReturn($websiteId);
+
+        if ($websiteId) {
+            $this->websiteRepository->expects($this->never())
+                ->method('getDefault');
+        } else {
+            $this->websiteRepository->expects($this->once())
+                ->method('getDefault')
+                ->willReturn($this->website);
+            $this->website->expects($this->once())
+                ->method('getId')
+                ->willReturn(1);
+        }
         $this->selectionCollection->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([]));
@@ -271,4 +280,12 @@ public function testGetPriceListWithSearchMin(): void
 
         $this->model->getPriceList($this->product, true, false);
     }
+
+    public static function dataProvider()
+    {
+        return [
+            'website provided' => [1],
+            'website not provided' => [0]
+        ];
+    }
 }

app/code/Magento/CatalogGraphQl/Model/PriceRangeDataProvider.php

@@ -1,19 +1,17 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CatalogGraphQl\Model;
 
-use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\Discount;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\SaleableInterface;
@@ -27,6 +25,8 @@ class PriceRangeDataProvider
 {
     private const STORE_FILTER_CACHE_KEY = '_cache_instance_store_filter';
 
+    private const TYPE_DOWNLOADABLE = 'downloadable';
+
     /**
      * @param PriceProviderPool $priceProviderPool
      * @param Discount $discount
@@ -45,18 +45,48 @@ public function __construct(
      * @param ContextInterface $context
      * @param ResolveInfo $info
      * @param array $value
-     * @throws Exception
-     * @return mixed|Value
+     * @return array
+     * @throws LocalizedException
      */
     public function prepare(ContextInterface $context, ResolveInfo $info, array $value): array
+    {
+        $store = $context->getExtensionAttributes()->getStore();
+        $product = $this->getProduct($value, $context, $store);
+
+        $requestedFields = $info->getFieldSelection(10);
+        $returnArray = [];
+
+        $returnArray['minimum_price'] = ($requestedFields['minimum_price'] ?? 0) ? ($this->canShowPrice($product) ?
+            $this->getMinimumProductPrice($product, $store) : $this->formatEmptyResult()) : $this->formatEmptyResult();
+        $returnArray['maximum_price'] = ($requestedFields['maximum_price'] ?? 0) ? ($this->canShowPrice($product) ?
+            $this->getMaximumProductPrice($product, $store) : $this->formatEmptyResult()) : $this->formatEmptyResult();
+
+        if ($product->getTypeId() === self::TYPE_DOWNLOADABLE &&
+            $product->getData('links_purchased_separately')) {
+            $downloadableLinkPrice = (float)$this->getDownloadableLinkPrice($product);
+            if ($downloadableLinkPrice > 0) {
+                $returnArray['maximum_price']['regular_price']['value'] += $downloadableLinkPrice;
+                $returnArray['maximum_price']['final_price']['value'] += $downloadableLinkPrice;
+            }
+        }
+
+        return $returnArray;
+    }
+
+    /**
+     * Validate and return product
+     *
+     * @param array $value
+     * @param ContextInterface $context
+     * @param StoreInterface $store
+     * @return Product
+     * @throws LocalizedException
+     */
+    private function getProduct(array $value, ContextInterface $context, StoreInterface $store): Product
     {
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var StoreInterface $store */
-        $store = $context->getExtensionAttributes()->getStore();
-
-        /** @var Product $product */
         $product = $value['model'];
         $product->unsetData('minimal_price');
         // add store filter for the product
@@ -69,15 +99,28 @@ public function prepare(ContextInterface $context, ResolveInfo $info, array $val
             }
         }
 
-        $requestedFields = $info->getFieldSelection(10);
-        $returnArray = [];
+        return $product;
+    }
 
-        $returnArray['minimum_price'] = ($requestedFields['minimum_price'] ?? 0) ? ($this->canShowPrice($product) ?
-            $this->getMinimumProductPrice($product, $store) : $this->formatEmptyResult()) : $this->formatEmptyResult();
-        $returnArray['maximum_price'] = ($requestedFields['maximum_price'] ?? 0) ? ($this->canShowPrice($product) ?
-            $this->getMaximumProductPrice($product, $store) : $this->formatEmptyResult()) : $this->formatEmptyResult();
+    /**
+     * Get the downloadable link price
+     *
+     * @param Product $product
+     * @return float
+     */
+    private function getDownloadableLinkPrice(Product $product): float
+    {
+        $downloadableLinks = $product->getTypeInstance()->getLinks($product);
+        if (empty($downloadableLinks)) {
+            return 0.0;
+        }
 
-        return $returnArray;
+        $price = 0.0;
+        foreach ($downloadableLinks as $link) {
+            $price += (float)$link->getPrice();
+        }
+
+        return $price;
     }
 
     /**

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductName.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class ProductName implements ResolverInterface
+{
+    /**
+     * ProductName constructor
+     *
+     * @param Escaper $escaper
+     */
+    public function __construct(
+        private readonly Escaper $escaper
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): string {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        // Product name allowed with special characters
+        return str_replace(
+            "&apos;",
+            "'",
+            str_replace("&amp;", "&", $this->escaper->escapeUrl($value['model']->getName()))
+        );
+    }
+}

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -1,5 +1,5 @@
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
+# Copyright 2025 Adobe
+# All Rights Reserved.
 
 type Query {
     products (
@@ -93,7 +93,7 @@ interface ProductLinksInterface @typeResolver(class: "Magento\\CatalogGraphQl\\M
 interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "Contains fields that are common to all types of products.") {
     id: Int @deprecated(reason: "Use the `uid` field instead.") @doc(description: "The ID number assigned to the product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
     uid: ID! @doc(description: "The unique ID for a `ProductInterface` object.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToUid")
-    name: String @doc(description: "The product name. Customers use this name to identify the product.")
+    name: String @doc(description: "The product name. Customers use this name to identify the product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductName")
     sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
     description: ComplexTextValue @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
     short_description: ComplexTextValue @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\CatalogInventoryGraphQl\Model\StockItemService;
+
+/**
+ * Resolver for ProductInterface max quantity
+ * Returns the available stock max quantity
+ */
+class MaxSaleQtyResolver implements ResolverInterface
+{
+    /**
+     * @var StockItemService
+     */
+    private $stockItemService;
+
+    /**
+     * @param StockItemService $stockItemService
+     */
+    public function __construct(
+        StockItemService $stockItemService
+    ) {
+        $this->stockItemService = $stockItemService;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        ?array $value = null,
+        ?array $args = null
+    ) {
+        $stockItem = $this->stockItemService->getStockItem($value['model']);
+        return $stockItem?->getMaxSaleQty();
+    }
+}

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

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventoryGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\CatalogInventoryGraphQl\Model\StockItemService;
+
+/**
+ * Resolver for ProductInterface min quantity
+ * Returns the available stock min quantity
+ */
+class MinSaleQtyResolver implements ResolverInterface
+{
+    /**
+     * @var StockItemService
+     */
+    private $stockItemService;
+
+    /**
+     * @param StockItemService $stockItemService
+     */
+    public function __construct(
+        StockItemService $stockItemService
+    ) {
+        $this->stockItemService = $stockItemService;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        ?array $value = null,
+        ?array $args = null
+    ) {
+        $stockItem = $this->stockItemService->getStockItem($value['model']);
+        return $stockItem?->getMinSaleQty();
+    }
+}