Skip to content

Commit f001a11

Browse files
committed
refactor: 💡 improve symfony config
1 parent 43091a7 commit f001a11

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

config/esaba.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ parameters:
2626
env(PHP_ESABA_ENABLE_INDEXING): '%env(key:ESABA_ENABLE_INDEXING:json:ESABA_CONFIG)%'
2727

2828
# actual configs
29-
env(FINAL_ESA_TEAM_NAME): '%env(default:dotenv.ESA_TEAM_NAME:PHP_ESA_TEAM_NAME)%'
30-
env(FINAL_ESA_ACCESS_TOKEN): '%env(default:dotenv.ESA_ACCESS_TOKEN:PHP_ESA_ACCESS_TOKEN)%'
31-
env(FINAL_ESA_WEBHOOK_SECRET): '%env(default:dotenv.ESA_WEBHOOK_SECRET:PHP_ESA_WEBHOOK_SECRET)%'
32-
env(FINAL_ESABA_PUBLIC_CATEGORIES): '%env(default:dotenv.ESABA_PUBLIC_CATEGORIES:PHP_ESABA_PUBLIC_CATEGORIES)%'
33-
env(FINAL_ESABA_PUBLIC_TAGS): '%env(default:dotenv.ESABA_PUBLIC_TAGS:PHP_ESABA_PUBLIC_TAGS)%'
34-
env(FINAL_ESABA_PRIVATE_CATEGORIES): '%env(default:dotenv.ESABA_PRIVATE_CATEGORIES:PHP_ESABA_PRIVATE_CATEGORIES)%'
35-
env(FINAL_ESABA_PRIVATE_TAGS): '%env(default:dotenv.ESABA_PRIVATE_TAGS:PHP_ESABA_PRIVATE_TAGS)%'
36-
env(FINAL_ESABA_HTML_REPLACEMENTS): '%env(default:dotenv.ESABA_HTML_REPLACEMENTS:PHP_ESABA_HTML_REPLACEMENTS)%'
37-
env(FINAL_ESABA_USER_ASSETS): '%env(default:dotenv.ESABA_USER_ASSETS:PHP_ESABA_USER_ASSETS)%'
38-
env(FINAL_ESABA_ENABLE_INDEXING): '%env(default:dotenv.ESABA_ENABLE_INDEXING:PHP_ESABA_ENABLE_INDEXING)%'
29+
esa_team_name: '%env(string:default:dotenv.ESA_TEAM_NAME:PHP_ESA_TEAM_NAME)%'
30+
esa_access_token: '%env(string:default:dotenv.ESA_ACCESS_TOKEN:PHP_ESA_ACCESS_TOKEN)%'
31+
esa_webhook_secret: '%env(string:default:dotenv.ESA_WEBHOOK_SECRET:PHP_ESA_WEBHOOK_SECRET)%'
32+
esaba_public_categories: '%env(json:default:dotenv.ESABA_PUBLIC_CATEGORIES:PHP_ESABA_PUBLIC_CATEGORIES)%'
33+
esaba_public_tags: '%env(json:default:dotenv.ESABA_PUBLIC_TAGS:PHP_ESABA_PUBLIC_TAGS)%'
34+
esaba_private_categories: '%env(json:default:dotenv.ESABA_PRIVATE_CATEGORIES:PHP_ESABA_PRIVATE_CATEGORIES)%'
35+
esaba_private_tags: '%env(json:default:dotenv.ESABA_PRIVATE_TAGS:PHP_ESABA_PRIVATE_TAGS)%'
36+
esaba_html_replacements: '%env(json:default:dotenv.ESABA_HTML_REPLACEMENTS:PHP_ESABA_HTML_REPLACEMENTS)%'
37+
esaba_user_assets: '%env(json:default:dotenv.ESABA_USER_ASSETS:PHP_ESABA_USER_ASSETS)%'
38+
esaba_enable_indexing: '%env(bool:default:dotenv.ESABA_ENABLE_INDEXING:PHP_ESABA_ENABLE_INDEXING)%'

config/packages/twig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ twig:
44
- 'form_theme/bootstrap_4_layout.html.twig'
55
- 'form_theme/bootstrap_4_horizontal_layout.html.twig' # to be the default theme
66
globals:
7-
enable_indexing: '%env(bool:FINAL_ESABA_ENABLE_INDEXING)%'
7+
enable_indexing: '%esaba_enable_indexing%'
88

99
when@test:
1010
twig:

config/services.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ services:
1515
autowire: true # Automatically injects dependencies in your services.
1616
autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
1717
bind:
18-
string $teamName: '%env(string:FINAL_ESA_TEAM_NAME)%'
19-
array $htmlReplacements: '%env(json:FINAL_ESABA_HTML_REPLACEMENTS)%'
18+
string $teamName: '%esa_team_name%'
19+
array $htmlReplacements: '%esaba_html_replacements%'
2020

2121
# makes classes in src/ available to be used as services
2222
# this creates a service per class whose id is the fully-qualified class name
@@ -41,20 +41,20 @@ services:
4141
Polidog\Esa\Api:
4242
factory: [Polidog\Esa\Api, factory]
4343
arguments:
44-
- '%env(string:FINAL_ESA_ACCESS_TOKEN)%'
45-
- '%env(string:FINAL_ESA_TEAM_NAME)%'
44+
- '%esa_access_token%'
45+
- '%esa_team_name%'
4646

4747
App\Esa\WebhookValidator:
4848
arguments:
49-
- '%env(string:FINAL_ESA_WEBHOOK_SECRET)%'
49+
- '%esa_webhook_secret%'
5050

5151
App\Service\AccessController:
5252
arguments:
53-
- '%env(json:FINAL_ESABA_PUBLIC_CATEGORIES)%'
54-
- '%env(json:FINAL_ESABA_PUBLIC_TAGS)%'
55-
- '%env(json:FINAL_ESABA_PRIVATE_CATEGORIES)%'
56-
- '%env(json:FINAL_ESABA_PRIVATE_TAGS)%'
53+
- '%esaba_public_categories%'
54+
- '%esaba_public_tags%'
55+
- '%esaba_private_categories%'
56+
- '%esaba_private_tags%'
5757

5858
App\Service\AssetResolver:
5959
arguments:
60-
- '%env(json:FINAL_ESABA_USER_ASSETS)%'
60+
- '%esaba_user_assets%'

0 commit comments

Comments
 (0)