Fixes

ondrejmirtes · ondrejmirtes · commit 1790dab8b693 · 2024-01-01T14:28:30.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -425,7 +425,7 @@ private function processStmtNode(
 				$nodeCallback($declare->value, $scope);
 				if (
 					$declare->key->name !== 'strict_types'
-					|| !($declare->value instanceof Node\Scalar\LNumber)
+					|| !($declare->value instanceof Node\Scalar\Int_)
 					|| $declare->value->value !== 1
 				) {
 					continue;
@@ -4115,7 +4115,7 @@ static function (): void {
 				$throwPoints = array_merge($throwPoints, $valueResult->getThrowPoints());
 
 				if ($arrayItem->key === null) {
-					$dimExpr = new Node\Scalar\LNumber($i);
+					$dimExpr = new Node\Scalar\Int_($i);
 				} else {
 					$dimExpr = $arrayItem->key;
 				}
diff --git a/src/Analyser/StatementResult.php b/src/Analyser/StatementResult.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Analyser;
 
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Stmt;
 
 /** @api */
@@ -51,7 +51,7 @@ public function filterOutLoopExitPoints(): self
 			}
 
 			$num = $statement->num;
-			if (!$num instanceof LNumber) {
+			if (!$num instanceof Int_) {
 				return new self($this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);
 			}
 
@@ -92,7 +92,7 @@ public function getExitPointsByType(string $stmtClass): array
 				continue;
 			}
 
-			if (!$value instanceof LNumber) {
+			if (!$value instanceof Int_) {
 				$exitPoints[] = $exitPoint;
 				continue;
 			}
@@ -123,7 +123,7 @@ public function getExitPointsForOuterLoop(): array
 			if ($statement->num === null) {
 				continue;
 			}
-			if (!$statement->num instanceof LNumber) {
+			if (!$statement->num instanceof Int_) {
 				continue;
 			}
 			$value = $statement->num->value;
@@ -133,7 +133,7 @@ public function getExitPointsForOuterLoop(): array
 
 			$newNode = null;
 			if ($value > 2) {
-				$newNode = new LNumber($value - 1);
+				$newNode = new Int_($value - 1);
 			}
 			if ($statement instanceof Stmt\Continue_) {
 				$newStatement = new Stmt\Continue_($newNode);
diff --git a/src/Parser/RemoveUnusedCodeByPhpVersionIdVisitor.php b/src/Parser/RemoveUnusedCodeByPhpVersionIdVisitor.php
@@ -77,15 +77,15 @@ public function enterNode(Node $node): Node|int|null
 	private function getOperands(Node\Expr $left, Node\Expr $right): ?array
 	{
 		if (
-			$left instanceof Node\Scalar\LNumber
+			$left instanceof Node\Scalar\Int_
 			&& $right instanceof Node\Expr\ConstFetch
 			&& $right->name->toString() === 'PHP_VERSION_ID'
 		) {
 			return [(new PhpVersion($left->value))->getVersionString(), $this->phpVersionString];
 		}
 
 		if (
-			$right instanceof Node\Scalar\LNumber
+			$right instanceof Node\Scalar\Int_
 			&& $left instanceof Node\Expr\ConstFetch
 			&& $left->name->toString() === 'PHP_VERSION_ID'
 		) {
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1988,7 +1988,7 @@ public function getUnaryMinusType(Expr $expr, callable $getTypeCallback): Type
 		}
 
 		if ($type instanceof IntegerRangeType) {
-			return $getTypeCallback(new Expr\BinaryOp\Mul($expr, new LNumber(-1)));
+			return $getTypeCallback(new Expr\BinaryOp\Mul($expr, new Int_(-1)));
 		}
 
 		return $type;
diff --git a/src/Rules/Arrays/ArrayDestructuringRule.php b/src/Rules/Arrays/ArrayDestructuringRule.php
@@ -85,7 +85,7 @@ private function getErrors(Scope $scope, Node\Expr\List_ $var, Expr $expr): arra
 			$keyExpr = null;
 			if ($item->key === null) {
 				$keyType = new ConstantIntegerType($i);
-				$keyExpr = new Node\Scalar\LNumber($i);
+				$keyExpr = new Node\Scalar\Int_($i);
 			} else {
 				$keyType = $scope->getType($item->key);
 				$keyExpr = new TypeExpr($keyType);
diff --git a/src/Rules/Classes/EnumSanityRule.php b/src/Rules/Classes/EnumSanityRule.php
@@ -156,7 +156,7 @@ public function processNode(Node $node, Scope $scope): array
 			}
 			$caseName = $stmt->name->name;
 
-			if ($stmt->expr instanceof Node\Scalar\LNumber || $stmt->expr instanceof Node\Scalar\String_) {
+			if ($stmt->expr instanceof Node\Scalar\Int_ || $stmt->expr instanceof Node\Scalar\String_) {
 				if ($enumNode->scalarType === null) {
 					$errors[] = RuleErrorBuilder::message(sprintf(
 						'Enum %s is not backed, but case %s has value %s.',
diff --git a/src/Rules/Comparison/DoWhileLoopConstantConditionRule.php b/src/Rules/Comparison/DoWhileLoopConstantConditionRule.php
@@ -3,7 +3,7 @@
 namespace PHPStan\Rules\Comparison;
 
 use PhpParser\Node;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Continue_;
 use PHPStan\Analyser\Scope;
@@ -47,7 +47,7 @@ public function processNode(Node $node, Scope $scope): array
 					if ($statement->num === null) {
 						continue;
 					}
-					if (!$statement->num instanceof LNumber) {
+					if (!$statement->num instanceof Int_) {
 						continue;
 					}
 					$value = $statement->num->value;
diff --git a/src/Rules/Comparison/WhileLoopAlwaysTrueConditionRule.php b/src/Rules/Comparison/WhileLoopAlwaysTrueConditionRule.php
@@ -3,7 +3,7 @@
 namespace PHPStan\Rules\Comparison;
 
 use PhpParser\Node;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Continue_;
 use PHPStan\Analyser\Scope;
@@ -46,7 +46,7 @@ public function processNode(
 			if ($statement->num === null) {
 				continue;
 			}
-			if (!$statement->num instanceof LNumber) {
+			if (!$statement->num instanceof Int_) {
 				continue;
 			}
 			$value = $statement->num->value;
diff --git a/src/Rules/Keywords/ContinueBreakInLoopRule.php b/src/Rules/Keywords/ContinueBreakInLoopRule.php
@@ -28,7 +28,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$node->num instanceof Node\Scalar\LNumber) {
+		if (!$node->num instanceof Node\Scalar\Int_) {
 			$value = 1;
 		} else {
 			$value = $node->num->value;
diff --git a/src/Rules/Keywords/DeclareStrictTypesRule.php b/src/Rules/Keywords/DeclareStrictTypesRule.php
@@ -40,7 +40,7 @@ public function processNode(Node $node, Scope $scope): array
 			}
 
 			if (
-				!$declare->value instanceof Node\Scalar\LNumber
+				!$declare->value instanceof Node\Scalar\Int_
 				|| !in_array($declare->value->value, [0, 1], true)
 			) {
 				return [
diff --git a/src/Rules/PhpDoc/VarTagTypeRuleHelper.php b/src/Rules/PhpDoc/VarTagTypeRuleHelper.php
@@ -53,7 +53,7 @@ public function checkVarType(Scope $scope, Node\Expr $var, Node\Expr $expr, arra
 					continue;
 				}
 				if ($arrayItem->key === null) {
-					$dimExpr = new Node\Scalar\LNumber($i);
+					$dimExpr = new Node\Scalar\Int_($i);
 				} else {
 					$dimExpr = $arrayItem->key;
 				}
diff --git a/src/Type/Php/ArraySumFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArraySumFunctionDynamicReturnTypeExtension.php
@@ -5,7 +5,7 @@
 use PhpParser\Node\Expr\BinaryOp\Mul;
 use PhpParser\Node\Expr\BinaryOp\Plus;
 use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Int_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\Expr\TypeExpr;
 use PHPStan\Reflection\FunctionReflection;
@@ -35,7 +35,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 		if (count($argType->getConstantArrays()) > 0) {
 			foreach ($argType->getConstantArrays() as $constantArray) {
-				$node = new LNumber(0);
+				$node = new Int_(0);
 
 				foreach ($constantArray->getValueTypes() as $i => $type) {
 					if ($constantArray->isOptionalKey($i)) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Analyser;`
`4`	`4`
`5`		`-use PhpParser\Node\Scalar\LNumber;`
	`5`	`+use PhpParser\Node\Scalar\Int_;`
`6`	`6`	`use PhpParser\Node\Stmt;`
`7`	`7`
`8`	`8`	`/** @api */`
`@@ -51,7 +51,7 @@ public function filterOutLoopExitPoints(): self`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`$num = $statement->num;`
`54`		`- if (!$num instanceof LNumber) {`
	`54`	`+ if (!$num instanceof Int_) {`
`55`	`55`	`return new self($this->scope, $this->hasYield, false, $this->exitPoints, $this->throwPoints);`
`56`	`56`	`}`
`57`	`57`
`@@ -92,7 +92,7 @@ public function getExitPointsByType(string $stmtClass): array`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`
`95`		`- if (!$value instanceof LNumber) {`
	`95`	`+ if (!$value instanceof Int_) {`
`96`	`96`	`$exitPoints[] = $exitPoint;`
`97`	`97`	`continue;`
`98`	`98`	`}`
`@@ -123,7 +123,7 @@ public function getExitPointsForOuterLoop(): array`
`123`	`123`	`if ($statement->num === null) {`
`124`	`124`	`continue;`
`125`	`125`	`}`
`126`		`- if (!$statement->num instanceof LNumber) {`
	`126`	`+ if (!$statement->num instanceof Int_) {`
`127`	`127`	`continue;`
`128`	`128`	`}`
`129`	`129`	`$value = $statement->num->value;`
`@@ -133,7 +133,7 @@ public function getExitPointsForOuterLoop(): array`
`133`	`133`
`134`	`134`	`$newNode = null;`
`135`	`135`	`if ($value > 2) {`
`136`		`- $newNode = new LNumber($value - 1);`
	`136`	`+ $newNode = new Int_($value - 1);`
`137`	`137`	`}`
`138`	`138`	`if ($statement instanceof Stmt\Continue_) {`
`139`	`139`	`$newStatement = new Stmt\Continue_($newNode);`
Original file line number	Diff line number	Diff line change
`@@ -1988,7 +1988,7 @@ public function getUnaryMinusType(Expr $expr, callable $getTypeCallback): Type`
`1988`	`1988`	`}`
`1989`	`1989`
`1990`	`1990`	`if ($type instanceof IntegerRangeType) {`
`1991`		`- return $getTypeCallback(new Expr\BinaryOp\Mul($expr, new LNumber(-1)));`
	`1991`	`+ return $getTypeCallback(new Expr\BinaryOp\Mul($expr, new Int_(-1)));`
`1992`	`1992`	`}`
`1993`	`1993`
`1994`	`1994`	`return $type;`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public function processNode(Node $node, Scope $scope): array`
`156`	`156`	`}`
`157`	`157`	`$caseName = $stmt->name->name;`
`158`	`158`
`159`		`- if ($stmt->expr instanceof Node\Scalar\LNumber \|\| $stmt->expr instanceof Node\Scalar\String_) {`
	`159`	`+ if ($stmt->expr instanceof Node\Scalar\Int_ \|\| $stmt->expr instanceof Node\Scalar\String_) {`
`160`	`160`	`if ($enumNode->scalarType === null) {`
`161`	`161`	`$errors[] = RuleErrorBuilder::message(sprintf(`
`162`	`162`	`'Enum %s is not backed, but case %s has value %s.',`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function processNode(Node $node, Scope $scope): array`
`28`	`28`	`return [];`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (!$node->num instanceof Node\Scalar\LNumber) {`
	`31`	`+ if (!$node->num instanceof Node\Scalar\Int_) {`
`32`	`32`	`$value = 1;`
`33`	`33`	`} else {`
`34`	`34`	`$value = $node->num->value;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function processNode(Node $node, Scope $scope): array`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (`
`43`		`- !$declare->value instanceof Node\Scalar\LNumber`
	`43`	`+ !$declare->value instanceof Node\Scalar\Int_`
`44`	`44`	`\|\| !in_array($declare->value->value, [0, 1], true)`
`45`	`45`	`) {`
`46`	`46`	`return [`