8000 [DependencyInjection] Fix loading all env vars from secrets when only… · symfony/symfony@30cbd66 · GitHub
[go: up one dir, main page]
Skip to content

Commit 30cbd66

Browse files
nicolas-grekasnicolas-grekas
committed
[DependencyInjection] Fix loading all env vars from secrets when only a subset is needed
1 parent 0294563 commit 30cbd66

File tree

5 files changed

+33
-7
lines changed

5 files changed

+33
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Secrets;
1313

1414
use Symfony\Component\DependencyInjection\EnvVarLoaderInterface;
15+
use Symfony\Component\String\LazyString;
1516
use Symfony\Component\VarExporter\VarExporter;
1617

1718
/**
@@ -169,7 +170,14 @@ public function list(bool $reveal = false): array
169170

170171
public function loadEnvVars(): array
171172
{
172-
return $this->list(true);
173+
$envs = [];
174+
$reveal = $this->reveal(...);
175+
176+
foreach ($this->list() as $name => $value) {
177+
$envs[$name] = LazyString::fromCallable($reveal, $name);
178+
}
179+
180+
return $envs;
173181
}
174182

175183
private function loadKeys(): void

‎src/Symfony/Component/DependencyInjection/EnvVarLoaderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
interface EnvVarLoaderInterface
2020
{
2121
/**
22-
* @return string[] Key/value pairs that can be accessed using the regular "%env()%" syntax
22+
* @return array<string|\Stringable> Key/value pairs that can be accessed using the regular "%env()%" syntax
2323
*/
2424
public function loadEnvVars(): array;
2525
}

‎src/Symfony/Component/DependencyInjection/EnvVarProcessor.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,16 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
164164
if (false !== $i || 'string' !== $prefix) {
165165
$env = $getEnv($name);
166166
} elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))
167-
|| (false !== $env && false === ($env = $env ?? getenv($name) ?? false)) // null is a possible value because of thread safety issues
167+
|| (f 8000 alse !== $env && false === $env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues
168168
) {
169-
foreach ($this->loadedVars as $vars) {
170-
if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
169+
foreach ($this->loadedVars as $i => $vars) {
170+
if (false === $env = $vars[$name] ?? $env) {
171+
continue;
172+
}
173+
if ($env instanceof \Stringable) {
174+
$this->loadedVars[$i][$name] = $env = (string) $env;
175+
}
176+
if ('' !== $env) {
171177
break;
172178
}
173179
}
@@ -185,7 +191,13 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
185191
continue;
186192
}
187193
$this->loadedVars[] = $vars = $loader->loadEnvVars();
188-
if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
194+
if (false === $env = $vars[$name] ?? $env) {
195+
continue;
196+
}
197+
if ($env instanceof \Stringable) {
198+
$this->loadedVars[array_key_last($this->loadedVars)][$name] = $env = (string) $env;
199+
}
200+
if ('' !== $env) {
189201
$ended = false;
190202
break;
191203
}

‎src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
2323
use Symfony\Component\DependencyInjection\Tests\Fixtures\IntBackedEnum;
2424
use Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum;
25+
use Symfony\Component\String\LazyString;
2526

2627
class EnvVarProcessorTest extends TestCase
2728
{
@@ -808,6 +809,7 @@ public function loadEnvVars(): array
808809
return [
809810
'FOO_ENV_LOADER' => '123',
810811
'BAZ_ENV_LOADER' => '',
812+
'LAZY_ENV_LOADER' => LazyString::fromStringable(''),
811813
];
812814
}
813815
};
@@ -819,6 +821,7 @@ public function loadEnvVars(): array
819821
'FOO_ENV_LOADER' => '234',
820822
'BAR_ENV_LOADER' => '456',
821823
'BAZ_ENV_LOADER' => '567',
824+
'LAZY_ENV_LOADER' => LazyString::fromStringable('678'),
822825
];
823826
}
824827
};
@@ -841,6 +844,9 @@ public function loadEnvVars(): array
841844
$result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
842845
$this->assertSame('123', $result); // check twice
843846

847+
$result = $processor->getEnv('string', 'LAZY_ENV_LOADER', function () {});
848+
$this->assertSame('678', $result);
849+
844850
unset($_ENV['BAZ_ENV_LOADER']);
845851
unset($_ENV['BUZ_ENV_LOADER']);
846852
}

‎src/Symfony/Component/String/LazyString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function fromCallable(callable|array $callback, mixed ...$argument
3939
$callback[1] ??= '__invoke';
4040
}
4141
$value = $callback(...$arguments);
42-
$callback = self::getPrettyName($callback);
42+
$callback = !\is_string($value) && !$value instanceof \Stringable ? self::getPrettyName($callback) : 'callable';
4343
$arguments = null;
4444
}
4545

0 commit comments

Comments
 (0)
0