Allow env processor to resolve ::

jderusse · jderusse · commit 56cb56198e70 · 2019-04-07T20:27:31.000+02:00
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,22 @@ 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)'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid env(default:::BAR) name: only "word" characters are allowed.
+     */
+    public function testMalformedPattern()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->resolve();
+        $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`