Merge branch '1.14' into 2.0

* 1.14:
  Fix note
  Fix rebase
  Add CONFLICTS.md note
  Add gedmo/doctrine-extensions conflict
  Update upgrade file
  [MoneyBundle] Unification of service names
  Update upgrade file
  [LocaleBundle] Unification of service names
  [InventoryBundle] Unification of service names
  Mirror improvements
  Update upgrade file
  [CurrencyBundle] Unification of service names

CONFLICTS.md

@@ -12,3 +12,8 @@ references related issues.
 
     - https://github.com/stof/StofDoctrineExtensionsBundle/issues/455
     - https://github.com/doctrine-extensions/DoctrineExtensions/issues/2600
+
+- `gedmo/doctrine-extensions:3.17.0`:
+
+  This version has a bug, which on Symfony 6.4 leads to a fatal error:
+  `[Semantical Error] The annotation "@note" in property Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry::$data was never imported.`

composer.json

@@ -188,6 +188,7 @@
         "sylius/user-bundle": "self.version"
     },
     "conflict": {
+        "gedmo/doctrine-extensions": "^3.17.0",
         "stof/doctrine-extensions-bundle": "1.8.0"
     },
     "require-dev": {

src/Sylius/Behat/Resources/config/services/contexts/setup.xml

@@ -106,7 +106,7 @@
 
         <service id="sylius.behat.context.setup.locale" class="Sylius\Behat\Context\Setup\LocaleContext">
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument type="service" id="sylius.locale_converter" />
+            <argument type="service" id="sylius.converter.locale" />
             <argument type="service" id="sylius.factory.locale" />
             <argument type="service" id="sylius.repository.locale" />
             <argument type="service" id="sylius.manager.locale" />

src/Sylius/Behat/Resources/config/services/contexts/transform.xml

@@ -40,7 +40,7 @@
         </service>
 
         <service id="sylius.behat.context.transform.currency" class="Sylius\Behat\Context\Transform\CurrencyContext">
-            <argument type="service" id="sylius.currency_name_converter" />
+            <argument type="service" id="sylius.converter.currency_name" />
             <argument type="service" id="sylius.repository.currency" />
         </service>
 
@@ -58,7 +58,7 @@
         </service>
 
         <service id="sylius.behat.context.transform.exchange_rate" class="Sylius\Behat\Context\Transform\ExchangeRateContext">
-            <argument type="service" id="sylius.currency_name_converter" />
+            <argument type="service" id="sylius.converter.currency_name" />
             <argument type="service" id="sylius.repository.currency" />
             <argument type="service" id="sylius.repository.exchange_rate" />
         </service>
@@ -67,7 +67,7 @@
         </service>
 
         <service id="sylius.behat.context.transform.locale" class="Sylius\Behat\Context\Transform\LocaleContext">
-            <argument type="service" id="sylius.locale_converter" />
+            <argument type="service" id="sylius.converter.locale" />
             <argument type="service" id="sylius.repository.locale" />
             <argument type="service" id="sylius.behat.shared_storage" />
         </service>

src/Sylius/Bundle/AdminBundle/Resources/config/services/listener.xml

@@ -21,7 +21,7 @@
         </service>
 
         <service id="sylius.listener.locale" class="Sylius\Bundle\AdminBundle\EventListener\LocaleListener">
-            <argument type="service" id="Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface" />
+            <argument type="service" id="sylius.checker.locale_usage" />
 
             <tag name="kernel.event_listener" event="sylius.locale.pre_delete" method="preDelete" />
         </service>

src/Sylius/Bundle/CoreBundle/Resources/config/services/context.xml

@@ -61,19 +61,19 @@
             <argument type="service" id="sylius.context.channel" />
         </service>
 
-        <service id="sylius.locale_provider.channel_based" class="Sylius\Component\Core\Provider\ChannelBasedLocaleProvider" decorates="sylius.locale_provider" decoration-priority="256">
+        <service id="sylius.locale_provider.channel_based" class="Sylius\Component\Core\Provider\ChannelBasedLocaleProvider" decorates="sylius.provider.locale" decoration-priority="256">
             <argument type="service" id="sylius.context.channel" />
             <argument>%locale%</argument>
         </service>
 
         <service id="sylius.context.locale.request_based" class="Sylius\Bundle\LocaleBundle\Context\RequestBasedLocaleContext">
             <argument type="service" id="request_stack" />
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <tag name="sylius.context.locale" priority="64" />
         </service>
 
         <service id="sylius.context.locale.provider_based" class="Sylius\Component\Locale\Context\ProviderBasedLocaleContext">
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <tag name="sylius.context.locale" priority="-128" />
         </service>
     </services>

src/Sylius/Bundle/CoreBundle/Resources/config/services/promotion.xml

@@ -61,7 +61,7 @@
             <argument type="service" id="sylius.proportional_integer_distributor" />
             <argument type="service" id="sylius.promotion.units_promotion_adjustments_applicator" />
             <argument type="service" id="Sylius\Component\Core\Distributor\MinimumPriceDistributorInterface" />
-            <argument type="service" id="sylius.currency_converter" />
+            <argument type="service" id="sylius.converter.currency" />
             <tag name="sylius.promotion_action" type="order_fixed_discount" label="sylius.form.promotion_action.order_fixed_discount" form-type="Sylius\Bundle\CoreBundle\Form\Type\Promotion\Action\ChannelBasedFixedDiscountConfigurationType" />
         </service>
         <service id="sylius.promotion_action.unit_fixed_discount" class="Sylius\Component\Core\Promotion\Action\UnitFixedDiscountPromotionActionCommand">
@@ -69,7 +69,7 @@
             <argument type="service" id="sylius.promotion_filter.price_range" />
             <argument type="service" id="sylius.promotion_filter.taxon" />
             <argument type="service" id="sylius.promotion_filter.product" />
-            <argument type="service" id="sylius.currency_converter" />
+            <argument type="service" id="sylius.converter.currency" />
             <tag name="sylius.promotion_action" type="unit_fixed_discount" label="sylius.form.promotion_action.item_fixed_discount" form-type="Sylius\Bundle\CoreBundle\Form\Type\Promotion\Action\ChannelBasedUnitFixedDiscountConfigurationType" />
         </service>
         <service id="sylius.promotion_action.percentage_discount" class="Sylius\Component\Core\Promotion\Action\PercentageDiscountPromotionActionCommand">

src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml

@@ -27,7 +27,7 @@
         </service>
 
         <service id="sylius.translation_locale_provider.admin" class="Sylius\Component\Core\Provider\TranslationLocaleProvider">
-            <argument type="service" id="sylius.locale_collection_provider" />
+            <argument type="service" id="sylius.provider.locale_collection" />
             <argument type="string">%locale%</argument>
         </service>
 

src/Sylius/Bundle/CurrencyBundle/Resources/config/services.xml

@@ -11,7 +11,11 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <imports>
         <import resource="services/form.xml" />
     </imports>
@@ -25,9 +29,11 @@
             <argument type="service" id="sylius.repository.exchange_rate" />
         </service>
         <service id="Sylius\Component\Currency\Converter\CurrencyConverterInterface" alias="sylius.currency_converter" />
+        <service id="sylius.converter.currency" alias="sylius.currency_converter" />
 
         <service id="sylius.currency_name_converter" class="Sylius\Component\Currency\Converter\CurrencyNameConverter" />
         <service id="Sylius\Component\Currency\Converter\CurrencyNameConverterInterface" alias="sylius.currency_name_converter" />
+        <service id="sylius.converter.currency_name" alias="sylius.currency_name_converter" />
 
         <service id="sylius.twig.extension.currency" class="Sylius\Bundle\CurrencyBundle\Twig\CurrencyExtension" public="false">
             <tag name="twig.extension" />

src/Sylius/Bundle/CurrencyBundle/Resources/config/services/form.xml

@@ -11,7 +11,11 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <parameters>
         <parameter key="sylius.form.type.currency.validation_groups" type="collection">
             <parameter>sylius</parameter>

src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml

@@ -11,7 +11,11 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <parameters>
         <parameter key="sylius.form.type.locale.validation_groups" type="collection">
             <parameter>sylius</parameter>
@@ -28,7 +32,7 @@
         </service>
 
         <service id="sylius.form.data_transformer.locale_to_code" class="Sylius\Bundle\LocaleBundle\Form\DataTransformer\LocaleToCodeTransformer">
-            <argument type="service" id="sylius.locale_collection_provider" />
+            <argument type="service" id="sylius.provider.locale_collection" />
         </service>
 
         <service id="sylius.form.type.locale_choice" class="Sylius\Bundle\LocaleBundle\Form\Type\LocaleChoiceType">
@@ -45,36 +49,41 @@
 
         <service id="Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext">
             <argument type="service" id="request_stack" />
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <tag name="sylius.context.locale" priority="32" />
         </service>
+        <service id="sylius.context.locale.request_based" alias="Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext" />
 
         <service id="sylius.locale_collection_provider" class="Sylius\Component\Locale\Provider\LocaleCollectionProvider">
             <argument type="service" id="sylius.repository.locale" />
         </service>
+        <service id="sylius.provider.locale_collection" alias="sylius.locale_collection_provider" />
 
-        <service id="sylius.locale_collection_provider.cached" class="Sylius\Component\Locale\Provider\CachedLocaleCollectionProvider" decorates="sylius.locale_collection_provider">
+        <service id="sylius.locale_collection_provider.cached" class="Sylius\Component\Locale\Provider\CachedLocaleCollectionProvider" decorates="sylius.provider.locale_collection">
             <argument type="service" id=".inner" />
             <argument type="service" id="cache.app" />
         </service>
+        <service id="sylius.provider.locale_collection.cached" alias="sylius.locale_collection_provider.cached" />
 
         <service id="sylius.locale_provider" class="Sylius\Component\Locale\Provider\LocaleProvider">
-            <argument type="service" id="sylius.locale_collection_provider" />
+            <argument type="service" id="sylius.provider.locale_collection" />
             <argument>%sylius_locale.locale%</argument>
         </service>
         <service id="Sylius\Component\Locale\Provider\LocaleProviderInterface" alias="sylius.locale_provider" />
+        <service id="sylius.provider.locale" alias="sylius.locale_provider" />
 
         <service id="sylius.locale_converter" class="Sylius\Component\Locale\Converter\LocaleConverter" />
         <service id="Sylius\Component\Locale\Converter\LocaleConverterInterface" alias="sylius.locale_converter" />
+        <service id="sylius.converter.locale" alias="sylius.locale_converter" />
 
         <service id="sylius.listener.request_locale_setter" class="Sylius\Bundle\LocaleBundle\Listener\RequestLocaleSetter">
             <argument type="service" id="sylius.context.locale" />
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <tag name="kernel.event_listener" event="kernel.request" priority="4" />
         </service>
 
         <service id="sylius.twig.extension.locale" class="Sylius\Bundle\LocaleBundle\Twig\LocaleExtension" public="false">
-            <argument type="service" id="sylius.locale_converter" />
+            <argument type="service" id="sylius.converter.locale" />
             <argument type="service" id="sylius.context.locale" />
             <tag name="twig.extension" />
         </service>
@@ -84,6 +93,7 @@
             <argument type="service" id="sylius.resource_registry" />
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
+        <service id="sylius.checker.locale_usage" alias="Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface" />
 
         <service id="Sylius\Bundle\LocaleBundle\Doctrine\EventListener\LocaleModificationListener">
             <argument type="service" id="cache.app" />
@@ -91,5 +101,6 @@
             <tag name="doctrine.orm.entity_listener" event="postUpdate" entity="Sylius\Component\Locale\Model\Locale" method="invalidateCachedLocales" />
             <tag name="doctrine.orm.entity_listener" event="postRemove" entity="Sylius\Component\Locale\Model\Locale" method="invalidateCachedLocales" />
         </service>
+        <service id="sylius.doctrine.listener.locale_modification" alias="Sylius\Bundle\LocaleBundle\Doctrine\EventListener\LocaleModificationListener" />
     </services>
 </container>

src/Sylius/Bundle/MoneyBundle/Resources/config/services.xml

@@ -11,7 +11,11 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
@@ -21,10 +25,12 @@
 
         <service id="sylius.money_formatter" class="Sylius\Bundle\MoneyBundle\Formatter\MoneyFormatter" />
         <service id="Sylius\Bundle\MoneyBundle\Formatter\MoneyFormatterInterface" alias="sylius.money_formatter" />
+        <service id="sylius.formatter.money" alias="sylius.money_formatter" />
 
         <service id="sylius.twig.extension.money" class="Sylius\Bundle\MoneyBundle\Twig\FormatMoneyExtension" public="false">
-            <argument type="service" id="sylius.money_formatter" />
+            <argument type="service" id="sylius.formatter.money" />
             <tag name="twig.extension" />
         </service>
+        <service id="sylius.twig.extension.format_money" alias="sylius.twig.extension.money" />
     </services>
 </container>

src/Sylius/Bundle/MoneyBundle/Resources/config/services/integrations/currency.xml

@@ -11,13 +11,18 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
         <service id="sylius.twig.extension.convert_amount" class="Sylius\Bundle\MoneyBundle\Twig\ConvertMoneyExtension" public="false">
-            <argument type="service" id="sylius.currency_converter" />
+            <argument type="service" id="sylius.converter.currency" />
             <tag name="twig.extension" />
         </service>
+        <service id="sylius.twig.extension.convert_money" alias="sylius.twig.extension.convert_amount" />
     </services>
 </container>

src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml

@@ -31,7 +31,7 @@
         </service>
 
         <service id="sylius.controller.shop.locale_switch" class="Sylius\Bundle\ShopBundle\Controller\LocaleSwitchController">
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <argument type="service" id="sylius.shop.locale_switcher" />
         </service>
 

src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/locale/storage.xml

@@ -28,7 +28,7 @@
         <service id="sylius.context.locale.storage_based" class="Sylius\Component\Core\Locale\Context\StorageBasedLocaleContext">
             <argument type="service" id="sylius.context.channel" />
             <argument type="service" id="sylius.storage.locale" />
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <tag name="sylius.context.locale" priority="-64" />
         </service>
 

src/Sylius/Bundle/ShopBundle/Resources/config/services/integrations/locale/url.xml

@@ -21,7 +21,7 @@
 
         <service id="sylius.listener.non_channel_request_locale" class="Sylius\Bundle\ShopBundle\EventListener\NonChannelLocaleListener">
             <argument type="service" id="router" />
-            <argument type="service" id="sylius.locale_provider" />
+            <argument type="service" id="sylius.provider.locale" />
             <argument type="service" id="security.firewall.map" />
             <argument type="collection">
                 <argument type="string">%sylius_shop.firewall_context_name%</argument>