fix support for phpstan/phpdoc-parser 2

symfony · Nov 7, 2024 · 51535dd · 51535dd
1 parent a130321
commit 51535dd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/TypeContext/TypeContextFactory.php b/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));
 

diff --git a/TypeResolver/StringTypeResolver.php b/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;
@@ -63,8 +64,14 @@ final class StringTypeResolver implements TypeResolverInterface
 
     public function __construct()
     {
-        $this->lexer = new Lexer();
-        $this->parser = new TypeParser(new ConstExprParser());
+        if (class_exists(ParserConfig::class)) {
+            $config = new ParserConfig([]);
+            $this->lexer = new Lexer($config);
+            $this->parser = new TypeParser($config, new ConstExprParser($config));
+        } else {
+            $this->lexer = new Lexer();
+            $this->parser = new TypeParser(new ConstExprParser());
+        }
     }
 
     public function resolve(mixed $subject, ?TypeContext $typeContext = null): Type

diff --git a/composer.json b/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"
     },