8000 [FrameworkBundle][Secrets] Hook configured local dotenv file · symfony/symfony@56f542c · GitHub
[go: up one dir, main page]
Skip to content

Commit 56f542c

Browse files
fancywebnicolas-grekas
fancyweb
authored and
nicolas-grekas
committed
[FrameworkBundle][Secrets] Hook configured local dotenv file
1 parent 25494fa commit 56f542c

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private function addSecretsSection(ArrayNodeDefinition $rootNode)
129129
->canBeDisabled()
130130
->children()
131131
->scalarNode('vault_directory')->defaultValue('%kernel.project_dir%/config/secrets/%kernel.environment%')->cannotBeEmpty()->end()
132-
->scalarNode('local_dotenv_file')->defaultValue('%kernel.project_dir%/.env.local')->end()
132+
->scalarNode('local_dotenv_file')->defaultValue('%kernel.project_dir%/.env.%kernel.environment%.local')->end()
133133
->scalarNode('decryption_env_var')->defaultValue('base64:default::SYMFONY_DECRYPTION_SECRET')->end()
134134
->end()
135135
->end()

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,9 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
14781478

14791479
$container->getDefinition('secrets.vault')->replaceArgument(0, $config['vault_directory']);
14801480

1481-
if (!$config['local_dotenv_file']) {
1481+
if ($config['local_dotenv_file']) {
1482+
$container->getDefinition('secrets.local_vault')->replaceArgument(0, $config['local_dotenv_file']);
1483+
} else {
14821484
$container->removeDefinition('secrets.local_vault');
14831485
}
14841486

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/secrets.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<services>
88
<service id="secrets.vault" class="Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault">
99
<tag name="container.env_var_loader" />
10-
<argument>%kernel.project_dir%/config/secrets/%kernel.environment%</argument>
11-
<argument>%env(base64:default::SYMFONY_DECRYPTION_SECRET)%</argument>
10+
<argument />
11+
<argument />
1212
</service>
1313

1414
<service id="secrets.local_vault" class="Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault">
15-
<argument>%kernel.project_dir%/.env.local</argument>
15+
<argument />
1616
</service>
1717
</services>
1818
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
519519
'secrets' => [
520520
'enabled' => true,
521521
'vault_directory' => '%kernel.project_dir%/config/secrets/%kernel.environment%',
522-
'local_dotenv_file' => '%kernel.project_dir%/.env.local',
522+
'local_dotenv_file' => '%kernel.project_dir%/.env.%kernel.environment%.local',
523523
'decryption_env_var' => 'base64:default::SYMFONY_DECRYPTION_SECRET',
524524
],
525525
];

0 commit comments

Comments
 (0)
0