+ */
+interface EnvVarLoaderInterface
+{
+ /**
+ * @return string[] Key/value pairs that can be accessed using the regular "%env()%" syntax
+ */
+ public function loadEnvVars(): array;
+}
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index aef13a9ad1c63..6451ac9b0e9d3 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\DependencyInjection;
use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
/**
@@ -20,10 +21,17 @@
class EnvVarProcessor implements EnvVarProcessorInterface
{
private $container;
+ private $loaders;
+ private $loadedVars = [];
- public function __construct(ContainerInterface $container)
+ /**
+ * @param EnvVarLoaderInterface[] $loaders
+ */
+ public function __construct(ContainerInterface $container, \Traversable $loaders = null)
{
$this->container = $container;
+ $this->loaders = new \IteratorIterator($loaders ?? new \ArrayIterator());
+ $this->loaders = $this->loaders->getInnerIterator();
}
/**
@@ -127,12 +135,31 @@ public function getEnv($prefix, $name, \Closure $getEnv)
} elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
$env = $_SERVER[$name];
} elseif (false === ($env = getenv($name)) || null === $env) { // null is a possible value because of thread safety issues
- if (!$this->container->hasParameter("env($name)")) {
- throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
+ foreach ($this->loadedVars as $vars) {
+ if (false !== $env = ($vars[$name] ?? false)) {
+ break;
+ }
}
- if (null === $env = $this->container->getParameter("env($name)")) {
- return null;
+ try {
+ while ((false === $env || null === $env) && $this->loaders->valid()) {
+ $loader = $this->loaders->current();
+ $this->loaders->next();
+ $this->loadedVars[] = $vars = $loader->loadEnvVars();
+ $env = $vars[$name] ?? false;
+ }
+ } catch (ParameterCircularReferenceException $e) {
+ // skip loaders that need an env var that is not defined
+ }
+
+ if (false === $env || null === $env) {
+ if (!$this->container->hasParameter("env($name)")) {
+ throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
+ }
+
+ if (null === $env = $this->container->getParameter("env($name)")) {
+ return null;
+ }
}
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index 12d852f4535c4..9970eb474f6be 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -5,6 +5,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\EnvVarLoaderInterface;
use Symfony\Component\DependencyInjection\EnvVarProcessor;
class EnvVarProcessorTest extends TestCase
@@ -517,4 +518,39 @@ public function validCsv()
[null, null],
];
}
+
+ public function testEnvLoader()
+ {
+ $loaders = function () {
+ yield new class() implements EnvVarLoaderInterface {
+ public function loadEnvVars(): array
+ {
+ return [
+ 'FOO_ENV_LOADER' => '123',
+ ];
+ }
+ };
+
+ yield new class() implements EnvVarLoaderInterface {
+ public function loadEnvVars(): array
+ {
+ return [
+ 'FOO_ENV_LOADER' => '234',
+ 'BAR_ENV_LOADER' => '456',
+ ];
+ }
+ };
+ };
+
+ $processor = new EnvVarProcessor(new Container(), $loaders());
+
+ $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
+ $this->assertSame('123', $result);
+
+ $result = $processor->getEnv('string', 'BAR_ENV_LOADER', function () {});
+ $this->assertSame('456', $result);
+
+ $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
+ $this->assertSame('123', $result); // check twice
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy