Merge pull request #992 from doctrine/3.4.x-merge-up-into-3.5.x_9eYIZZDG

Merge release 3.4.2 into 3.5.x

Author: malarzm

src/Proxy/ProxyGenerator.php

@@ -36,6 +36,7 @@
 use function interface_exists;
 use function is_callable;
 use function is_dir;
+use function is_scalar;
 use function is_string;
 use function is_writable;
 use function lcfirst;
@@ -1122,7 +1123,7 @@ private function getParameterDefaultValue(ReflectionParameter $parameter)
             return '';
         }
 
-        if (PHP_VERSION_ID < 80100) {
+        if (PHP_VERSION_ID < 80100 || is_scalar($parameter->getDefaultValue())) {
             return ' = ' . var_export($parameter->getDefaultValue(), true);
         }
 

tests/Common/Proxy/PHP81NewInInitializers.php

@@ -23,7 +23,22 @@ public function arrayInDefault(array $foo = [new \DateTimeImmutable('2022-08-22
 
     }
 
-    public function constInDefault(string $foo = ConstProvider::FOO): void
+    public function scalarConstInDefault(string $foo = ConstProvider::FOO_SCALAR): void
+    {
+
+    }
+
+    public function constInDefault(array $foo = ConstProvider::FOO): void
+    {
+
+    }
+
+    public function globalEolInDefault(string $foo = \PHP_EOL): void
+    {
+
+    }
+
+    public function specialCharacterInDefault(string $foo = "\n"): void
     {
 
     }

tests/Common/Proxy/ProxyGeneratorTest.php

@@ -602,7 +602,22 @@ public function testPhp81NewInInitializers()
         );
 
         self::assertStringContainsString(
-            'constInDefault(string $foo = \Doctrine\Tests\Common\Util\TestAsset\ConstProvider::FOO): void',
+            'scalarConstInDefault(string $foo = \'foo\'): void',
+            file_get_contents(__DIR__ . '/generated/__CG__DoctrineTestsCommonProxyPHP81NewInInitializers.php')
+        );
+
+        self::assertStringContainsString(
+            'constInDefault(array $foo = \Doctrine\Tests\Common\Util\TestAsset\ConstProvider::FOO): void',
+            file_get_contents(__DIR__ . '/generated/__CG__DoctrineTestsCommonProxyPHP81NewInInitializers.php')
+        );
+
+        self::assertStringContainsString(
+            "globalEolInDefault(string \$foo = '\n'): void",
+            file_get_contents(__DIR__ . '/generated/__CG__DoctrineTestsCommonProxyPHP81NewInInitializers.php')
+        );
+
+        self::assertStringContainsString(
+            "specialCharacterInDefault(string \$foo = '\n'): void",
             file_get_contents(__DIR__ . '/generated/__CG__DoctrineTestsCommonProxyPHP81NewInInitializers.php')
         );
     }

tests/Common/Util/TestAsset/ConstProvider.php

@@ -6,5 +6,6 @@
 
 class ConstProvider
 {
-    public const FOO = 'foo';
+    public const FOO = ['foo'];
+    public const FOO_SCALAR = 'foo';
 }