Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Backport issue 426 / PR 429 to branch 2.2

  • Loading branch information...
commit ead925b2f9cfd766cbdcd079dd9f2e03f0996787 1 parent 3ee08cc
@jdespatis jdespatis authored
View
4 UPGRADE.md
@@ -79,7 +79,7 @@ a link cannot be generated):
framework:
router:
- strict_requirements: %kernel.debug%
+ strict_requirements: "%kernel.debug%"
You can even disable the requirements check on production with `null` as you should
know that the parameters for URL generation always pass the requirements, e.g. by
@@ -90,7 +90,7 @@ The `default_locale` parameter is now a setting of the main `framework`
configuration (it was under the `framework.session` in 2.0):
framework:
- default_locale: %locale%
+ default_locale: "%locale%"
The `auto_start` setting under `framework.session` must be removed as it is
not used anymore (the session is now always started on-demand). If
View
42 app/config/config.yml
@@ -4,11 +4,11 @@ imports:
framework:
#esi: ~
- #translator: { fallback: %locale% }
- secret: %secret%
+ #translator: { fallback: "%locale%" }
+ secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
- strict_requirements: %kernel.debug%
+ strict_requirements: "%kernel.debug%"
form: ~
csrf_protection: ~
validation: { enable_annotations: true }
@@ -22,44 +22,44 @@ framework:
# Twig Configuration
twig:
- debug: %kernel.debug%
- strict_variables: %kernel.debug%
+ debug: "%kernel.debug%"
+ strict_variables: "%kernel.debug%"
# Assetic Configuration
assetic:
- debug: %kernel.debug%
+ debug: "%kernel.debug%"
use_controller: false
bundles: [ ]
#java: /usr/bin/java
filters:
cssrewrite: ~
#closure:
- # jar: %kernel.root_dir%/Resources/java/compiler.jar
+ # jar: "%kernel.root_dir%/Resources/java/compiler.jar"
#yui_css:
- # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
+ # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
# Doctrine Configuration
doctrine:
dbal:
- driver: %database_driver%
- host: %database_host%
- port: %database_port%
- dbname: %database_name%
- user: %database_user%
- password: %database_password%
+ driver: "%database_driver%"
+ host: "%database_host%"
+ port: "%database_port%"
+ dbname: "%database_name%"
+ user: "%database_user%"
+ password: "%database_password%"
charset: UTF8
# if using pdo_sqlite as your database driver, add the path in parameters.yml
- # e.g. database_path: %kernel.root_dir%/data/data.db3
- # path: %database_path%
+ # e.g. database_path: "%kernel.root_dir%/data/data.db3"
+ # path: "%database_path%"
orm:
- auto_generate_proxy_classes: %kernel.debug%
+ auto_generate_proxy_classes: "%kernel.debug%"
auto_mapping: true
# Swiftmailer Configuration
swiftmailer:
- transport: %mailer_transport%
- host: %mailer_host%
- username: %mailer_user%
- password: %mailer_password%
+ transport: "%mailer_transport%"
+ host: "%mailer_host%"
+ username: "%mailer_user%"
+ password: "%mailer_password%"
spool: { type: memory }
View
2  app/config/config_dev.yml
@@ -13,7 +13,7 @@ monolog:
handlers:
main:
type: stream
- path: %kernel.logs_dir%/%kernel.environment%.log
+ path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
firephp:
type: firephp
View
2  app/config/config_prod.yml
@@ -25,5 +25,5 @@ monolog:
handler: nested
nested:
type: stream
- path: %kernel.logs_dir%/%kernel.environment%.log
+ path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
Please sign in to comment.
Something went wrong with that request. Please try again.