diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] allow "." and "-" in env processor lines

Browse Source
This commit is contained in:
Nicolas Grekas 2019-12-18 17:27:44 +01:00
parent 9960f3032a
commit 231c505a47
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1360,7 +1360,7 @@ class FrameworkExtension extends Extension
}
if ($config['decryption_env_var']) {
if (!preg_match('/^(?:\w*+:)*+\w++$/', $config['decryption_env_var'])) {
if (!preg_match('/^(?:[-.\w]*+:)*+\w++$/', $config['decryption_env_var'])) {
throw new InvalidArgumentException(sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
}

4
src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
View File

@ -44,7 +44,7 @@ class EnvPlaceholderParameterBag extends ParameterBag
return $placeholder; // return first result
}
}
if (!preg_match('/^(?:\w*+:)*+\w++$/', $env)) {
if (!preg_match('/^(?:[-.\w]*+:)*+\w++$/', $env)) {
throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
}
if ($this->has($name) && null !== ($defaultValue = parent::get($name)) && !\is_string($defaultValue)) {
@ -52,7 +52,7 @@ class EnvPlaceholderParameterBag extends ParameterBag
}
$uniqueName = md5($name.'_'.self::$counter++);
$placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), str_replace(':', '_', $env), $uniqueName);
$placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);
$this->envPlaceholders[$env][$placeholder] = $placeholder;
return $placeholder;

7
src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
View File

@ -187,4 +187,11 @@ class EnvPlaceholderParameterBagTest extends TestCase
$bag->resolve();
$this->assertNotNull($bag->get('env(default::BAR)'));
}
public function testExtraCharsInProcessor()
{
$bag = new EnvPlaceholderParameterBag();
$bag->resolve();
$this->assertStringMatchesFormat('env_%s_key_a_b_c_FOO_%s', $bag->get('env(key:a.b-c:FOO)'));
}
}