[DX] Wire CatalogPricesCalculatorInterface to all catalog-facing services

Register sylius.calculator.product_variant_catalog_price (same implementation as
sylius.calculator.product_variant_price, independently decoratable) and wire it
to all catalog display consumers:

- sylius.twig.extension.price (Twig price filters)
- sylius_api.normalizer.product_variant (API serialization)
- sylius_shop.twig.component.product.price (shop price component)
- sylius_shop.twig.component.product.card (shop product card)
- sylius.provider.product_variant_map.price (JS variant switching)
- sylius.provider.product_variant_map.original_price
- sylius.provider.product_variant_map.lowest_price

Cart/order consumers (OrderPricesRecalculator, PriceRangeFilter) intentionally
remain on sylius.calculator.product_variant_price.

# Conflicts:
#	src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml
#	src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
#	src/Sylius/Bundle/CoreBundle/Resources/config/services/product_variant_map.xml
#	src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.xml
#	src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.xml

Author: Prometee

UPGRADE-2.2.md

@@ -53,6 +53,33 @@ SYLIUS_TELEMETRY_SALT=your-custom-salt
 
 1. The `Sylius\Bundle\ReviewBundle\Updater\ReviewableRatingUpdaterInterface::updateFromReview()` method has been deprecated and will be removed in Sylius 3.0. Use state machine mechanism implemented by Symfony Workflow instead.
 
+1. Passing a `Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface` directly to the following catalog-facing classes is deprecated.
+   Implement `Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface` instead, which extends `ProductVariantPricesCalculatorInterface` with no additional methods.
+
+   Affected classes:
+   - `Sylius\Bundle\CoreBundle\Twig\PriceExtension`
+   - `Sylius\Bundle\ApiBundle\Serializer\Normalizer\ProductVariantNormalizer`
+   - `Sylius\Bundle\ShopBundle\Twig\Component\Product\PriceComponent`
+   - `Sylius\Bundle\ShopBundle\Twig\Component\Product\CardComponent`
+   - `Sylius\Component\Core\Provider\ProductVariantMap\ProductVariantPriceMapProvider`
+   - `Sylius\Component\Core\Provider\ProductVariantMap\ProductVariantOriginalPriceMapProvider`
+   - `Sylius\Component\Core\Provider\ProductVariantMap\ProductVariantLowestPriceMapProvider`
+
+   If you have a custom calculator used for catalog display, make it implement `CatalogPricesCalculatorInterface`:
+
+   ```php
+   use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
+
+   final class MyCustomCatalogPriceCalculator implements CatalogPricesCalculatorInterface
+   {
+       // ...
+   }
+   ```
+
+   This allows you to decorate catalog display pricing independently from cart/order pricing
+   (`sylius.order_processing.order_prices_recalculator`, `sylius.filter.promotion.price_range`),
+   which remain on `ProductVariantPricesCalculatorInterface`.
+
 ## Admin UI
 
 1. A new `modal-portal.js` script has been added to `AdminBundle`.

src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.php

