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

Commit d0e73ff

Browse files
committed
merged branch isleshocky77/yaml-validation (PR #429)
This PR was merged into the 2.1 branch. Commits ------- 8c03340 You cannot start a Plain Style Scalar with an Indicator (%). Plain Style Scalars which have a leading % should be changed to double-quote style scalars. 9afa2c1 Correcting YAML Markup in app/config to be valid YAML 1.2o Discussion ---------- Make the app/config/*.yml files validate You cannot start a Plain Style Scalar with an Indicator (%). Play Style Scalars which have a leading % should be changed to double-quote style scalars. fixes #426 see #427
2 parents 8d24239 + 8c03340 commit d0e73ff

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

UPGRADE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ a link cannot be generated):
7777

7878
framework:
7979
router:
80-
strict_requirements: %kernel.debug%
80+
strict_requirements: "%kernel.debug%"
8181

8282
The `default_locale` parameter is now a setting of the main `framework`
8383
configuration (it was under the `framework.session` in 2.0):
8484

8585
framework:
86-
default_locale: %locale%
86+
default_locale: "%locale%"
8787

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

app/config/config.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,56 @@ 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: true
1313
csrf_protection: true
1414
validation: { enable_annotations: true }
1515
templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
16-
default_locale: %locale%
16+
default_locale: "%locale%"
1717
trust_proxy_headers: false # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP)
1818
session: ~
1919

2020
# Twig Configuration
2121
twig:
22-
debug: %kernel.debug%
23-
strict_variables: %kernel.debug%
22+
debug: "%kernel.debug%"
23+
strict_variables: "%kernel.debug%"
2424

2525
# Assetic Configuration
2626
assetic:
27-
debug: %kernel.debug%
27+
debug: "%kernel.debug%"
2828
use_controller: false
2929
bundles: [ ]
3030
#java: /usr/bin/java
3131
filters:
3232
cssrewrite: ~
3333
#closure:
34-
# jar: %kernel.root_dir%/Resources/java/compiler.jar
34+
# jar: "%kernel.root_dir%/Resources/java/compiler.jar"
3535
#yui_css:
36-
# jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
36+
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
3737

3838
# Doctrine Configuration
3939
doctrine:
4040
dbal:
41-
driver: %database_driver%
42-
host: %database_host%
43-
port: %database_port%
44-
dbname: %database_name%
45-
user: %database_user%
46-
password: %database_password%
41+
driver: "%database_driver%"
42+
host: "%database_host%"
43+
port: "%database_port%"
44+
dbname: "%database_name%"
45+
user: "%database_user%"
46+
password: "%database_password%"
4747
charset: UTF8
4848

4949
orm:
50-
auto_generate_proxy_classes: %kernel.debug%
50+
auto_generate_proxy_classes: "%kernel.debug%"
5151
auto_mapping: true
5252

5353
# Swiftmailer Configuration
5454
swiftmailer:
55-
transport: %mailer_transport%
56-
host: %mailer_host%
57-
username: %mailer_user%
58-
password: %mailer_password%
55+
transport: "%mailer_transport%"
56+
host: "%mailer_host%"
57+
username: "%mailer_user%"
58+
password: "%mailer_password%"
5959
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
@@ -15,5 +15,5 @@ monolog:
1515
handler: nested
1616
nested:
1717
type: stream
18-
path: %kernel.logs_dir%/%kernel.environment%.log
18+
path: "%kernel.logs_dir%/%kernel.environment%.log"
1919
level: debug

0 commit comments

Comments
 (0)