[Config] Allow using environment variables in EnumNode

Eric COURTIAL · fabpot · commit 726bc280e82c · 2022-03-09T08:23:30.000+01:00
diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.1
+---
+
+ * Allow using environment variables in `EnumNode`
+
 6.0
 ---
 
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -54,12 +54,4 @@ protected function finalizeValue(mixed $value): mixed
 
         return $value;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function allowPlaceholders(): bool
-    {
-        return false;
-    }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -55,4 +55,20 @@ public function testFinalizeWithInvalidValue()
         $node = new EnumNode('foo', null, ['foo', 'bar']);
         $node->finalize('foobar');
     }
+
+    public function testWithPlaceHolderWithValidValue()
+    {
+        $node = new EnumNode('cookie_samesite', null, ['lax', 'strict', 'none']);
+        EnumNode::setPlaceholder('custom', ['string' => 'lax']);
+        $this->assertSame('custom', $node->finalize('custom'));
+    }
+
+    public function testWithPlaceHolderWithInvalidValue()
+    {
+        $node = new EnumNode('cookie_samesite', null, ['lax', 'strict', 'none']);
+        EnumNode::setPlaceholder('custom', ['string' => 'foo']);
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('The value "foo" is not allowed for path "cookie_samesite". Permissible values: "lax", "strict", "none"');
+        $node->finalize('custom');
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -153,19 +153,6 @@ public function testConcatenatedEnvInConfig()
         $this->assertSame(['scalar_node' => $expected], $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
-    public function testEnvIsIncompatibleWithEnumNode()
-    {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('A dynamic value is not compatible with a "Symfony\Component\Config\Definition\EnumNode" node type at path "env_extension.enum_node".');
-        $container = new ContainerBuilder();
-        $container->registerExtension(new EnvExtension());
-        $container->prependExtensionConfig('env_extension', [
-            'enum_node' => '%env(FOO)%',
-        ]);
-
-        $this->doProcess($container);
-    }
-
     public function testEnvIsIncompatibleWithArrayNode()
     {
         $this->expectException(InvalidConfigurationException::class);

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,4 @@ protected function finalizeValue(mixed $value): mixed`
`54`	`54`
`55`	`55`	`return $value;`
`56`	`56`	`}`
`57`		`-`
`58`		`- /**`
`59`		`- * {@inheritdoc}`
`60`		`- */`
`61`		`- protected function allowPlaceholders(): bool`
`62`		`- {`
`63`		`- return false;`
`64`		`- }`
`65`	`57`	`}`