kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[LocaleBundle] Unification of service names

Browse source
This commit is contained in:
Wojdylak 2024-10-04 11:18:22 +02:00
parent eae363f3dd
commit c5ee8053e5
No known key found for this signature in database
GPG key ID: 7509E560A6821ABE
11 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Sylius/Behat/Resources/config/services/contexts/setup.xml
View file

@ -96,7 +96,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" />

2
src/Sylius/Behat/Resources/config/services/contexts/transform.xml
View file

@ -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>

2
src/Sylius/Behat/Resources/config/services/contexts/ui.xml
View file

@ -121,7 +121,7 @@
<argument type="service" id="sylius.behat.page.admin.locale.create" />
<argument type="service" id="sylius.behat.page.admin.locale.index" />
<argument type="service" id="sylius.behat.notification_checker" />
<argument type="service" id="sylius.locale_converter" />
<argument type="service" id="sylius.converter.locale" />
</service>
<service id="sylius.behat.context.ui.admin.managing_orders" class="Sylius\Behat\Context\Ui\Admin\ManagingOrdersContext">

2
src/Sylius/Bundle/AdminBundle/Resources/config/services/listener.xml
View file

@ -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>

2
src/Sylius/Bundle/ApiBundle/Resources/config/services/data_persisters.xml
View file

@ -50,7 +50,7 @@
<service id="Sylius\Bundle\ApiBundle\DataPersister\LocaleDataPersister">
<argument type="service" id="api_platform.doctrine.orm.data_persister" />
<argument type="service" id="Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface" />
<argument type="service" id="sylius.checker.locale_usage" />
<tag name="api_platform.data_persister" />
</service>

6
src/Sylius/Bundle/CoreBundle/Resources/config/services/context.xml
View file

@ -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>

2
src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml
View file

@ -32,7 +32,7 @@
<service id="Sylius\Component\Core\Provider\ProductVariantsPricesProviderInterface" alias="sylius.provider.product_variants_prices" />
<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>

27
src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml
View file

@ -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,43 +49,48 @@
<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.templating.helper.locale" class="Sylius\Bundle\LocaleBundle\Templating\Helper\LocaleHelper">
<argument type="service" id="sylius.locale_converter" />
<argument type="service" id="sylius.converter.locale" />
<argument type="service" id="sylius.context.locale" />
<tag name="templating.helper" alias="sylius_locale" />
<deprecated package="sylius/locale-bundle" version="1.14">The "%service_id%" is deprecated since Sylius 1.14 and will be removed in 2.0.</deprecated>
</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>
@ -91,6 +100,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" />
@ -98,5 +108,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>

2
src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
View file

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

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

@ -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>

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

@ -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>