Merge branch '7.1' into 7.2

* 7.1:
  fix support for phpstan/phpdoc-parser 2

Author: derrabus

src/Symfony/Component/Serializer/composer.json

@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
-        "phpstan/phpdoc-parser": "^1.0",
+        "phpstan/phpdoc-parser": "^1.0|^2.0",
         "seld/jsonlint": "^1.10",
         "symfony/cache": "^6.4|^7.0",
         "symfony/config": "^6.4|^7.0",

src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php

@@ -17,6 +17,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use Symfony\Component\TypeInfo\Exception\RuntimeException;
 use Symfony\Component\TypeInfo\Exception\UnsupportedException;
 use Symfony\Component\TypeInfo\Type;
@@ -157,8 +158,14 @@ private function collectTemplates(\ReflectionClass|\ReflectionFunctionAbstract $
             return [];
         }
 
-        $this->phpstanLexer ??= new Lexer();
-        $this->phpstanParser ??= new PhpDocParser(new TypeParser(new ConstExprParser()), new ConstExprParser());
+        if (class_exists(ParserConfig::class)) {
+            $config = new ParserConfig([]);
+            $this->phpstanLexer ??= new Lexer($config);
+            $this->phpstanParser ??= new PhpDocParser($config, new TypeParser($config, new ConstExprParser($config)), new ConstExprParser($config));
+        } else {
+            $this->phpstanLexer ??= new Lexer();
+            $this->phpstanParser ??= new PhpDocParser(new TypeParser(new ConstExprParser()), new ConstExprParser());
+        }
 
         $tokens = new TokenIterator($this->phpstanLexer->tokenize($rawDocNode));
 

src/Symfony/Component/TypeInfo/TypeResolver/PhpDocAwareReflectionTypeResolver.php

@@ -19,6 +19,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use Symfony\Component\TypeInfo\Exception\UnsupportedException;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\TypeContext\TypeContext;
@@ -33,13 +34,30 @@
  */
 final readonly class PhpDocAwareReflectionTypeResolver implements TypeResolverInterface
 {
+    private PhpDocParser $phpDocParser;
+    private Lexer $lexer;
+
     public function __construct(
         private TypeResolverInterface $reflectionTypeResolver,
         private TypeResolverInterface $stringTypeResolver,
         private TypeContextFactory $typeContextFactory,
-        private PhpDocParser $phpDocParser = new PhpDocParser(new TypeParser(), new ConstExprParser()),
-        private Lexer $lexer = new Lexer(),
+        ?PhpDocParser $phpDocParser = null,
+        ?Lexer $lexer = null,
     ) {
+        if (class_exists(ParserConfig::class)) {
+            $this->lexer = $lexer ?? new Lexer(new ParserConfig([]));
+            $this->phpDocParser = $phpDocParser ?? new PhpDocParser(
+                $config = new ParserConfig([]),
+                new TypeParser($config, $constExprParser = new ConstExprParser($config)),
+                $constExprParser,
+            );
+        } else {
+            $this->lexer = $lexer ?? new Lexer();
+            $this->phpDocParser = $phpDocParser ?? new PhpDocParser(
+                new TypeParser($constExprParser = new ConstExprParser()),
+                $constExprParser,
+            );
+        }
     }
 
     public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type

src/Symfony/Component/TypeInfo/TypeResolver/StringTypeResolver.php

@@ -34,6 +34,7 @@
 use PHPStan\PhpDocParser\Parser\ConstExprParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use Symfony\Component\TypeInfo\Exception\InvalidArgumentException;
 use Symfony\Component\TypeInfo\Exception\UnsupportedException;
 use Symfony\Component\TypeInfo\Type;
@@ -58,10 +59,18 @@ final class StringTypeResolver implements TypeResolverInterface
      */
     private static array $classExistCache = [];
 
-    public function __construct(
-        private Lexer $lexer = new Lexer(),
-        private TypeParser $parser = new TypeParser(new ConstExprParser()),
-    ) {
+    private readonly Lexer $lexer;
+    private readonly TypeParser $parser;
+
+    public function __construct(?Lexer $lexer = null, ?TypeParser $parser = null)
+    {
+        if (class_exists(ParserConfig::class)) {
+            $this->lexer = $lexer ?? new Lexer(new ParserConfig([]));
+            $this->parser = $parser ?? new TypeParser($config = new ParserConfig([]), new ConstExprParser($config));
+        } else {
+            $this->lexer = $lexer ?? new Lexer();
+            $this->parser = $parser ?? new TypeParser(new ConstExprParser());
+        }
     }
 
     public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type

src/Symfony/Component/TypeInfo/composer.json

@@ -29,7 +29,7 @@
         "psr/container": "^1.1|^2.0"
     },
     "require-dev": {
-        "phpstan/phpdoc-parser": "^1.0",
+        "phpstan/phpdoc-parser": "^1.0|^2.0",
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/property-info": "^6.4|^7.0"
     },