Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9c9fb8e

Browse filesBrowse files
roverwolfroverwolf
committed
refactor: deprecate special SYMFONY__ environment vars
The special SYMFONY__ environment variables have been deprecated in Symfony 3.3 (and will be removed in 4.0) as there is now support for runtime environment variables in Symfony. This commit allows for different environment variables to be used as the first step in removing the old variables. A later step should remove the `parameters.yml` file entirely and have the configuration be solely from passed environment variables (or .env file for development). ref: [Deprecation blog post](https://symfony.com/blog/new-in-symfony-3-3-deprecated-the-special-symfony-environment-variables) ref: symfony/symfony#21889
1 parent 94bb18d commit 9c9fb8e
Copy full SHA for 9c9fb8e

File tree

Expand file treeCollapse file tree

6 files changed

+44
-40
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+44
-40
lines changed

‎app/config/config.yml

Copy file name to clipboardExpand all lines: app/config/config.yml
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ imports:
1717
# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
1818
parameters:
1919
locale: en
20+
database_host: '%env(MYSQL_HOST)%'
21+
database_port: '%env(MYSQL_PORT)%'
22+
database_name: '%env(MYSQL_DATABASE)%'
23+
database_user: '%env(MYSQL_USER)%'
24+
database_password: '%env(MYSQL_PASSWORD)%'
25+
mailer_transport: '%env(MAILER_TRANSPORT)%'
26+
mailer_host: '%env(MAILER_HOST)%'
27+
mailer_user: '%env(MAILER_USER)%'
28+
mailer_password: '%env(MAILER_PASSWORD)%'
29+
secret: '%env(SECRET)%'
30+
cookie_secret: '%env(COOKIE_SECRET)%'
31+
local_uri_host: '%env(LOCAL_URI_HOST)%'
2032
github_client_id: '%env(GITHUB_CLIENT_ID)%'
2133
github_client_secret: '%env(GITHUB_CLIENT_SECRET)%'
2234
brand_logo_url: '%env(BRAND_LOGO_URL)%'

‎app/config/parameters.yml.dist

Copy file name to clipboardExpand all lines: app/config/parameters.yml.dist
+19-12Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,29 @@
44
parameters:
55
locale: en
66

7-
database_host: '%mysql.host%'
8-
database_port: 3306
9-
database_name: '%mysql.database%'
10-
database_user: '%mysql.user%'
11-
database_password: '%mysql.password%'
7+
# The SYMFONY__ environment variables are deprecated
8+
env(SYMFONY__MYSQL__HOST): ~
9+
env(SYMFONY__MYSQL__DATABASE): ~
10+
env(SYMFONY__MYSQL__USER): ~
11+
env(SYMFONY__MYSQL__PASSWORD): ~
1212

13-
mailer_transport: smtp
14-
mailer_host: 127.0.0.1
15-
mailer_user: ~
16-
mailer_password: ~
13+
env(MYSQL_HOST): '%env(SYMFONY__MYSQL__HOST)%'
14+
env(MYSQL_PORT): 3306
15+
env(MYSQL_DATABASE): '%env(SYMFONY__MYSQL__DATABASE)%'
16+
env(MYSQL_USER): '%env(SYMFONY__MYSQL__USER)%'
17+
env(MYSQL_PASSWORD): '%env(SYMFONY__MYSQL__PASSWORD)%'
18+
19+
env(MAILER_TRANSPORT): smtp
20+
env(MAILER_HOST): 127.0.0.1
21+
env(MAILER_USER): ~
22+
env(MAILER_PASSWORD): ~
1723

1824
# A secret key that's used to generate certain security-related tokens
19-
secret: ThisTokenIsNotSoSecretSoChangeIt
20-
cookie_secret: ThisTokenIsNotSoSecretChangeIt
25+
env(SECRET): ThisTokenIsNotSoSecretSoChangeIt
26+
env(COOKIE_SECRET): ThisTokenIsNotSoSecretChangeIt
27+
28+
env(LOCAL_URI_HOST): 'http://127.0.0.1:3000/'
2129

22-
local_uri_host: http://localhost:3000/
2330
env(GITHUB_CLIENT_ID): ~
2431
env(GITHUB_CLIENT_SECRET): ~
2532

‎app/config/parameters.yml.no-env

Copy file name to clipboardExpand all lines: app/config/parameters.yml.no-env
+13-12Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
parameters:
55
locale: en
66

7-
database_host: 127.0.0.1
8-
database_port: 3306
9-
database_name: symfony
10-
database_user: root
11-
database_password: ~
7+
env(MYSQL_HOST): '127.0.0.1'
8+
env(MYSQL_PORT): 3306
9+
env(MYSQL_DATABASE): 'symfony'
10+
env(MYSQL_USER): 'root'
11+
env(MYSQL_PASSWORD): ~
1212

13-
mailer_transport: smtp
14-
mailer_host: 127.0.0.1
15-
mailer_user: ~
16-
mailer_password: ~
13+
env(MAILER_TRANSPORT): smtp
14+
env(MAILER_HOST): 127.0.0.1
15+
env(MAILER_USER): ~
16+
env(MAILER_PASSWORD): ~
1717

1818
# A secret key that's used to generate certain security-related tokens
19-
secret: ThisTokenIsNotSoSecretSoChangeIt
20-
cookie_secret: ThisTokenIsNotSoSecretChangeIt
19+
env(SECRET): ThisTokenIsNotSoSecretSoChangeIt
20+
env(COOKIE_SECRET): ThisTokenIsNotSoSecretChangeIt
21+
22+
env(LOCAL_URI_HOST): 'http://127.0.0.1:3000/'
2123

22-
local_uri_host: http://localhost:3000/
2324
env(GITHUB_CLIENT_ID): ~
2425
env(GITHUB_CLIENT_SECRET): ~
2526

‎docker/docker-compose.dev.yml

Copy file name to clipboardExpand all lines: docker/docker-compose.dev.yml
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ services:
88
depends_on:
99
- db
1010
environment:
11-
SYMFONY__MYSQL__DATABASE: "${MYSQL_DATABASE}"
12-
SYMFONY__MYSQL__USER: "${MYSQL_USER}"
13-
SYMFONY__MYSQL__PASSWORD: "${MYSQL_PASSWORD}"
14-
SYMFONY__MYSQL__HOST: "${MYSQL_HOST:-db}"
1511
MYSQL_DATABASE:
1612
MYSQL_USER:
1713
MYSQL_PASSWORD:

‎docker/docker-compose.test.yml

Copy file name to clipboardExpand all lines: docker/docker-compose.test.yml
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ services:
88
depends_on:
99
- db
1010
environment:
11-
SYMFONY__MYSQL__DATABASE: "${MYSQL_DATABASE}"
12-
SYMFONY__MYSQL__USER: "${MYSQL_USER}"
13-
SYMFONY__MYSQL__PASSWORD: "${MYSQL_PASSWORD}"
14-
SYMFONY__MYSQL__HOST: "${MYSQL_HOST:-db}"
1511
MYSQL_DATABASE:
1612
MYSQL_USER:
1713
MYSQL_PASSWORD:

‎docker/docker-compose.tools.yml

Copy file name to clipboardExpand all lines: docker/docker-compose.tools.yml
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ services:
88
# context: ./php
99
image: opensalt/php:7.1-cli
1010
environment:
11-
SYMFONY__MYSQL__DATABASE: "${MYSQL_DATABASE}"
12-
SYMFONY__MYSQL__USER: "${MYSQL_USER}"
13-
SYMFONY__MYSQL__PASSWORD: "${MYSQL_PASSWORD}"
14-
SYMFONY__MYSQL__HOST: "${MYSQL_HOST:-db}"
1511
MYSQL_DATABASE:
1612
MYSQL_USER:
1713
MYSQL_PASSWORD:
@@ -27,10 +23,6 @@ services:
2723
# context: ./composer
2824
image: opensalt/composer:1.4-7.1
2925
environment:
30-
SYMFONY__MYSQL__DATABASE: "${MYSQL_DATABASE}"
31-
SYMFONY__MYSQL__USER: "${MYSQL_USER}"
32-
SYMFONY__MYSQL__PASSWORD: "${MYSQL_PASSWORD}"
33-
SYMFONY__MYSQL__HOST: "${MYSQL_HOST:-db}"
3426
MYSQL_DATABASE:
3527
MYSQL_USER:
3628
MYSQL_PASSWORD:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.