From a403735a73f0301227fab54a06ad1e5691ab3eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pysiak?= <mpysiak@gmail.com>
Date: Tue, 22 Oct 2024 09:43:44 +0200
Subject: [PATCH] Changes after CR

---
 .../Resources/config/services/controller.xml   | 15 ++++++++-------
 .../Resources/config/services/mailer.xml       | 18 +++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
index eaa0b2f79df..b1beb728e05 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
@@ -40,13 +40,13 @@
             <argument type="service" id="twig" />
         </service>
 
-        <service id="sylius_admin.controller.remove_avatar" class="Sylius\Bundle\AdminBundle\Action\RemoveAvatarAction" public="true">
+        <service id="sylius_admin.controller.remove_avatar" class="Sylius\Bundle\AdminBundle\Action\RemoveAvatarAction">
             <argument type='service' id="sylius.repository.avatar_image" />
             <argument type="service" id="router" />
             <argument type="service" id="security.csrf.token_manager" />
         </service>
 
-        <service id="sylius_admin.controller.resend_order_confirmation_email" class="Sylius\Bundle\AdminBundle\Action\ResendOrderConfirmationEmailAction" public="true">
+        <service id="sylius_admin.controller.resend_order_confirmation_email" class="Sylius\Bundle\AdminBundle\Action\ResendOrderConfirmationEmailAction">
             <argument type='service' id="sylius.repository.order" />
             <argument type="service" id="sylius.command_dispatcher.resend_order_confirmation_email" />
             <argument type="service" id="security.csrf.token_manager" />
@@ -54,7 +54,7 @@
             <argument type="service" id="router" />
         </service>
 
-        <service id="sylius_admin.controller.resend_shipment_confirmation_email" class="Sylius\Bundle\AdminBundle\Action\ResendShipmentConfirmationEmailAction" public="true">
+        <service id="sylius_admin.controller.resend_shipment_confirmation_email" class="Sylius\Bundle\AdminBundle\Action\ResendShipmentConfirmationEmailAction">
             <argument type='service' id="sylius.repository.shipment" />
             <argument type="service" id="sylius.command_dispatcher.resend_shipment_confirmation_email" />
             <argument type="service" id="security.csrf.token_manager" />
@@ -74,19 +74,19 @@
             <argument type="service" id="twig" />
         </service>
 
-        <service id="sylius_admin.controller.dashboard" class="Sylius\Bundle\AdminBundle\Controller\DashboardController" public="true">
+        <service id="sylius_admin.controller.dashboard" class="Sylius\Bundle\AdminBundle\Controller\DashboardController">
             <argument type="service" id="sylius.repository.channel" />
             <argument type="service" id="twig" />
             <argument type="service" id="router" />
         </service>
 
-        <service id="sylius_admin.controller.customer_statistics" class="Sylius\Bundle\AdminBundle\Controller\CustomerStatisticsController" public="true">
+        <service id="sylius_admin.controller.customer_statistics" class="Sylius\Bundle\AdminBundle\Controller\CustomerStatisticsController">
             <argument type='service' id="sylius.provider.statistics.customer" />
             <argument type='service' id="sylius.repository.customer" />
             <argument type='service' id="twig" />
         </service>
 
-        <service id="sylius_admin.controller.notification" class="Sylius\Bundle\AdminBundle\Controller\NotificationController" public="true">
+        <service id="sylius_admin.controller.notification" class="Sylius\Bundle\AdminBundle\Controller\NotificationController">
             <argument type="service" id="sylius.http_client" />
             <argument type="service" id="Psr\Http\Message\RequestFactoryInterface" />
             <argument type="string">%sylius.admin.notification.uri%</argument>
@@ -94,7 +94,7 @@
             <argument type="service" id="Psr\Http\Message\StreamFactoryInterface" />
         </service>
 
-        <service id="sylius_admin.controller.remove_catalog_promotion" class="Sylius\Bundle\AdminBundle\Controller\RemoveCatalogPromotionAction" public="true">
+        <service id="sylius_admin.controller.remove_catalog_promotion" class="Sylius\Bundle\AdminBundle\Controller\RemoveCatalogPromotionAction">
             <argument type="service" id="sylius.processor.catalog_promotion.removal" />
         </service>
 
@@ -102,6 +102,7 @@
             id="sylius_admin.resource_controller.redirect_handler"
             class="Sylius\Bundle\AdminBundle\Controller\RedirectHandler"
             decorates="sylius.resource_controller.redirect_handler"
+            public="false"
         >
             <argument type="service" id=".inner" />
             <argument type="service" id="sylius.grid.filter_storage" />
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml
index 6d2a83c6fb7..ab235c108b6 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml
@@ -16,15 +16,15 @@
     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>       
-        <service id="sylius.listener.user_mailer" class="Sylius\Bundle\CoreBundle\EventListener\MailerListener" public="false">
-        <argument type="service" id="sylius.email_sender" />
-        <argument type="service" id="sylius.context.channel" />
-        <argument type="service" id="sylius.context.locale" />
-        <tag name="kernel.event_listener" event="sylius.user.password_reset.request.token" method="sendResetPasswordTokenEmail" />
-        <tag name="kernel.event_listener" event="sylius.user.email_verification.token" method="sendVerificationTokenEmail" />
-        <tag name="kernel.event_listener" event="sylius.user.post_email_verification" method="sendVerificationSuccessEmail" />
-        <tag name="kernel.event_listener" event="sylius.customer.post_register" method="sendUserRegistrationEmail" />
+    <services>
+        <service id="sylius.listener.user_mailer" class="Sylius\Bundle\CoreBundle\EventListener\MailerListener">
+            <argument type="service" id="sylius.email_sender" />
+            <argument type="service" id="sylius.context.channel" />
+            <argument type="service" id="sylius.context.locale" />
+            <tag name="kernel.event_listener" event="sylius.user.password_reset.request.token" method="sendResetPasswordTokenEmail" />
+            <tag name="kernel.event_listener" event="sylius.user.email_verification.token" method="sendVerificationTokenEmail" />
+            <tag name="kernel.event_listener" event="sylius.user.post_email_verification" method="sendVerificationSuccessEmail" />
+            <tag name="kernel.event_listener" event="sylius.customer.post_register" method="sendUserRegistrationEmail" />
         </service>
 
         <service id="sylius.mailer.contact_email_manager" class="Sylius\Bundle\CoreBundle\Mailer\ContactEmailManager">