8000 Uniformize config files and fix deprecations · symfony/symfony-standard@f63ce95 · GitHub
[go: up one dir, main page]

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

Commit f63ce95

Browse files
committed
Uniformize config files and fix deprecations
1 parent 9363777 commit f63ce95

File tree

8 files changed

+72
-72
lines changed

8 files changed

+72
-72
lines changed

app/config/config.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,71 +9,71 @@ parameters:
99
locale: en
1010

1111
framework:
12-
#esi: ~
13-
#translator: { fallbacks: ["%locale%"] }
14-
secret: "%secret%"
12+
#esi: ~
13+
#translator: { fallbacks: ['%locale%'] }
14+
secret: '%secret%'
1515
router:
16-
resource: "%kernel.root_dir%/config/routing.yml"
16+
resource: '%kernel.root_dir%/config/routing.yml'
1717
strict_requirements: ~
18-
form: ~
18+
form: ~
1919
csrf_protection: ~
20-
validation: { enable_annotations: true }
21-
#serializer: { enable_annotations: true }
20+
validation: { enable_annotations: true }
21+
#serializer: { enable_annotations: true }
2222
templating:
2323
engines: ['twig']
24-
default_locale: "%locale%"
25-
trusted_hosts: ~
24+
default_locale: '%locale%'
25+
trusted_hosts: ~
2626
trusted_proxies: ~
2727
session:
2828
# handler_id set to null will use default session handler from php.ini
29-
handler_id: ~
30-
fragments: ~
29+
handler_id: ~
30+
fragments: ~
3131
http_method_override: true
3232

3333
# Twig Configuration
3434
twig:
35-
debug: "%kernel.debug%"
36-
strict_variables: "%kernel.debug%"
35+
debug: '%kernel.debug%'
36+
strict_variables: '%kernel.debug%'
3737

3838
# Assetic Configuration
3939
assetic:
40-
debug: "%kernel.debug%"
40+
debug: '%kernel.debug%'
4141
use_controller: false
42-
bundles: [ ]
42+
bundles: []
4343
#java: /usr/bin/java
4444
filters:
4545
cssrewrite: ~
4646
#closure:
47-
# jar: "%kernel.root_dir%/Resources/java/compiler.jar"
47+
# jar: '%kernel.root_dir%/Resources/java/compiler.jar'
4848
#yui_css:
49-
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
49+
# jar: '%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar'
5050

5151
# Doctrine Configuration
5252
doctrine:
5353
dbal:
54-
driver: pdo_mysql
55-
host: "%database_host%"
56-
port: "%database_port%"
57-
dbname: "%database_name%"
58-
user: "%database_user%"
59-
password: "%database_password%"
60-
charset: UTF8
54+
driver: pdo_mysql
55+
host: '%database_host%'
56+
port: '%database_port%'
57+
dbname: '%database_name%'
58+
user: '%database_user%'
59+
password: '%database_password%'
60+
charset: UTF8
6161
# if using pdo_sqlite as your database driver:
6262
# 1. add the path in parameters.yml
63-
# e.g. database_path: "%kernel.root_dir%/data/data.db3"
63+
# e.g. database_path: '%kernel.root_dir%/data/data.db3'
6464
# 2. Uncomment database_path in parameters.yml.dist
6565
# 3. Uncomment next line:
66-
#path: "%database_path%"
66+
#path: '%database_path%'
6767

6868
orm:
69-
auto_generate_proxy_classes: "%kernel.debug%"
69+
auto_generate_proxy_classes: '%kernel.debug%'
7070
naming_strategy: doctrine.orm.naming_strategy.underscore
7171
auto_mapping: true
7272

7373
# Swiftmailer Configuration
7474
swiftmailer:
75-
transport: "%mailer_transport%"
76-
host: "%mailer_host%"
77-
username: "%mailer_user%"
78-
password: "%mailer_password%"
79-
spool: { type: memory }
75+
transport: '%mailer_transport%'
76+
host: '%mailer_host%'
77+
username: '%mailer_user%'
78+
password: '%mailer_password%'
79+
spool: { type: memory }

app/config/config_dev.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ imports:
33

44
framework:
55
router:
6-
resource: "%kernel.root_dir%/config/routing_dev.yml"
6+
resource: '%kernel.root_dir%/config/routing_dev.yml'
77
strict_requirements: true
88
profiler: { only_exceptions: false }
99

