[DI] allow "." and "-" in env processor lines
This commit is contained in:
parent
9960f3032a
commit
231c505a47
@ -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']));
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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)'));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user