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

Commit 1d8fa17

Browse files
committed
bug #611 Backport issue 426 / PR 429 to branch 2.2 (jdespatis)
This PR was merged into the 2.2 branch. Discussion ---------- Backport issue 426 / PR 429 to branch 2.2 Yaml config files into app/config are not valid This issue has already been reported one year ago with issue #426, and has been fixed thanks to PR #429 However, it seems that this PR has been merged into branch 2.1, and not backported into master Therefore this bug still exists in master, 2.2, 2.3 and 2.4 Here is a PR to merge into branch 2.2 (and it would need a backport into master, 2.3 and 2.4 ?, and maybe a new tag for each) Commits ------- ead925b Backport issue 426 / PR 429 to branch 2.2
2 parents 3ee08cc + ead925b commit 1d8fa17

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

UPGRADE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ a link cannot be generated):
7979

8080
framework:
8181
router:
82-
strict_requirements: %kernel.debug%
82+
strict_requirements: "%kernel.debug%"
8383

8484
You can even disable the requirements check on production with `null` as you should
8585
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`
9090
configuration (it was under the `framework.session` in 2.0):
9191

9292
framework:
93-
default_locale: %locale%
93+
default_locale: "%locale%"
9494

9595
The `auto_start` setting under `framework.session` must be removed as it is
9696
not used anymore (the session is now always started on-demand). If

app/config/config.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ imports:
44

55
framework:
66
#esi: ~
7-
#translator: { fallback: %locale% }
8-
secret: %secret%
7+
#translator: { fallback: "%locale%" }
8+
secret: "%secret%"
99
router:
1010
resource: "%kernel.root_dir%/config/routing.yml"
11-
strict_requirements: %kernel.debug%
11+
strict_requirements: "%kernel.debug%"
1212
form: ~
1313
csrf_protection: ~
1414
validation: { enable_annotations: true }
@@ -22,44 +22,44 @@ framework:
2222

2323
# Twig Configuration
2424
twig:
25-
debug: %kernel.debug%
26-
strict_variables: %kernel.debug%
25+
debug: "%kernel.debug%"
26+
strict_variables: "%kernel.debug%"
2727

2828
# Assetic Configuration
2929
assetic:
30-
debug: %kernel.debug%
30+
debug: "%kernel.debug%"
3131
use_controller: false
3232
bundles: [ ]
3333
#java: /usr/bin/java
3434
filters:
3535
cssrewrite: ~
3636
#closure:
37-
# jar: %kernel.root_dir%/Resources/java/compiler.jar
37+
# jar: "%kernel.root_dir%/Resources/java/compiler.jar"
3838
#yui_css:
39-
# jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
39+
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
4040

4141
# Doctrine Configuration
4242
doctrine:
4343
dbal:
44-
driver: %database_driver%
45-
host: %database_host%
46-
port: %database_port%
47-
dbname: %database_name%
48-
user: %database_user%
49-
password: %database_password%
44+
driver: "%database_driver%"
45+
host: "%database_host%"
46+
port: "%database_port%"
47+
dbname: "%database_name%"
48+
user: "%database_user%"
49+
password: "%database_password%"
5050
charset: UTF8
5151
# if using pdo_sqlite as your database driver, add the path in parameters.yml
52-
# e.g. database_path: %kernel.root_dir%/data/data.db3
53-
# path: %database_path%
52+
# e.g. database_path: "%kernel.root_dir%/data/data.db3"
53+
# path: "%database_path%"
5454

5555
orm:
56-
auto_generate_proxy_classes: %kernel.debug%
56+
auto_generate_proxy_classes: "%kernel.debug%"
5757
auto_mapping: true
5858

5959
# Swiftmailer Configuration
6060
swiftmailer:
61-
transport: %mailer_transport%
62-
host: %mailer_host%
63-
username: %mailer_user%
64-
password: %mailer_password%
61+
transport: "%mailer_transport%"
62+
host: "%mailer_host%"
63+
username: "%mailer_user%"
64+
password: "%mailer_password%"
6565
spool: { type: memory }

app/config/config_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ monolog:
1313
handlers:
1414
main:
1515
type: stream
16-
path: %kernel.logs_dir%/%kernel.environment%.log
16+
path: "%kernel.logs_dir%/%kernel.environment%.log"
1717
level: debug
1818
firephp:
1919
type: firephp

app/config/config_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ monolog:
2525
handler: nested
2626
nested:
2727
type: stream
28-
path: %kernel.logs_dir%/%kernel.environment%.log
28+
path: "%kernel.logs_dir%/%kernel.environment%.log"
2929
level: debug

0 commit comments

Comments
 (0)