Merge pull request #2132 from wallabag/sf3.1

Jump to Symfony 3.1

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:
 
     path_patterns:
         bundle_resource:
-            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+            - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
 
 fos_user:
     db_driver: orm
@@ -177,9 +177,9 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: %fosuser_confirmation%
+            enabled: "%fosuser_confirmation%"
     from_email:
-        address:        %from_email%
+        address:        "%from_email%"
         sender_name:    wallabag
 fos_oauth_server:
     db_driver:           orm
@@ -197,8 +197,8 @@ scheb_two_factor:
         cookie_lifetime: 2592000
 
     email:
-        enabled: %twofactor_auth%
-        sender_email: %twofactor_sender%
+        enabled: "%twofactor_auth%"
+        sender_email: "%twofactor_sender%"
         digits: 6
         template: WallabagUserBundle:Authentication:form.html.twig
         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:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
-            channels: [!event]
+            channels: ['!event']
         console:
             type:   console
             bubble: false
             verbosity_levels:
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: [!event, !doctrine]
+            channels: ['!event', '!doctrine']
         console_very_verbose:
             type:   console
             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:
     - { resource: config.yml }
 
 #framework:
-#    validation:
-#        cache: apc
+#    cache:
+#        system: cache.adapter.apcu
 
 #doctrine:
 #    orm: