Adds phpstan/phpdoc-parser v1.2 to allowed composer versions (#463)

Author: micheleorselli

composer.json

@@ -31,7 +31,7 @@
         "nikic/php-parser": "~5",
         "webmozart/assert": "^1.9",
         "ext-json": "*",
-        "phpstan/phpdoc-parser": "^2.0",
+        "phpstan/phpdoc-parser": "^1.2|^2.0",
         "ondram/ci-detector": "^4.1"
     },
     "require-dev": {

src/Analyzer/NameResolver.php

@@ -27,23 +27,17 @@
 
 class NameResolver extends NodeVisitorAbstract
 {
-    /** @var NameContext Naming context */
     protected NameContext $nameContext;
 
-    /** @var bool Whether to preserve original names */
     protected bool $preserveOriginalNames;
 
-    /** @var bool Whether to replace resolved nodes in place, or to add resolvedNode attributes */
     protected bool $replaceNodes;
 
-    /** @var bool Whether to parse DocBlock Custom Annotations */
-    protected $parseCustomAnnotations;
+    protected bool $parseCustomAnnotations;
 
-    /** @var PhpDocParser */
-    protected $phpDocParser;
+    protected PhpDocParser $phpDocParser;
 
-    /** @var Lexer */
-    protected $phpDocLexer;
+    protected Lexer $phpDocLexer;
 
     /**
      * Constructs a name resolution visitor.
@@ -58,6 +52,9 @@ class NameResolver extends NodeVisitorAbstract
      *
      * @param ErrorHandler|null                                                                       $errorHandler Error handler
      * @param array{preserveOriginalNames?: bool, replaceNodes?: bool, parseCustomAnnotations?: bool} $options      Options
+     *
+     * @psalm-suppress TooFewArguments
+     * @psalm-suppress InvalidArgument
      */
     public function __construct(?ErrorHandler $errorHandler = null, array $options = [])
     {
@@ -66,11 +63,19 @@ public function __construct(?ErrorHandler $errorHandler = null, array $options =
         $this->replaceNodes = $options['replaceNodes'] ?? true;
         $this->parseCustomAnnotations = $options['parseCustomAnnotations'] ?? true;
 
-        $parserConfig = new ParserConfig([]);
-        $constExprParser = new ConstExprParser($parserConfig);
-        $typeParser = new TypeParser($parserConfig, $constExprParser);
-        $this->phpDocParser = new PhpDocParser($parserConfig, $typeParser, $constExprParser);
-        $this->phpDocLexer = new Lexer($parserConfig);
+        // this if is to allow using v 1.2 or v2
+        if (class_exists(ParserConfig::class)) {
+            $parserConfig = new ParserConfig([]);
+            $constExprParser = new ConstExprParser($parserConfig);
+            $typeParser = new TypeParser($parserConfig, $constExprParser);
+            $this->phpDocParser = new PhpDocParser($parserConfig, $typeParser, $constExprParser);
+            $this->phpDocLexer = new Lexer($parserConfig);
+        } else {
+            $typeParser = new TypeParser();
+            $constExprParser = new ConstExprParser();
+            $this->phpDocParser = new PhpDocParser($typeParser, $constExprParser);
+            $this->phpDocLexer = new Lexer();
+        }
     }
 
     /**