bug #30990 Allow env processor to resolve :: (jderusse)

nicolas-grekas · nicolas-grekas · commit 408e4aa48e87 · 2019-04-07T23:36:42.000+02:00
This PR was merged into the 4.3-dev branch. Discussion ---------- Allow env processor to resolve `::` | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | N/A The env processor resolve to null when no fallback are provided. ie. `env(default::NOT_EXISTS)` Issue is that the regexp does not allow such pattern. thus made the feature unusable. Commits ------- 6b6c24c Allow env processor to resolve `::`
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -42,7 +42,7 @@ public function get($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));
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -194,4 +194,11 @@ public function testGetThrowsOnBadDefaultValue()
         $bag->get('env(ARRAY_VAR)');
         $bag->resolve();
     }
+
+    public function testDefaultToNullAllowed()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->resolve();
+        $this->assertNotNull($bag->get('env(default::BAR)'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function get($name)`
`42`	`42`	`return $placeholder; // return first result`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`- if (!preg_match('/^(?:\w++:)*+\w++$/', $env)) {`
	`45`	`+ if (!preg_match('/^(?:\w+:)+\w++$/', $env)) {`
`46`	`46`	`throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -194,4 +194,11 @@ public function testGetThrowsOnBadDefaultValue()`
`194`	`194`	`$bag->get('env(ARRAY_VAR)');`
`195`	`195`	`$bag->resolve();`
`196`	`196`	`}`
	`197`	`+`
	`198`	`+ public function testDefaultToNullAllowed()`
	`199`	`+ {`
	`200`	`+ $bag = new EnvPlaceholderParameterBag();`
	`201`	`+ $bag->resolve();`
	`202`	`+ $this->assertNotNull($bag->get('env(default::BAR)'));`
	`203`	`+ }`
`197`	`204`	`}`