diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-10-23 11:09:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 11:09:17 +0200 |
commit | 1953a872932a63792293b4aec087880265ba89f7 (patch) | |
tree | fd16599e737fcdaf193c933ef3ec4a4ee248b117 /src/Wallabag/CoreBundle/Resources/config/services.yml | |
parent | d83d25dadec2c38460a32d96f5d2903426fec9d3 (diff) | |
parent | 702f2d67d60ca963492b90dad74cb5f8dcc84e51 (diff) | |
download | wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.gz wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.zst wallabag-1953a872932a63792293b4aec087880265ba89f7.zip |
Merge pull request #3011 from wallabag/2.3
wallabag 2.3.0
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/config/services.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 51d6ab47..31b16739 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -41,6 +41,7 @@ services: | |||
41 | arguments: | 41 | arguments: |
42 | - | 42 | - |
43 | error_message: '%wallabag_core.fetching_error_message%' | 43 | error_message: '%wallabag_core.fetching_error_message%' |
44 | error_message_title: '%wallabag_core.fetching_error_message_title%' | ||
44 | - "@wallabag_core.guzzle.http_client" | 45 | - "@wallabag_core.guzzle.http_client" |
45 | - "@wallabag_core.graby.config_builder" | 46 | - "@wallabag_core.graby.config_builder" |
46 | calls: | 47 | calls: |
@@ -62,7 +63,11 @@ services: | |||
62 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder | 63 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder |
63 | arguments: | 64 | arguments: |
64 | - "@wallabag_core.graby.config_builder" | 65 | - "@wallabag_core.graby.config_builder" |
65 | - "%sites_credentials%" | 66 | - "@security.token_storage" |
67 | - "@wallabag_core.site_credential_repository" | ||
68 | - '@logger' | ||
69 | tags: | ||
70 | - { name: monolog.logger, channel: graby } | ||
66 | 71 | ||
67 | # service alias override | 72 | # service alias override |
68 | bd_guzzle_site_authenticator.site_config_builder: | 73 | bd_guzzle_site_authenticator.site_config_builder: |
@@ -71,10 +76,11 @@ services: | |||
71 | wallabag_core.guzzle.http_client_factory: | 76 | wallabag_core.guzzle.http_client_factory: |
72 | class: Wallabag\CoreBundle\Helper\HttpClientFactory | 77 | class: Wallabag\CoreBundle\Helper\HttpClientFactory |
73 | arguments: | 78 | arguments: |
74 | - "@bd_guzzle_site_authenticator.authenticator_subscriber" | ||
75 | - "@wallabag_core.guzzle.cookie_jar" | 79 | - "@wallabag_core.guzzle.cookie_jar" |
76 | - '@=service(''craue_config'').get(''restricted_access'')' | 80 | - '@=service(''craue_config'').get(''restricted_access'')' |
77 | - '@logger' | 81 | - '@logger' |
82 | calls: | ||
83 | - ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]] | ||
78 | 84 | ||
79 | wallabag_core.guzzle.cookie_jar: | 85 | wallabag_core.guzzle.cookie_jar: |
80 | class: GuzzleHttp\Cookie\FileCookieJar | 86 | class: GuzzleHttp\Cookie\FileCookieJar |
@@ -85,16 +91,22 @@ services: | |||
85 | arguments: | 91 | arguments: |
86 | - "@wallabag_core.graby" | 92 | - "@wallabag_core.graby" |
87 | - "@wallabag_core.rule_based_tagger" | 93 | - "@wallabag_core.rule_based_tagger" |
88 | - "@wallabag_core.tag_repository" | 94 | - "@validator" |
89 | - "@logger" | 95 | - "@logger" |
90 | - '%wallabag_core.fetching_error_message%' | 96 | - '%wallabag_core.fetching_error_message%' |
91 | 97 | ||
98 | wallabag_core.tags_assigner: | ||
99 | class: Wallabag\CoreBundle\Helper\TagsAssigner | ||
100 | arguments: | ||
101 | - "@wallabag_core.tag_repository" | ||
102 | |||
92 | wallabag_core.rule_based_tagger: | 103 | wallabag_core.rule_based_tagger: |
93 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger | 104 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger |
94 | arguments: | 105 | arguments: |
95 | - "@rulerz" | 106 | - "@rulerz" |
96 | - "@wallabag_core.tag_repository" | 107 | - "@wallabag_core.tag_repository" |
97 | - "@wallabag_core.entry_repository" | 108 | - "@wallabag_core.entry_repository" |
109 | - "@logger" | ||
98 | 110 | ||
99 | # repository as a service | 111 | # repository as a service |
100 | wallabag_core.entry_repository: | 112 | wallabag_core.entry_repository: |
@@ -109,10 +121,19 @@ services: | |||
109 | arguments: | 121 | arguments: |
110 | - WallabagCoreBundle:Tag | 122 | - WallabagCoreBundle:Tag |
111 | 123 | ||
124 | wallabag_core.site_credential_repository: | ||
125 | class: Wallabag\CoreBundle\Repository\SiteCredentialRepository | ||
126 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] | ||
127 | arguments: | ||
128 | - WallabagCoreBundle:SiteCredential | ||
129 | calls: | ||
130 | - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] | ||
131 | |||
112 | wallabag_core.helper.entries_export: | 132 | wallabag_core.helper.entries_export: |
113 | class: Wallabag\CoreBundle\Helper\EntriesExport | 133 | class: Wallabag\CoreBundle\Helper\EntriesExport |
114 | arguments: | 134 | arguments: |
115 | - '@=service(''craue_config'').get(''wallabag_url'')' | 135 | - "@translator" |
136 | - '%domain_name%' | ||
116 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png | 137 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png |
117 | 138 | ||
118 | wallabag.operator.array.matches: | 139 | wallabag.operator.array.matches: |
@@ -125,6 +146,16 @@ services: | |||
125 | tags: | 146 | tags: |
126 | - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } | 147 | - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } |
127 | 148 | ||
149 | wallabag.operator.array.notmatches: | ||
150 | class: Wallabag\CoreBundle\Operator\PHP\NotMatches | ||
151 | tags: | ||
152 | - { name: rulerz.operator, target: native, operator: notmatches } | ||
153 | |||
154 | wallabag.operator.doctrine.notmatches: | ||
155 | class: Wallabag\CoreBundle\Operator\Doctrine\NotMatches | ||
156 | tags: | ||
157 | - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } | ||
158 | |||
128 | wallabag_core.helper.redirect: | 159 | wallabag_core.helper.redirect: |
129 | class: Wallabag\CoreBundle\Helper\Redirect | 160 | class: Wallabag\CoreBundle\Helper\Redirect |
130 | arguments: | 161 | arguments: |
@@ -174,9 +205,15 @@ services: | |||
174 | class: Wallabag\CoreBundle\Helper\DownloadImages | 205 | class: Wallabag\CoreBundle\Helper\DownloadImages |
175 | arguments: | 206 | arguments: |
176 | - "@wallabag_core.entry.download_images.client" | 207 | - "@wallabag_core.entry.download_images.client" |
177 | - "%kernel.root_dir%/../web/assets/images" | 208 | - "%kernel.project_dir%/web/assets/images" |
178 | - '@=service(''craue_config'').get(''wallabag_url'')' | 209 | - '%domain_name%' |
179 | - "@logger" | 210 | - "@logger" |
180 | 211 | ||
181 | wallabag_core.entry.download_images.client: | 212 | wallabag_core.entry.download_images.client: |
182 | class: GuzzleHttp\Client | 213 | class: GuzzleHttp\Client |
214 | |||
215 | wallabag_core.helper.crypto_proxy: | ||
216 | class: Wallabag\CoreBundle\Helper\CryptoProxy | ||
217 | arguments: | ||
218 | - "%wallabag_core.site_credentials.encryption_key_path%" | ||
219 | - "@logger" | ||