8000 minor #37201 [FrameworkBundle] Convert config/secrets.xml to .php (Gr… · flack/symfony@7a9f9e4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7a9f9e4

Browse files
fabpotfabpot
committed
minor symfony#37201 [FrameworkBundle] Convert config/secrets.xml to .php (GromNaN)
This PR was merged into the 5.2-dev branch. Discussion ---------- [FrameworkBundle] Convert config/secrets.xml to .php | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Ref symfony#37186 | License | MIT Commits ------- 6ec9711 Convert config/secrets.xml to .php
2 parents 6d9e13e + 6ec9711 commit 7a9f9e4

File tree

3 files changed

+36
-25
lines changed

3 files changed

+36
-25
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public function load(array $configs, ContainerBuilder $container)
375375
$this->registerRouterConfiguration($config['router'], $container, $loader, $config['translator']['enabled_locales'] ?? []);
376376
$this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
377377
$this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
378-
$this->registerSecretsConfiguration($config['secrets'], $container, $loader);
378+
$this->registerSecretsConfiguration($config['secrets'], $container, $phpLoader);
379379

380380
if ($this->isConfigEnabled($container, $config['serializer'])) {
381381
if (!class_exists('Symfony\Component\Serializer\Serializer')) {
@@ -1399,7 +1399,7 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
13991399
;
14001400
}
14011401

1402-
private function registerSecretsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
1402+
private function registerSecretsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
14031403
{
14041404
if (!$this->isConfigEnabled($container, $config)) {
14051405
$container->removeDefinition('console.command.secrets_set');
@@ -1412,7 +1412,7 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
14121412
return;
14131413
}
14141414

1415-
$loader->load('secrets.xml');
1415+
$loader->load('secrets.php');
14161416

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

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
13+
14+
use Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault;
15+
use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;
16+
17+
return static function (ContainerConfigurator $container) {
18+
$container->services()
19+
->set('secrets.vault', SodiumVault::class)
20+
->args([
21+
abstract_arg('Secret dir, set in FrameworkExtension'),
22+
service('secrets.decryption_key')->ignoreOnInvalid(),
23+
])
24+
->tag('container.env_var_loader')
25+
26+
->set('secrets.decryption_key')
27+
->parent('container.env')
28+
->args([abstract_arg('Decryption env var, set in FrameworkExtension')])
29+
30+
->set('secrets.local_vault', DotenvVault::class)
31+
->args([[abstract_arg('.env file path, set in FrameworkExtension')]])
32+
;
33+
};

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0