From 60777e0573002ef0b8d7c82f85075a966e8ef8bf Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 24 Apr 2022 18:11:09 +0200
Subject: [PATCH] Use FQCN as service name for remaining CoreBundle services

---
 app/config/config.yml                            |  4 ++--
 .../CoreBundle/Resources/config/services.yml     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 2546a188c..57e1e84a8 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -40,7 +40,7 @@ twig:
     strict_variables: "%kernel.debug%"
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
-    exception_controller: wallabag_core.exception_controller:showAction
+    exception_controller: Wallabag\CoreBundle\Controller\ExceptionController:showAction
     globals:
         registration_enabled: '%fosuser_registration%'
 
@@ -171,7 +171,7 @@ liip_theme:
     themes:
         - baggy
         - material
-    autodetect_theme: wallabag_core.helper.detect_active_theme
+    autodetect_theme: Wallabag\CoreBundle\Helper\DetectActiveTheme
 
     path_patterns:
         bundle_resource:
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index cbb569105..9448349f0 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -1,5 +1,5 @@
 services:
-    wallabag_core.helper.detect_active_theme:
+    Wallabag\CoreBundle\Helper\DetectActiveTheme:
         class: Wallabag\CoreBundle\Helper\DetectActiveTheme
         arguments:
             - "@security.token_storage"
@@ -22,14 +22,14 @@ services:
         tags:
             - { name: form.type }
 
-    wallabag_core.param_converter.username_feed_token_converter:
+    Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter:
         class: Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter
         tags:
             - { name: request.param_converter, converter: username_feed_token_converter }
         arguments:
             - "@doctrine"
 
-    wallabag_core.subscriber.table_prefix:
+    Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber:
         class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber
         arguments:
             - "%database_table_prefix%"
@@ -58,7 +58,7 @@ services:
     wallabag_core.http_client:
         alias: 'httplug.client.wallabag_core'
 
-    wallabag_core.guzzle_authenticator.config_builder:
+    Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
         class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
         arguments:
             - '@Graby\SiteConfig\ConfigBuilder'
@@ -70,7 +70,7 @@ services:
 
     # service alias override
     bd_guzzle_site_authenticator.site_config_builder:
-        alias: wallabag_core.guzzle_authenticator.config_builder
+        alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
 
     Wallabag\CoreBundle\Helper\HttpClientFactory:
         class: Wallabag\CoreBundle\Helper\HttpClientFactory
@@ -200,21 +200,21 @@ services:
                 path: '%redis_path%'
                 password: '%redis_password%'
 
-    wallabag_core.exception_controller:
+    Wallabag\CoreBundle\Controller\ExceptionController:
         class: Wallabag\CoreBundle\Controller\ExceptionController
         public: true
         arguments:
             - '@twig'
             - '%kernel.debug%'
 
-    wallabag_core.subscriber.sqlite_cascade_delete:
+    Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
         class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber
         arguments:
             - "@doctrine"
         tags:
             - { name: doctrine.event_subscriber }
 
-    wallabag_core.subscriber.download_images:
+    Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber:
         class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber
         arguments:
             - "@doctrine.orm.default_entity_manager"