Merge branch '5.1'

Author: Tobion

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.

Dumper/PhpDumper.php

@@ -567,7 +567,7 @@ private function generateProxyClasses(): array
             $proxyClass = explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1];
 
             if ($this->asFiles || $this->namespace) {
-                $proxyCode .= "\n\\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n";
+                $proxyCode .= "\nif (!\\class_exists('$proxyClass', false)) {\n    \\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n}\n";
             }
 
             $proxyClasses[$proxyClass.'.php'] = $proxyCode;
@@ -1086,7 +1086,7 @@ private function addNewInstance(Definition $definition, string $return = '', str
                 // If the class is a string we can optimize away
                 if (0 === strpos($class, "'") && false === strpos($class, '$')) {
                     if ("''" === $class) {
-                        throw new RuntimeException(sprintf('Cannot dump definition: %s service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
+                        throw new RuntimeException(sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
                     }
 
                     return $return.sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;

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);
+    }
 }

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)
+    {
+    }
 }

Tests/Fixtures/php/services9_lazy_inlined_factories.txt

@@ -160,7 +160,9 @@ class FooClass_%s extends \Bar\FooClass implements \ProxyManager\Proxy\VirtualPr
 %A
 }
 
-\class_alias(__NAMESPACE__.'\\FooClass_%s', 'FooClass_%s', false);
+if (!\class_exists('FooClass_%s', false)) {
+    \class_alias(__NAMESPACE__.'\\FooClass_%s', 'FooClass_%s', false);
+}
 
     [ProjectServiceContainer.preload.php] => <?php