Merge pull request #1612 from wallabag/v2-settings-page

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / config / services.yml

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 80f737f8aa3eb32bdaf9758a233dcf6ac99e33e9..a8796fe4452d0fce1f55700c902430d9d18cdce5 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -3,7 +3,7 @@ services:
         class: Wallabag\CoreBundle\Helper\DetectActiveTheme
         arguments:
             - "@security.token_storage"
-            - %theme% # default theme from parameters.yml
+            - %wallabag_core.theme%
 
     # custom form type
     wallabag_core.form.type.config:
@@ -12,19 +12,15 @@ services:
             - %liip_theme.themes%
             - %wallabag_core.languages%
         tags:
-            - { name: form.type, alias: config }
+            - { name: form.type }
 
-    wallabag_core.form.registration:
-        class: Wallabag\CoreBundle\Form\Type\RegistrationType
-        tags:
-            - { name: form.type, alias: wallabag_user_registration }
-
-    wallabag_core.form.type.forgot_password:
-        class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType
+    wallabag_core.filter.type.entry:
+        class: Wallabag\CoreBundle\Form\Type\EntryFilterType
         arguments:
-            - "@doctrine"
+            - "@wallabag_core.entry_repository"
+            - "@security.token_storage"
         tags:
-            - { name: form.type, alias: forgot_password }
+            - { name: form.type }
 
     wallabag_core.param_converter.username_rsstoken_converter:
         class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter
@@ -66,13 +62,13 @@ services:
     # repository as a service
     wallabag_core.entry_repository:
         class: Wallabag\CoreBundle\Repository\EntryRepository
-        factory: [ @doctrine.orm.default_entity_manager, getRepository ]
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
         arguments:
             - WallabagCoreBundle:Entry
 
     wallabag_core.tag_repository:
         class: Wallabag\CoreBundle\Repository\TagRepository
-        factory: [ @doctrine.orm.default_entity_manager, getRepository ]
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
         arguments:
             - WallabagCoreBundle:Tag
 
@@ -80,18 +76,18 @@ services:
         class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
         arguments:
             - "@doctrine.orm.entity_manager"
-            - %theme%
-            - %items_on_page%
-            - %rss_limit%
-            - %language%
+            - %wallabag_core.theme%
+            - %wallabag_core.items_on_page%
+            - %wallabag_core.rss_limit%
+            - %wallabag_core.language%
         tags:
             - { name: kernel.event_subscriber }
 
     wallabag_core.helper.entries_export:
         class: Wallabag\CoreBundle\Helper\EntriesExport
         arguments:
-            - %wallabag_url%
-            - src/Wallabag/CoreBundle/Resources/views/themes/_global/public/img/appicon/apple-touch-icon-152.png
+            - "@craue_config"
+            - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
 
     wallabag.operator.array.matches:
         class: Wallabag\CoreBundle\Operator\PHP\Matches