bug #48502 [DependencyInjection] Fix ContainerBuilder stats env usage with enum (alamirault)

nicolas-grekas · nicolas-grekas · commit ee94cc951c68 · 2022-12-06T18:09:15.000+01:00
This PR was squashed before being merged into the 6.2 branch. Discussion ---------- [DependencyInjection] Fix `ContainerBuilder` stats env usage with enum | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #48498  | License | MIT | Doc PR | symfony/symfony-docs#...  Without patch: ```php [ 'enum:Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum:foo' => 0, 'Bar' => 1, ] ``` With patch: ```php [ 'enum:Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum:foo' => 1, 'Bar' => 1, ] ``` Commits ------- 75da869 [DependencyInjection] Fix `ContainerBuilder` stats env usage with enum
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -49,7 +49,7 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
             }
 
             $uniqueName = md5($name.'_'.self::$counter++);
-            $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);
+            $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);
             $this->envPlaceholders[$env][$placeholder] = $placeholder;
 
             return $placeholder;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -51,6 +51,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -545,6 +546,23 @@ public function testEnvExpressionFunction()
         $this->assertEquals('Foo value', $container->get('bar')->foo);
     }
 
+    public function testGetEnvCountersWithEnum()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $config = new ContainerBuilder($bag);
+        $config->resolveEnvPlaceholders([
+            $bag->get('env(enum:'.StringBackedEnum::class.':foo)'),
+            $bag->get('env(Bar)'),
+        ]);
+
+        $expected = [
+            'enum:Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum:foo' => 1,
+            'Bar' => 1,
+        ];
+
+        $this->assertSame($expected, $config->getEnvCounters());
+    }
+
     public function testCreateServiceWithAbstractArgument()
     {
         $this->expectException(RuntimeException::class);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function get(string $name): array\|bool\|string\|int\|float\|\UnitEnum\|null`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$uniqueName = md5($name.'_'.self::$counter++);`
`52`		`- $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);`
	`52`	`+ $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);`
`53`	`53`	`$this->envPlaceholders[$env][$placeholder] = $placeholder;`
`54`	`54`
`55`	`55`	`return $placeholder;`