Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Make the app/config/*.yml files validate #427

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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
Expand All @@ -88,7 +88,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
Expand Down
40 changes: 20 additions & 20 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,56 @@ 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: true
csrf_protection: true
validation: { enable_annotations: true }
templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
default_locale: %locale%
default_locale: "%locale%"
trust_proxy_headers: false # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
session: ~

# 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

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 }
2 changes: 1 addition & 1 deletion app/config/config_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/config/config_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ monolog:
handler: nested
nested:
type: stream
path: %kernel.logs_dir%/%kernel.environment%.log
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug