[DI] Unknown env prefix not regornized as such
This commit is contained in:
parent
a59ce75722
commit
550819a655
@ -126,9 +126,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (false !== $i || 'string' !== $prefix) {
|
if (false !== $i || 'string' !== $prefix) {
|
||||||
if (null === $env = $getEnv($name)) {
|
$env = $getEnv($name);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
} elseif (isset($_ENV[$name])) {
|
} elseif (isset($_ENV[$name])) {
|
||||||
$env = $_ENV[$name];
|
$env = $_ENV[$name];
|
||||||
} elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
|
} elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
|
||||||
@ -173,12 +171,18 @@ class EnvVarProcessor implements EnvVarProcessorInterface
|
|||||||
throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
|
throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null === $env = $this->container->getParameter("env($name)")) {
|
$env = $this->container->getParameter("env($name)");
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (null === $env) {
|
||||||
|
if (!isset($this->getProvidedTypes()[$prefix])) {
|
||||||
|
throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_scalar($env)) {
|
if (!is_scalar($env)) {
|
||||||
throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to %s.', $name, $prefix));
|
throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to %s.', $name, $prefix));
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
|
|||||||
use Symfony\Component\DependencyInjection\EnvVarLoaderInterface;
|
use Symfony\Component\DependencyInjection\EnvVarLoaderInterface;
|
||||||
use Symfony\Component\DependencyInjection\EnvVarProcessor;
|
use Symfony\Component\DependencyInjection\EnvVarProcessor;
|
||||||
use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
|
use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
|
||||||
|
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
|
||||||
|
|
||||||
class EnvVarProcessorTest extends TestCase
|
class EnvVarProcessorTest extends TestCase
|
||||||
{
|
{
|
||||||
@ -595,4 +596,17 @@ CSV;
|
|||||||
|
|
||||||
$this->assertSame(2, $index);
|
$this->assertSame(2, $index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGetEnvInvalidPrefixWithDefault()
|
||||||
|
{
|
||||||
|
$this->expectException(RuntimeException::class);
|
||||||
|
$this->expectExceptionMessage('Unsupported env var prefix');
|
||||||
|
$processor = new EnvVarProcessor(new Container());
|
||||||
|
|
||||||
|
$processor->getEnv('unknown', 'default::FAKE', function ($name) {
|
||||||
|
$this->assertSame('default::FAKE', $name);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user