From da0e2c36ef7aa7ee0ec45b5ca64d009db68d7c47 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 10 Jun 2020 18:10:45 +0200
Subject: [PATCH] [DependencyInjection][CheckTypeDeclarationsPass] Always
 resolve parameters

---
 .../Compiler/CheckTypeDeclarationsPass.php    |  3 +-
 .../CheckTypeDeclarationsPassTest.php         | 30 ++++++++++---------
 .../BarMethodCall.php                         |  4 +++
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
index bad262452913..c15932b06cb4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -198,8 +198,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
             }
         } elseif (\is_string($value)) {
             if ('%' === ($value[0] ?? '') && preg_match('/^%([^%]+)%$/', $value, $match)) {
-                // Only array parameters are not inlined when dumped.
-                $value = [];
+                $value = $this->container->getParameter(substr($value, 1, -1));
             } elseif ($envPlaceholderUniquePrefix && false !== strpos($value, 'env_')) {
                 // If the value is an env placeholder that is either mixed with a string or with another env placeholder, then its resolved value will always be a string, so we don't need to resolve it.
                 // We don't need to change the value because it is already a string.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
index 9524c7a4f61b..18e06b3d2948 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -612,20 +612,6 @@ public function testProcessThrowsOnIterableTypeWhenScalarPassed()
         $this->assertInstanceOf(\stdClass::class, $container->get('bar')->foo);
     }
 
-    public function testProcessResolveArrayParameters()
-    {
-        $container = new ContainerBuilder();
-        $container->setParameter('ccc', ['foobar']);
-
-        $container
-            ->register('foobar', BarMethodCall::class)
-            ->addMethodCall('setArray', ['%ccc%']);
-
-        (new CheckTypeDeclarationsPass(true))->process($container);
-
-        $this->addToAssertionCount(1);
-    }
-
     public function testProcessResolveExpressions()
     {
         $container = new ContainerBuilder();
@@ -791,4 +777,20 @@ public function testExpressionLanguageWithSyntheticService()
 
         $this->addToAssertionCount(1);
     }
+
+    public function testProcessResolveParameters()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('array_param', ['foobar']);
+        $container->setParameter('string_param', 'ccc');
+
+        $container
+            ->register('foobar', BarMethodCall::class)
+            ->addMethodCall('setArray', ['%array_param%'])
+            ->addMethodCall('setString', ['%string_param%']);
+
+        (new CheckTypeDeclarationsPass(true))->process($container);
+
+        $this->addToAssertionCount(1);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php
index 69f1a693a4c5..65437a63ec74 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php
@@ -44,4 +44,8 @@ public function setCallable(callable $callable): void
     public function setClosure(\Closure $closure): void
     {
     }
+
+    public function setString(string $string)
+    {
+    }
 }