@@ -127,7 +127,7 @@
     $services
         ->set('sylius_api.normalizer.product_variant', ProductVariantNormalizer::class)
         ->args([
-            service('sylius.calculator.product_variant_price'),
+            service('sylius.calculator.product_variant_catalog_price'),
             service('sylius.checker.inventory.availability'),
             service('sylius.section_resolver.uri_based'),
             service('api_platform.symfony.iri_converter'),

src/Sylius/Bundle/ApiBundle/Serializer/Normalizer/ProductVariantNormalizer.php

@@ -19,6 +19,7 @@
 use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
 use Sylius\Bundle\ApiBundle\Serializer\SerializationGroupsSupportTrait;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
+use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
 use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Exception\MissingChannelConfigurationException;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
@@ -38,12 +39,21 @@ final class ProductVariantNormalizer implements NormalizerInterface, NormalizerA
     private const ALREADY_CALLED = 'sylius_product_variant_normalizer_already_called';
 
     public function __construct(
-        private readonly ProductVariantPricesCalculatorInterface $priceCalculator,
+        private readonly ProductVariantPricesCalculatorInterface|CatalogPricesCalculatorInterface $priceCalculator,
         private readonly AvailabilityCheckerInterface $availabilityChecker,
         private readonly SectionProviderInterface $uriBasedSectionContext,
         private readonly IriConverterInterface $iriConverter,
         private readonly array $serializationGroups,
     ) {
+        if (!$this->priceCalculator instanceof CatalogPricesCalculatorInterface) {
+            trigger_deprecation(
+                'sylius/sylius',
+                '2.2',
+                'Passing an instance of "%s" as $priceCalculator is deprecated. It will require "%s" since Sylius 3.0.',
+                ProductVariantPricesCalculatorInterface::class,
+                CatalogPricesCalculatorInterface::class,
+            );
+        }
     }
 
     /**

src/Sylius/Bundle/ApiBundle/tests/Serializer/Normalizer/ProductVariantNormalizerTest.php

@@ -23,7 +23,7 @@
 use Sylius\Bundle\ApiBundle\Serializer\ContextKeys;
 use Sylius\Bundle\ApiBundle\Serializer\Normalizer\ProductVariantNormalizer;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
-use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
+use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
 use Sylius\Component\Core\Exception\MissingChannelConfigurationException;
 use Sylius\Component\Core\Model\CatalogPromotionInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
@@ -34,7 +34,7 @@
 
 final class ProductVariantNormalizerTest extends TestCase
 {
-    private MockObject&ProductVariantPricesCalculatorInterface $pricesCalculator;
+    private MockObject&CatalogPricesCalculatorInterface $pricesCalculator;
 
     private AvailabilityCheckerInterface&MockObject $availabilityChecker;
 
@@ -57,7 +57,7 @@ final class ProductVariantNormalizerTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->pricesCalculator = $this->createMock(ProductVariantPricesCalculatorInterface::class);
+        $this->pricesCalculator = $this->createMock(CatalogPricesCalculatorInterface::class);
         $this->availabilityChecker = $this->createMock(AvailabilityCheckerInterface::class);
         $this->sectionProvider = $this->createMock(SectionProviderInterface::class);
         $this->iriConverter = $this->createMock(IriConverterInterface::class);

src/Sylius/Bundle/CoreBundle/Resources/config/services.php

@@ -38,6 +38,7 @@
 use Sylius\Bundle\CoreBundle\ShippingMethod\Updater\ShippingMethodUpdater;
 use Sylius\Bundle\CoreBundle\Twig\CheckoutStepsExtension;
 use Sylius\Bundle\CoreBundle\Twig\ProductVariantsMapExtension;
+use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
 use Sylius\Component\Core\Calculator\ProductVariantPriceCalculator;
 use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Cart\Modifier\LimitingOrderItemQuantityModifier;
@@ -308,6 +309,12 @@
     ;
     $services->alias(ProductVariantPricesCalculatorInterface::class, 'sylius.calculator.product_variant_price');
 
+    $services
+        ->set('sylius.calculator.product_variant_catalog_price', ProductVariantPriceCalculator::class)
+        ->args([service('sylius.checker.product_variant_lowest_price_display')])
+    ;
+    $services->alias(CatalogPricesCalculatorInterface::class, 'sylius.calculator.product_variant_catalog_price');
+
     $services
         ->set('sylius.section_resolver.uri_based', UriBasedSectionProvider::class)
         ->args([

src/Sylius/Bundle/CoreBundle/Resources/config/services/product_variant_map.php

@@ -37,13 +37,13 @@
 
     $services
         ->set('sylius.provider.product_variant_map.price', ProductVariantPriceMapProvider::class)
-        ->args([service('sylius.calculator.product_variant_price')])
+        ->args([service('sylius.calculator.product_variant_catalog_price')])
         ->tag('sylius.product_variant_data_map_provider')
     ;
 
     $services
         ->set('sylius.provider.product_variant_map.original_price', ProductVariantOriginalPriceMapProvider::class)
-        ->args([service('sylius.calculator.product_variant_price')])
+        ->args([service('sylius.calculator.product_variant_catalog_price')])
         ->tag('sylius.product_variant_data_map_provider')
     ;
 
@@ -54,7 +54,7 @@
 
     $services
         ->set('sylius.provider.product_variant_map.lowest_price', ProductVariantLowestPriceMapProvider::class)
-        ->args([service('sylius.calculator.product_variant_price')])
+        ->args([service('sylius.calculator.product_variant_catalog_price')])
         ->tag('sylius.product_variant_data_map_provider')
     ;
 };

src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.php

@@ -31,7 +31,7 @@
 
     $services
         ->set('sylius.twig.extension.price', PriceExtension::class)
-        ->args([service('sylius.calculator.product_variant_price')])
+        ->args([service('sylius.calculator.product_variant_catalog_price')])
         ->private()
         ->tag('twig.extension')
     ;

src/Sylius/Bundle/CoreBundle/Twig/PriceExtension.php

@@ -13,6 +13,7 @@
 
 namespace Sylius\Bundle\CoreBundle\Twig;
 
+use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
 use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Twig\Extension\AbstractExtension;
@@ -21,8 +22,18 @@
 
 final class PriceExtension extends AbstractExtension
 {
-    public function __construct(private readonly ProductVariantPricesCalculatorInterface $productVariantPricesCalculator)
-    {
+    public function __construct(
+        private readonly ProductVariantPricesCalculatorInterface|CatalogPricesCalculatorInterface $productVariantPricesCalculator,
+    ) {
+        if (!$this->productVariantPricesCalculator instanceof CatalogPricesCalculatorInterface) {
+            trigger_deprecation(
+                'sylius/sylius',
+                '2.2',
+                'Passing an instance of "%s" as $priceCalculator is deprecated. It will require "%s" since Sylius 3.0.',
+                ProductVariantPricesCalculatorInterface::class,
+                CatalogPricesCalculatorInterface::class,
+            );
+        }
     }
 
     public function getFilters(): array

src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.php

@@ -60,7 +60,7 @@
             service('sylius.resolver.product_variant'),
             service('sylius.context.channel'),
             service('sylius.context.locale'),
-            service('sylius.calculator.product_variant_price'),
+            service('sylius.calculator.product_variant_catalog_price'),
         ])
         ->tag('sylius.twig_component', ['key' => 'sylius_shop:product:card'])
     ;
@@ -78,7 +78,7 @@
     $services
         ->set('sylius_shop.twig.component.product.price', PriceComponent::class)
         ->args([
-            service('sylius.calculator.product_variant_price'),
+            service('sylius.calculator.product_variant_catalog_price'),
             service('sylius.formatter.money'),
             service('sylius.context.channel'),
             service('sylius.context.locale'),

src/Sylius/Bundle/ShopBundle/Twig/Component/Product/CardComponent.php

@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
+use Sylius\Component\Core\Calculator\CatalogPricesCalculatorInterface;
 use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;
@@ -48,8 +49,17 @@ public function __construct(
         protected readonly ProductVariantResolverInterface $productVariantResolver,
         protected readonly ChannelContextInterface $channelContext,
         protected readonly LocaleContextInterface $localeContext,
-        protected readonly ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
+        protected readonly ProductVariantPricesCalculatorInterface|CatalogPricesCalculatorInterface $productVariantPricesCalculator,
     ) {
+        if (!$this->productVariantPricesCalculator instanceof CatalogPricesCalculatorInterface) {
+            trigger_deprecation(
+                'sylius/sylius',
+                '2.2',
+                'Passing an instance of "%s" as $priceCalculator is deprecated. It will require "%s" since Sylius 3.0.',
+                ProductVariantPricesCalculatorInterface::class,
+                CatalogPricesCalculatorInterface::class,
+            );
+        }
     }
 
     #[PostMount]