[DependencyInjection] Escape % from parameter-like default values

MatTheCat · MatTheCat · commit 8d2fff02f000 · 2023-05-30T18:09:25.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -207,6 +207,8 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot,
                 if (\PHP_VERSION_ID >= 80100 && (\is_array($value->value) ? $value->value : \is_object($value->value))) {
                     unset($arguments[$j]);
                     $namedArguments = $value->names;
+                } elseif ($value instanceof $this->defaultArgument && \is_string($value->value)) {
+                    $arguments[$j] = preg_replace('/(?<!%)(%)([^%]+)\1/', '%%\2%%', $value->value);
                 } else {
                     $arguments[$j] = $value->value;
                 }
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
`@@ -207,6 +207,8 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot,`
`207`	`207`	`if (\PHP_VERSION_ID >= 80100 && (\is_array($value->value) ? $value->value : \is_object($value->value))) {`
`208`	`208`	`unset($arguments[$j]);`
`209`	`209`	`$namedArguments = $value->names;`
	`210`	`+ } elseif ($value instanceof $this->defaultArgument && \is_string($value->value)) {`
	`211`	`+ $arguments[$j] = preg_replace('/(?<!%)(%)([^%]+)\1/', '%%\2%%', $value->value);`
`210`	`212`	`} else {`
`211`	`213`	`$arguments[$j] = $value->value;`
`212`	`214`	`}`
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`	`+}`