Merge pull request #5748 from yguedidi/use-fqcn-as-service-name

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:
@@ -219,7 +219,7 @@ scheb_two_factor:
         sender_email: "%twofactor_sender%"
         digits: 6
         template: WallabagUserBundle:Authentication:form.html.twig
-        mailer: wallabag_user.auth_code_mailer
+        mailer: Wallabag\UserBundle\Mailer\AuthCodeMailer
 
 kphoen_rulerz:
     targets:
@@ -406,7 +406,7 @@ sensio_framework_extra:
 httplug:
     clients:
         wallabag_core:
-            factory: 'wallabag_core.http_client_factory'
+            factory: Wallabag\CoreBundle\Helper\HttpClientFactory
             config:
                 defaults:
                     timeout: 10

app/config/services.yml

@@ -2,17 +2,17 @@ parameters:
     lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
 
 services:
-    twig.extension.text:
+    Twig_Extensions_Extension_Text:
         class: Twig_Extensions_Extension_Text
         tags:
             - { name: twig.extension }
 
-    wallabag.twig_extension:
+    Wallabag\CoreBundle\Twig\WallabagExtension:
         class: Wallabag\CoreBundle\Twig\WallabagExtension
         public: false
         arguments:
-            - "@wallabag_core.entry_repository"
-            - "@wallabag_core.tag_repository"
+            - '@Wallabag\CoreBundle\Repository\EntryRepository'
+            - '@Wallabag\CoreBundle\Repository\TagRepository'
             - "@security.token_storage"
             - "%wallabag_core.cache_lifetime%"
             - "@translator"
@@ -20,19 +20,19 @@ services:
         tags:
             - { name: twig.extension }
 
-    wallabag.twig_matomo_extension:
+    MatomoTwigExtension\MatomoTwigExtension:
         class: MatomoTwigExtension\MatomoTwigExtension
         public: false
         tags:
             - { name: twig.extension }
 
-    wallabag.locale_listener:
+    Wallabag\CoreBundle\Event\Listener\LocaleListener:
         class: Wallabag\CoreBundle\Event\Listener\LocaleListener
         arguments: ["%kernel.default_locale%"]
         tags:
             - { name: kernel.event_subscriber }
 
-    wallabag.user_locale_listener:
+    Wallabag\CoreBundle\Event\Listener\UserLocaleListener:
         class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
         arguments: ["@session"]
         tags:

app/config/services_test.yml

@@ -9,11 +9,11 @@ services:
         public: true
 
     wallabag_core.entry_repository.test:
-        alias: wallabag_core.entry_repository
+        alias: Wallabag\CoreBundle\Repository\EntryRepository
         public: true
 
     wallabag_user.user_repository.test:
-        alias: wallabag_user.user_repository
+        alias: Wallabag\UserBundle\Repository\UserRepository
         public: true
 
     filesystem_cache: