symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+7Lines changed: 7 additions & 0 deletions
@@ -1360,7 +1360,7 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
         }
 
         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,15 +44,15 @@ public function get(string $name)
                     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)) {
                 throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
             }
 
             $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 @@ public function testDefaultToNullAllowed()
         $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)'));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -1360,7 +1360,7 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`	`1362`	`if ($config['decryption_env_var']) {`
`1363`		`- if (!preg_match('/^(?:\w+:)+\w++$/', $config['decryption_env_var'])) {`
	`1363`	`+ if (!preg_match('/^(?:[-.\w]+:)+\w++$/', $config['decryption_env_var'])) {`
`1364`	`1364`	`throw new InvalidArgumentException(sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));`
`1365`	`1365`	`}`
`1366`	`1366`
Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,15 @@ public function get(string $name)`
`44`	`44`	`return $placeholder; // return first result`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`- if (!preg_match('/^(?:\w+:)+\w++$/', $env)) {`
	`47`	`+ if (!preg_match('/^(?:[-.\w]+:)+\w++$/', $env)) {`
`48`	`48`	`throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));`
`49`	`49`	`}`
`50`	`50`	`if ($this->has($name) && null !== ($defaultValue = parent::get($name)) && !\is_string($defaultValue)) {`
`51`	`51`	`throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$uniqueName = md5($name.'_'.self::$counter++);`
`55`		`- $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), str_replace(':', '_', $env), $uniqueName);`
	`55`	`+ $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);`
`56`	`56`	`$this->envPlaceholders[$env][$placeholder] = $placeholder;`
`57`	`57`
`58`	`58`	`return $placeholder;`
Original file line number	Diff line number	Diff line change
`@@ -187,4 +187,11 @@ public function testDefaultToNullAllowed()`
`187`	`187`	`$bag->resolve();`
`188`	`188`	`$this->assertNotNull($bag->get('env(default::BAR)'));`
`189`	`189`	`}`
	`190`	`+`
	`191`	`+ public function testExtraCharsInProcessor()`
	`192`	`+ {`
	`193`	`+ $bag = new EnvPlaceholderParameterBag();`
	`194`	`+ $bag->resolve();`
	`195`	`+ $this->assertStringMatchesFormat('env_%s_key_a_b_c_FOO_%s', $bag->get('env(key:a.b-c:FOO)'));`
	`196`	`+ }`
`190`	`197`	`}`