diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-01 21:27:35 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-22 17:59:35 +0200 |
commit | 23634d5d842dabcf5d7475e2becb7e127824239e (patch) | |
tree | b91688722a996c46f27e8fe0542c356424483da3 /app | |
parent | 891a026e31ad54ca90b70f6026f23260cfadb7fd (diff) | |
download | wallabag-23634d5d842dabcf5d7475e2becb7e127824239e.tar.gz wallabag-23634d5d842dabcf5d7475e2becb7e127824239e.tar.zst wallabag-23634d5d842dabcf5d7475e2becb7e127824239e.zip |
Jump to Symfony 3.1
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 10 | ||||
-rw-r--r-- | app/config/config_dev.yml | 4 | ||||
-rw-r--r-- | app/config/config_prod.yml | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index ea028d85..9e2e08a6 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -169,7 +169,7 @@ liip_theme: | |||
169 | 169 | ||
170 | path_patterns: | 170 | path_patterns: |
171 | bundle_resource: | 171 | bundle_resource: |
172 | - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% | 172 | - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%" |
173 | 173 | ||
174 | fos_user: | 174 | fos_user: |
175 | db_driver: orm | 175 | db_driver: orm |
@@ -177,9 +177,9 @@ fos_user: | |||
177 | user_class: Wallabag\UserBundle\Entity\User | 177 | user_class: Wallabag\UserBundle\Entity\User |
178 | registration: | 178 | registration: |
179 | confirmation: | 179 | confirmation: |
180 | enabled: %fosuser_confirmation% | 180 | enabled: "%fosuser_confirmation%" |
181 | from_email: | 181 | from_email: |
182 | address: %from_email% | 182 | address: "%from_email%" |
183 | sender_name: wallabag | 183 | sender_name: wallabag |
184 | fos_oauth_server: | 184 | fos_oauth_server: |
185 | db_driver: orm | 185 | db_driver: orm |
@@ -197,8 +197,8 @@ scheb_two_factor: | |||
197 | cookie_lifetime: 2592000 | 197 | cookie_lifetime: 2592000 |
198 | 198 | ||
199 | email: | 199 | email: |
200 | enabled: %twofactor_auth% | 200 | enabled: "%twofactor_auth%" |
201 | sender_email: %twofactor_sender% | 201 | sender_email: "%twofactor_sender%" |
202 | digits: 6 | 202 | digits: 6 |
203 | template: WallabagUserBundle:Authentication:form.html.twig | 203 | template: WallabagUserBundle:Authentication:form.html.twig |
204 | mailer: wallabag_user.auth_code_mailer | 204 | mailer: wallabag_user.auth_code_mailer |
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 2813e369..ec23babb 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml | |||
@@ -17,14 +17,14 @@ monolog: | |||
17 | type: stream | 17 | type: stream |
18 | path: "%kernel.logs_dir%/%kernel.environment%.log" | 18 | path: "%kernel.logs_dir%/%kernel.environment%.log" |
19 | level: debug | 19 | level: debug |
20 | channels: [!event] | 20 | channels: ['!event'] |
21 | console: | 21 | console: |
22 | type: console | 22 | type: console |
23 | bubble: false | 23 | bubble: false |
24 | verbosity_levels: | 24 | verbosity_levels: |
25 | VERBOSITY_VERBOSE: INFO | 25 | VERBOSITY_VERBOSE: INFO |
26 | VERBOSITY_VERY_VERBOSE: DEBUG | 26 | VERBOSITY_VERY_VERBOSE: DEBUG |
27 | channels: [!event, !doctrine] | 27 | channels: ['!event', '!doctrine'] |
28 | console_very_verbose: | 28 | console_very_verbose: |
29 | type: console | 29 | type: console |
30 | bubble: false | 30 | bubble: false |
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 342837a0..65b040cc 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml | |||
@@ -2,8 +2,8 @@ imports: | |||
2 | - { resource: config.yml } | 2 | - { resource: config.yml } |
3 | 3 | ||
4 | #framework: | 4 | #framework: |
5 | # validation: | 5 | # cache: |
6 | # cache: apc | 6 | # system: cache.adapter.apcu |
7 | 7 | ||
8 | #doctrine: | 8 | #doctrine: |
9 | # orm: | 9 | # orm: |