@@ -15,20 +15,20 @@ monolog:
1515
handlers:
1616
main:
1717
type: stream
18-
path: "%kernel.logs_dir%/%kernel.environment%.log"
18+
path: '%kernel.logs_dir%/%kernel.environment%.log'
1919
level: debug
20-
channels: [!event]
20+
channels: ['!event']
2121
console:
22-
type: console
23-
channels: [!event, !doctrine]
22+
type: console
23+
channels: ['!event', '!doctrine']
2424
# uncomment to get logging in your browser
2525
# you may have to allow bigger header sizes in your Web server configuration
2626
#firephp:
27-
# type: firephp
28-
# level: info
27+
# type: firephp
28+
# level: info
2929
#chromephp:
30-
# type: chromephp
31-
# level: info
30+
# type: chromephp
31+
# level: info
3232

3333
assetic:
3434
use_controller: true

app/config/config_prod.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ imports:
1616
monolog:
1717
handlers:
1818
main:
19-
type: fingers_crossed
19+
type: fingers_crossed
2020
action_level: error
21-
handler: nested
21+
handler: nested
2222
nested:
23-
type: stream
24-
path: "%kernel.logs_dir%/%kernel.environment%.log"
23+
type: stream
24+
path: '%kernel.logs_dir%/%kernel.environment%.log'
2525
level: debug
2626
console:
27-
type: console
27+
type: console

app/config/parameters.yml.dist

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
33
# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
44
parameters:
5-
database_host: 127.0.0.1
6-
database_port: ~
7-
database_name: symfony
8-
database_user: root
5+
database_host: 127.0.0.1
6+
database_port: ~
7+
database_name: symfony
8+
database_user: root
99
database_password: ~
1010
# You should uncomment this if you want to use pdo_sqlite
11-
# database_path: "%kernel.root_dir%/data.db3"
11+
#database_path: "%kernel.root_dir%/data.db3"
1212

13-
mailer_transport: smtp
14-
mailer_host: 127.0.0.1
15-
mailer_user: ~
16-
mailer_password: ~
13+
mailer_transport: smtp
14+
mailer_host: 127.0.0.1
15+
mailer_user: ~
16+
mailer_password: ~
1717

1818
# A secret key that's used to generate certain security-related tokens
19-
secret: ThisTokenIsNotSoSecretChangeIt
19+
secret: ThisTokenIsNotSoSecretChangeIt

app/config/routing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
app:
2-
resource: "@AppBundle/Controller/"
3-
type: annotation
2+
resource: '@AppBundle/Controller/'
3+
type: annotation

app/config/routing_dev.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
_wdt:
2-
resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
3-
prefix: /_wdt
2+
resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
3+
prefix: /_wdt
44

55
_profiler:
6-
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
7-
prefix: /_profiler
6+
resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
7+
prefix: /_profiler
88

99
_configurator:
10-
resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
11-
prefix: /_configurator
10+
resource: '@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml'
11+
prefix: /_configurator
1212

1313
_errors:
14-
resource: "@TwigBundle/Resources/config/routing/errors.xml"
15-
prefix: /_error
14+
resource: '@TwigBundle/Resources/config/routing/errors.xml'
15+
prefix: /_error
1616

1717
_main:
1818
resource: routing.yml

app/config/security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ security:
1717
anonymous: ~
1818
# activate different ways to authenticate
1919

20-
# http_basic: ~
2120
# http://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
21+
#http_basic: ~
2222

23-
# form_login: ~
2423
# http://symfony.com/doc/current/cookbook/security/form_login_setup.html
24+
#form_login: ~

app/config/services.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Learn more about services, parameters and containers at
22
# http://symfony.com/doc/current/service_container.html
33
parameters:
4-
# parameter_name: value
4+
#parameter_name: value
55

66
services:
7-
# service_name:
8-
# class: AppBundle\Directory\ClassName
9-
# arguments: ["@another_service_name", "plain_value", "%parameter_name%"]
7+
#service_name:
8+
# class: AppBundle\Directory\ClassName
9+
# arguments: ['@another_service_name', 'plain_value', '%parameter_name%']

0 commit comments

Comments
 (0)
0