diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-15 15:38:31 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-01-15 15:38:31 +0100 |
commit | 1930c19d8214c05ceefac5ac011a6b6e7e4a983d (patch) | |
tree | 8f07ffa139c7c2e883a560ef7dbb35a76adfb8dd /src/Wallabag/CoreBundle/Resources | |
parent | 790573d45899504bdecd2573c8f64018e23b139e (diff) | |
parent | 131eaa3e94ace8d75d6218e5c7c3aa58d5bb5009 (diff) | |
download | wallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.tar.gz wallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.tar.zst wallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.zip |
Merge pull request #1524 from wallabag/sf2.8
Upgrade to Symfony 3.0
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 40 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 2 |
2 files changed, 19 insertions, 23 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 96b1c931..43600735 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -2,7 +2,7 @@ services: | |||
2 | wallabag_core.helper.detect_active_theme: | 2 | wallabag_core.helper.detect_active_theme: |
3 | class: Wallabag\CoreBundle\Helper\DetectActiveTheme | 3 | class: Wallabag\CoreBundle\Helper\DetectActiveTheme |
4 | arguments: | 4 | arguments: |
5 | - @security.token_storage | 5 | - "@security.token_storage" |
6 | - %theme% # default theme from parameters.yml | 6 | - %theme% # default theme from parameters.yml |
7 | 7 | ||
8 | # custom form type | 8 | # custom form type |
@@ -12,26 +12,22 @@ services: | |||
12 | - %liip_theme.themes% | 12 | - %liip_theme.themes% |
13 | - %wallabag_core.languages% | 13 | - %wallabag_core.languages% |
14 | tags: | 14 | tags: |
15 | - { name: form.type, alias: config } | 15 | - { name: form.type } |
16 | 16 | ||
17 | wallabag_core.form.registration: | 17 | wallabag_core.filter.type.entry: |
18 | class: Wallabag\CoreBundle\Form\Type\RegistrationType | 18 | class: Wallabag\CoreBundle\Filter\EntryFilterType |
19 | tags: | ||
20 | - { name: form.type, alias: wallabag_user_registration } | ||
21 | |||
22 | wallabag_core.form.type.forgot_password: | ||
23 | class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType | ||
24 | arguments: | 19 | arguments: |
25 | - @doctrine | 20 | - "@wallabag_core.entry_repository" |
21 | - "@security.token_storage" | ||
26 | tags: | 22 | tags: |
27 | - { name: form.type, alias: forgot_password } | 23 | - { name: form.type } |
28 | 24 | ||
29 | wallabag_core.param_converter.username_rsstoken_converter: | 25 | wallabag_core.param_converter.username_rsstoken_converter: |
30 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter | 26 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter |
31 | tags: | 27 | tags: |
32 | - { name: request.param_converter, converter: username_rsstoken_converter } | 28 | - { name: request.param_converter, converter: username_rsstoken_converter } |
33 | arguments: | 29 | arguments: |
34 | - @doctrine | 30 | - "@doctrine" |
35 | 31 | ||
36 | wallabag_core.table_prefix_subscriber: | 32 | wallabag_core.table_prefix_subscriber: |
37 | class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber | 33 | class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber |
@@ -45,41 +41,41 @@ services: | |||
45 | arguments: | 41 | arguments: |
46 | - { error_message: false } | 42 | - { error_message: false } |
47 | calls: | 43 | calls: |
48 | - [ setLogger, [ @logger ] ] | 44 | - [ setLogger, [ "@logger" ] ] |
49 | tags: | 45 | tags: |
50 | - { name: monolog.logger, channel: graby } | 46 | - { name: monolog.logger, channel: graby } |
51 | 47 | ||
52 | wallabag_core.content_proxy: | 48 | wallabag_core.content_proxy: |
53 | class: Wallabag\CoreBundle\Helper\ContentProxy | 49 | class: Wallabag\CoreBundle\Helper\ContentProxy |
54 | arguments: | 50 | arguments: |
55 | - @wallabag_core.graby | 51 | - "@wallabag_core.graby" |
56 | - @wallabag_core.rule_based_tagger | 52 | - "@wallabag_core.rule_based_tagger" |
57 | - @logger | 53 | - "@logger" |
58 | 54 | ||
59 | wallabag_core.rule_based_tagger: | 55 | wallabag_core.rule_based_tagger: |
60 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger | 56 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger |
61 | arguments: | 57 | arguments: |
62 | - @rulerz | 58 | - "@rulerz" |
63 | - @wallabag_core.tag_repository | 59 | - "@wallabag_core.tag_repository" |
64 | - @wallabag_core.entry_repository | 60 | - "@wallabag_core.entry_repository" |
65 | 61 | ||
66 | # repository as a service | 62 | # repository as a service |
67 | wallabag_core.entry_repository: | 63 | wallabag_core.entry_repository: |
68 | class: Wallabag\CoreBundle\Repository\EntryRepository | 64 | class: Wallabag\CoreBundle\Repository\EntryRepository |
69 | factory: [ @doctrine.orm.default_entity_manager, getRepository ] | 65 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] |
70 | arguments: | 66 | arguments: |
71 | - WallabagCoreBundle:Entry | 67 | - WallabagCoreBundle:Entry |
72 | 68 | ||
73 | wallabag_core.tag_repository: | 69 | wallabag_core.tag_repository: |
74 | class: Wallabag\CoreBundle\Repository\TagRepository | 70 | class: Wallabag\CoreBundle\Repository\TagRepository |
75 | factory: [ @doctrine.orm.default_entity_manager, getRepository ] | 71 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] |
76 | arguments: | 72 | arguments: |
77 | - WallabagCoreBundle:Tag | 73 | - WallabagCoreBundle:Tag |
78 | 74 | ||
79 | wallabag_core.registration_confirmed: | 75 | wallabag_core.registration_confirmed: |
80 | class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener | 76 | class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener |
81 | arguments: | 77 | arguments: |
82 | - @doctrine.orm.entity_manager | 78 | - "@doctrine.orm.entity_manager" |
83 | - %theme% | 79 | - %theme% |
84 | - %items_on_page% | 80 | - %items_on_page% |
85 | - %rss_limit% | 81 | - %rss_limit% |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index d9850f7a..6ac6decb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -164,7 +164,7 @@ | |||
164 | {% endfor %} | 164 | {% endfor %} |
165 | </ul> | 165 | </ul> |
166 | 166 | ||
167 | <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_tagging_rule) }}> | 167 | {{ form_start(form.new_tagging_rule) }} |
168 | {{ form_errors(form.new_tagging_rule) }} | 168 | {{ form_errors(form.new_tagging_rule) }} |
169 | 169 | ||
170 | <fieldset class="w500p inline"> | 170 | <fieldset class="w500p inline"> |