Skip to content

Commit b4e2d16

Browse files
committed
Use DSN-like strings to define credentials
1 parent c8a7c6c commit b4e2d16

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

app/config/config.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ doctrine:
6262
dbal:
6363
# if you don't want to use SQLite, change the URL in parameters.yml or set the DATABASE_URL environment variable
6464
url: '%env(DATABASE_URL)%'
65-
66-
# instead of using a URL, you may also uncomment the following lines to configure your database
67-
# driver: pdo_mysql
68-
# host: '%database_host%'
69-
# port: '%database_port%'
70-
# dbname: '%database_name%'
71-
# user: '%database_user%'
72-
# password: '%database_password%'
73-
# charset: UTF8
74-
7565
orm:
7666
auto_generate_proxy_classes: '%kernel.debug%'
7767
auto_mapping: true
@@ -83,8 +73,5 @@ doctrine:
8373
# stores options that change from one server to another
8474
#
8575
swiftmailer:
86-
transport: '%mailer_transport%'
87-
host: '%mailer_host%'
88-
username: '%mailer_user%'
89-
password: '%mailer_password%'
90-
spool: { type: memory }
76+
url : '%env(MAILER_URL)%'
77+
spool: { type: memory }

app/config/config_test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ web_profiler:
1515
# swiftmailer:
1616
# disable_delivery: true
1717

18-
# It's recommended to use a separate database for tests. This allows to have a
19-
# fixed and known set of data fixtures, it simplifies the code of tests and it
20-
# makes them more robust.
21-
# In this case we just need to define a different path for the application database.
22-
doctrine:
23-
dbal:
24-
path: "%kernel.project_dir%/var/data/blog_test.sqlite"
25-
2618
# this configuration simplifies testing URLs protected by the security mechanism
2719
# See https://symfony.com/doc/current/cookbook/testing/http_authentication.html
2820
security:

app/config/parameters.yml.dist

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,4 @@ parameters:
3333

3434
# If you don't use a real mail server, you can send emails via your Gmail account.
3535
# see https://symfony.com/doc/current/cookbook/email/gmail.html
36-
mailer_transport: smtp
37-
mailer_host: 127.0.0.1
38-
mailer_user: ~
39-
mailer_password: ~
36+
env(MAILER_URL): 'smtp://localhost:25?encryption=&auth_mode='

phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<php>
1111
<ini name="error_reporting" value="-1" />
1212
<server name="KERNEL_DIR" value="app/" />
13+
<env name="DATABASE_URL" value="sqlite:///var/data/blog_test.sqlite"/>
1314
</php>
1415

1516
<testsuites>

0 commit comments

Comments
 (0)