Update bundle & stock file

[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 c38787ded9040dac07844a2f5c6b5224209814d9..e8dafc5d3d4eec1be4a39befd0c54a37cbc86a8d 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -2,7 +2,7 @@ services:
     wallabag_core.helper.detect_active_theme:
         class: Wallabag\CoreBundle\Helper\DetectActiveTheme
         arguments:
-            - @security.context
+            - "@security.token_storage"
             - %theme% # default theme from parameters.yml
 
     # custom form type
@@ -10,50 +10,83 @@ services:
         class: Wallabag\CoreBundle\Form\Type\ConfigType
         arguments:
             - %liip_theme.themes%
+            - %wallabag_core.languages%
         tags:
-            - { name: form.type, alias: config }
-
-    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
-        arguments:
-            - @doctrine
-        tags:
-            - { name: form.type, alias: forgot_password }
+            - { name: form.type }
 
     wallabag_core.param_converter.username_rsstoken_converter:
         class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter
         tags:
             - { name: request.param_converter, converter: username_rsstoken_converter }
         arguments:
-            - @doctrine
+            - "@doctrine"
 
-    wallabag_core.doctrine.prefixed_naming_strategy:
-        class: Wallabag\CoreBundle\Doctrine\Mapping\PrefixedNamingStrategy
+    wallabag_core.table_prefix_subscriber:
+        class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber
         arguments:
             - %database_table_prefix%
+        tags:
+            - { name: doctrine.event_subscriber }
 
     wallabag_core.graby:
         class: Graby\Graby
         arguments:
             - { error_message: false }
+        calls:
+            - [ setLogger, [ "@logger" ] ]
+        tags:
+            - { name: monolog.logger, channel: graby }
 
     wallabag_core.content_proxy:
         class: Wallabag\CoreBundle\Helper\ContentProxy
         arguments:
-            - @wallabag_core.graby
+            - "@wallabag_core.graby"
+            - "@wallabag_core.rule_based_tagger"
+            - "@logger"
+
+    wallabag_core.rule_based_tagger:
+        class: Wallabag\CoreBundle\Helper\RuleBasedTagger
+        arguments:
+            - "@rulerz"
+            - "@wallabag_core.tag_repository"
+            - "@wallabag_core.entry_repository"
+
+    # repository as a service
+    wallabag_core.entry_repository:
+        class: Wallabag\CoreBundle\Repository\EntryRepository
+        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 ]
+        arguments:
+            - WallabagCoreBundle:Tag
 
     wallabag_core.registration_confirmed:
         class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
         arguments:
-            - @doctrine.orm.entity_manager
+            - "@doctrine.orm.entity_manager"
             - %theme%
             - %items_on_page%
             - %rss_limit%
             - %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
+
+    wallabag.operator.array.matches:
+        class: Wallabag\CoreBundle\Operator\PHP\Matches
+        tags:
+            - { name: rulerz.operator, executor: rulerz.executor.array, operator: matches }
+
+    wallabag.operator.doctrine.matches:
+        class: Wallabag\CoreBundle\Operator\Doctrine\Matches
+        tags:
+            - { name: rulerz.operator, executor: rulerz.executor.doctrine, operator: matches, inline: true }