Update PHPStan in extractor

Author: ondrejmirtes

extractor/composer.json

@@ -4,7 +4,7 @@
 		"symfony/console": "^7.0.0",
 		"symfony/finder": "^7.0",
 		"nikic/php-parser": "^5",
-		"phpstan/phpstan": "^1.5",
+		"phpstan/phpstan": "^2.1",
 		"phpstan/extension-installer": "^1.1",
 		"phpstan/phpdoc-parser": "^1.4"
 	},

extractor/composer.lock

@@ -120,6 +120,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		if ($isUpdate) {
 			require_once __DIR__ . '/../Php8StubsMap.php';
 			$parts = explode('.', $updateFrom);
+
+			// @phpstan-ignore phpstanApi.constructor
 			$map = new \PHPStan\Php8StubsMap((int) $parts[0] * 10000 + (int) ($parts[1] ?? 0) * 100 + (int) ($parts[2] ?? 0));
 			$classes = $map->classes;
 			$functions = $map->functions;
@@ -196,7 +198,7 @@ public function __construct(string $stubPath)
 				$this->stubPath = $stubPath;
 			}
 
-			public function enterNode(Node $node)
+			public function enterNode(Node $node): ?int
 			{
 				if ($node instanceof Node\Stmt\Namespace_) {
 					// pass
@@ -457,51 +459,49 @@ private function compareStatementsInNamespace(array $oldStmts, array $newStmts,
 				}
 			}
 
-			if ($old->stmts !== null) {
-				$newStmtsToSet = $untouchedStmts;
-				foreach ($newMethods as $stmt) {
-					$methodName = $stmt->name->toLowerString();
-					if (!array_key_exists($methodName, $oldMethods)) {
-						$stmt->attrGroups[] = new Node\AttributeGroup([
-							new Node\Attribute(
-								new Node\Name\FullyQualified('Since'),
-								[new Node\Arg(new Node\Scalar\String_($updateTo))],
-							),
-						]);
-						$newStmtsToSet[] = $stmt;
-						continue;
-					}
+			$newStmtsToSet = $untouchedStmts;
+			foreach ($newMethods as $stmt) {
+				$methodName = $stmt->name->toLowerString();
+				if (!array_key_exists($methodName, $oldMethods)) {
+					$stmt->attrGroups[] = new Node\AttributeGroup([
+						new Node\Attribute(
+							new Node\Name\FullyQualified('Since'),
+							[new Node\Arg(new Node\Scalar\String_($updateTo))],
+						),
+					]);
+					$newStmtsToSet[] = $stmt;
+					continue;
+				}
 
-					foreach ($this->compareFunctions($oldMethods[$methodName], $stmt, $updateTo) as $functionStmt) {
-						$newStmtsToSet[] = $functionStmt;
-					}
+				foreach ($this->compareFunctions($oldMethods[$methodName], $stmt, $updateTo) as $functionStmt) {
+					$newStmtsToSet[] = $functionStmt;
 				}
+			}
 
-				// todo has a method been removed?
-
-				foreach ($newConstants as $stmt) {
-					$namesKey = implode(',', array_map(static fn (Node\Const_ $const) => $const->name->toString(), $stmt->consts));
-					if (!array_key_exists($namesKey, $oldConstants)) {
-						$stmt->attrGroups[] = new Node\AttributeGroup([
-							new Node\Attribute(
-								new Node\Name\FullyQualified('Since'),
-								[new Node\Arg(new Node\Scalar\String_($updateTo))],
-							),
-						]);
-						$newStmtsToSet[] = $stmt;
-						continue;
-					}
+			// todo has a method been removed?
 
-					foreach ($this->compareConstants($oldConstants[$namesKey], $stmt, $updateTo) as $constantStmt) {
-						$newStmtsToSet[] = $constantStmt;
-					}
+			foreach ($newConstants as $stmt) {
+				$namesKey = implode(',', array_map(static fn (Node\Const_ $const) => $const->name->toString(), $stmt->consts));
+				if (!array_key_exists($namesKey, $oldConstants)) {
+					$stmt->attrGroups[] = new Node\AttributeGroup([
+						new Node\Attribute(
+							new Node\Name\FullyQualified('Since'),
+							[new Node\Arg(new Node\Scalar\String_($updateTo))],
+						),
+					]);
+					$newStmtsToSet[] = $stmt;
+					continue;
 				}
 
-				// todo has a constant been removed?
-
-				$old->stmts = $newStmtsToSet;
+				foreach ($this->compareConstants($oldConstants[$namesKey], $stmt, $updateTo) as $constantStmt) {
+					$newStmtsToSet[] = $constantStmt;
+				}
 			}
 
+			// todo has a constant been removed?
+
+			$old->stmts = $newStmtsToSet;
+
 			return [$old];
 		}