add support for phpstan/phpdoc-parser 2

Author: xabbuh

composer.json

@@ -19,7 +19,7 @@
         "webmozart/assert": "^1.9.1",
         "phpdocumentor/reflection-common": "^2.2",
         "ext-filter": "*",
-        "phpstan/phpdoc-parser": "^1.7",
+        "phpstan/phpdoc-parser": "^1.7|^2.0",
         "doctrine/deprecations": "^1.1"
     },
     "require-dev": {

composer.lock

@@ -21,6 +21,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use RuntimeException;
 
 use function ltrim;
@@ -44,16 +45,27 @@ class AbstractPHPStanFactory implements Factory
 
     public function __construct(PHPStanFactory ...$factories)
     {
-        $this->lexer = new Lexer(true);
-        $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]);
-        $this->parser = new PhpDocParser(
-            new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]),
-            $constParser,
-            true,
-            true,
-            ['lines' => true, 'indexes' => true],
-            true
-        );
+        if (class_exists(ParserConfig::class)) {
+            $config = new ParserConfig(['indexes' => true, 'lines' => true]);
+            $this->lexer = new Lexer($config);
+            $constParser = new ConstExprParser($config);
+            $this->parser = new PhpDocParser(
+                $config,
+                new TypeParser($config, $constParser),
+                $constParser
+            );
+        } else {
+            $this->lexer = new Lexer(true);
+            $constParser = new ConstExprParser(true, true, ['lines' => true, 'indexes' => true]);
+            $this->parser = new PhpDocParser(
+                new TypeParser($constParser, true, ['lines' => true, 'indexes' => true]),
+                $constParser,
+                true,
+                true,
+                ['lines' => true, 'indexes' => true],
+                true
+            );
+        }
         $this->factories = $factories;
     }
 

src/DocBlock/Tags/Factory/AbstractPHPStanFactory.php

@@ -24,6 +24,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use PHPUnit\Framework\TestCase;
 
 use function property_exists;
@@ -32,11 +33,18 @@ abstract class TagFactoryTestCase extends TestCase
 {
     public function parseTag(string $tag): PhpDocTagNode
     {
-        $lexer = new Lexer();
-        $tokens = $lexer->tokenize($tag);
-        $constParser = new ConstExprParser();
+        if (class_exists(ParserConfig::class)) {
+            $config = new ParserConfig([]);
+            $lexer = new Lexer($config);
+            $constParser = new ConstExprParser($config);
+            $phpDocParser = new PhpDocParser($config, new TypeParser($config, $constParser), $constParser);
+        } else {
+            $lexer = new Lexer();
+            $constParser = new ConstExprParser();
+            $phpDocParser = new PhpDocParser(new TypeParser($constParser), $constParser);
+        }
 
-        $tagNode = (new PhpDocParser(new TypeParser($constParser), $constParser))->parseTag(new TokenIterator($tokens));
+        $tagNode = ($phpDocParser)->parseTag(new TokenIterator($lexer->tokenize($tag)));
         if (property_exists($tagNode->value, 'description') === true) {
             $tagNode->value->setAttribute('description', $tagNode->value->description);
         }