Open 2.0.x

Author: ondrejmirtes

.github/workflows/backward-compatibility.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.23.x"
+      - "2.0.x"
 
 jobs:
   backward-compatibility:

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.23.x"
+      - "2.0.x"
 
 jobs:
   lint:

.github/workflows/test-slevomat-coding-standard.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.23.x"
+      - "2.0.x"
 
 jobs:
   tests:

composer.json

@@ -3,17 +3,17 @@
 	"description": "PHPDoc parser with support for nullable, intersection and generic types",
 	"license": "MIT",
 	"require": {
-		"php": "^7.2 || ^8.0"
+		"php": "^7.4 || ^8.0"
 	},
 	"require-dev": {
 		"doctrine/annotations": "^2.0",
-		"nikic/php-parser": "^4.15",
+		"nikic/php-parser": "^5.1",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
 		"phpstan/extension-installer": "^1.0",
-		"phpstan/phpstan": "^1.5",
-		"phpstan/phpstan-phpunit": "^1.1",
-		"phpstan/phpstan-strict-rules": "^1.0",
-		"phpunit/phpunit": "^9.5",
+		"phpstan/phpstan": "^2.0",
+		"phpstan/phpstan-phpunit": "^2.0",
+		"phpstan/phpstan-strict-rules": "^2.0",
+		"phpunit/phpunit": "^9.6",
 		"symfony/process": "^5.2"
 	},
 	"config": {

tests/PHPStan/Printer/IntegrationPrinterWithPhpParserTest.php

@@ -3,12 +3,11 @@
 namespace PHPStan\PhpDocParser\Printer;
 
 use PhpParser\Comment\Doc;
-use PhpParser\Lexer\Emulative;
 use PhpParser\Node as PhpNode;
 use PhpParser\NodeTraverser as PhpParserNodeTraverser;
 use PhpParser\NodeVisitor\CloningVisitor as PhpParserCloningVisitor;
 use PhpParser\NodeVisitorAbstract;
-use PhpParser\Parser\Php7;
+use PhpParser\ParserFactory;
 use PHPStan\PhpDocParser\Ast\AbstractNodeVisitor;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\NodeTraverser;
@@ -66,14 +65,8 @@ public function enterNode(Node $node)
 	 */
 	public function testPrint(string $file, string $expectedFile, NodeVisitor $visitor): void
 	{
-		$lexer = new Emulative([
-			'usedAttributes' => [
-				'comments',
-				'startLine', 'endLine',
-				'startTokenPos', 'endTokenPos',
-			],
-		]);
-		$phpParser = new Php7($lexer);
+		$phpParserFactory = new ParserFactory();
+		$phpParser = $phpParserFactory->createForNewestSupportedVersion();
 		$phpTraverser = new PhpParserNodeTraverser();
 		$phpTraverser->addVisitor(new PhpParserCloningVisitor());
 
@@ -85,7 +78,7 @@ public function testPrint(string $file, string $expectedFile, NodeVisitor $visit
 
 		/** @var PhpNode[] $oldStmts */
 		$oldStmts = $phpParser->parse($fileContents);
-		$oldTokens = $lexer->getTokens();
+		$oldTokens = $phpParser->getTokens();
 
 		$phpTraverser2 = new PhpParserNodeTraverser();
 		$phpTraverser2->addVisitor(new class ($visitor) extends NodeVisitorAbstract {