[DependencyInjection] Escape % from parameter-like default values

MatTheCat · MatTheCat · commit 2e64d9d72a2e · 2023-05-30T17:52:35.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -288,7 +288,11 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
                 // specifically pass the default value
                 $arguments[$index] = clone $this->defaultArgument;
-                $arguments[$index]->value = $parameter->getDefaultValue();
+                $defaultValue = $parameter->getDefaultValue();
+                if (\is_string($defaultValue)) {
+                    $defaultValue = preg_replace('/(?<!%)(%)([^%]+)\1/', '%%\2%%', $defaultValue);
+                }
+                $arguments[$index]->value = $defaultValue;
 
                 continue;
             }
@@ -299,7 +303,11 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
 
                     if ($parameter->isDefaultValueAvailable()) {
                         $value = clone $this->defaultArgument;
-                        $value->value = $parameter->getDefaultValue();
+                        $defaultValue = $parameter->getDefaultValue();
+                        if (\is_string($defaultValue)) {
+                            $defaultValue = preg_replace('/(?<!%)(%)([^%]+)\1/', '%%\2%%', $defaultValue);
+                        }
+                        $value->value = $defaultValue;
                     } elseif (!$parameter->allowsNull()) {
                         throw new AutowiringFailedException($this->currentId, $failureMessage);
                     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1219,4 +1219,17 @@ public function testAutowireWithNamedArgs()
 
         $this->assertEquals([new TypedReference(A::class, A::class), 'abc'], $container->getDefinition('foo')->getArguments());
     }
+
+    public function testAutowireDefaultValueParametersLike()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', ParametersLikeDefaultValue::class)
+            ->setAutowired(true)
+            ->setArgument(1, 'ok');
+
+        (new AutowirePass())->process($container);
+
+        $this->assertEquals('%%not%%one%%parameter%%here%', $container->getDefinition('foo')->getArgument(0));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -431,3 +431,10 @@ public function __construct(NotExisting $notExisting)
     {
     }
 }
+
+class ParametersLikeDefaultValue
+{
+    public function __construct(string $parameterLike = '%not%one%parameter%here%', string $willBeSetToKeepFirstArgumentDefaultValue = 'ok')
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -431,3 +431,10 @@ public function __construct(NotExisting $notExisting)`
`431`	`431`	`{`
`432`	`432`	`}`
`433`	`433`	`}`
	`434`	`+`
	`435`	`+class ParametersLikeDefaultValue`
	`436`	`+{`
	`437`	`+ public function __construct(string $parameterLike = '%not%one%parameter%here%', string $willBeSetToKeepFirstArgumentDefaultValue = 'ok')`
	`438`	`+ {`
	`439`	`+ }`
	`440`	`+}`