Fixes

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -24,8 +24,6 @@
 use PhpParser\Node\InterpolatedStringPart;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Scalar\DNumber;
-use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\NodeFinder;
 use PHPStan\Node\ExecutionEndNode;
@@ -1125,7 +1123,7 @@ private function resolveType(string $exprString, Expr $node): Type
 			return $this->getType($node->expr);
 		}
 
-		if ($node instanceof LNumber) {
+		if ($node instanceof Node\Scalar\Int_) {
 			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
 		} elseif ($node instanceof String_) {
 			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
@@ -1149,7 +1147,7 @@ private function resolveType(string $exprString, Expr $node): Type
 			}
 
 			return $resultType ?? new ConstantStringType('');
-		} elseif ($node instanceof DNumber) {
+		} elseif ($node instanceof Node\Scalar\Float_) {
 			return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
 		} elseif ($node instanceof Expr\CallLike && $node->isFirstClassCallable()) {
 			if ($node instanceof FuncCall) {
@@ -1707,10 +1705,10 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 			}
 
 			if ($node instanceof Expr\PreInc) {
-				return $this->getType(new BinaryOp\Plus($node->var, new LNumber(1)));
+				return $this->getType(new BinaryOp\Plus($node->var, new Node\Scalar\Int_(1)));
 			}
 
-			return $this->getType(new BinaryOp\Minus($node->var, new LNumber(1)));
+			return $this->getType(new BinaryOp\Minus($node->var, new Node\Scalar\Int_(1)));
 		} elseif ($node instanceof Expr\Yield_) {
 			$functionReflection = $this->getFunction();
 			if ($functionReflection === null) {

src/Analyser/NodeScopeResolver.php

@@ -444,7 +444,6 @@ private function processStmtNode(
 			&& !$stmt instanceof Foreach_
 			&& !$stmt instanceof Node\Stmt\Global_
 			&& !$stmt instanceof Node\Stmt\Property
-			&& !$stmt instanceof Node\Stmt\PropertyProperty
 			&& !$stmt instanceof Node\Stmt\ClassConst
 			&& !$stmt instanceof Node\Stmt\Const_
 		) {

src/Dependency/ExportedNodeResolver.php

@@ -336,7 +336,7 @@ private function exportClassStatement(Node\Stmt $node, string $fileName, string
 			$docComment = $node->getDocComment();
 
 			return new ExportedPropertiesNode(
-				array_map(static fn (Node\Stmt\PropertyProperty $prop): string => $prop->name->toString(), $node->props),
+				array_map(static fn (Node\PropertyItem $prop): string => $prop->name->toString(), $node->props),
 				$this->exportPhpDocNode(
 					$fileName,
 					$namespacedName,

src/Reflection/InitializerExprTypeResolver.php

@@ -11,8 +11,8 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
-use PhpParser\Node\Scalar\DNumber;
-use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\Float_;
+use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Scalar\MagicConst;
 use PhpParser\Node\Scalar\MagicConst\Dir;
 use PhpParser\Node\Scalar\MagicConst\File;
@@ -113,10 +113,10 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 		if ($expr instanceof TypeExpr) {
 			return $expr->getExprType();
 		}
-		if ($expr instanceof LNumber) {
+		if ($expr instanceof Int_) {
 			return new ConstantIntegerType($expr->value);
 		}
-		if ($expr instanceof DNumber) {
+		if ($expr instanceof Float_) {
 			return new ConstantFloatType($expr->value);
 		}
 		if ($expr instanceof String_) {

src/Rules/Namespaces/ExistingNamesInUseRule.php

@@ -58,7 +58,7 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param Node\Stmt\UseUse[] $uses
+	 * @param Node\UseItem[] $uses
 	 * @return list<IdentifierRuleError>
 	 */
 	private function checkConstants(array $uses): array
@@ -80,7 +80,7 @@ private function checkConstants(array $uses): array
 	}
 
 	/**
-	 * @param Node\Stmt\UseUse[] $uses
+	 * @param Node\UseItem[] $uses
 	 * @return list<IdentifierRuleError>
 	 */
 	private function checkFunctions(array $uses): array
@@ -117,13 +117,13 @@ private function checkFunctions(array $uses): array
 	}
 
 	/**
-	 * @param Node\Stmt\UseUse[] $uses
+	 * @param Node\UseItem[] $uses
 	 * @return list<IdentifierRuleError>
 	 */
 	private function checkClasses(array $uses): array
 	{
 		return $this->classCheck->checkClassNames(
-			array_map(static fn (Node\Stmt\UseUse $use): ClassNameNodePair => new ClassNameNodePair((string) $use->name, $use->name), $uses),
+			array_map(static fn (Node\UseItem $use): ClassNameNodePair => new ClassNameNodePair((string) $use->name, $use->name), $uses),
 		);
 	}
 

src/Rules/PhpDoc/InvalidPhpDocVarTagTypeRule.php

@@ -48,7 +48,6 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		if (
 			$node instanceof Node\Stmt\Property
-			|| $node instanceof Node\Stmt\PropertyProperty
 			|| $node instanceof Node\Stmt\ClassConst
 			|| $node instanceof Node\Stmt\Const_
 		) {

src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php

@@ -51,7 +51,6 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		if (
 			$node instanceof Node\Stmt\Property
-			|| $node instanceof Node\Stmt\PropertyProperty
 			|| $node instanceof Node\Stmt\ClassConst
 			|| $node instanceof Node\Stmt\Const_
 			|| ($node instanceof VirtualNode && !$node instanceof InFunctionNode && !$node instanceof InClassMethodNode && !$node instanceof InClassNode)

src/Type/FileTypeMapper.php

@@ -520,7 +520,6 @@ function (Node $node) use ($fileName, $lookForTrait, $phpDocNodeMap, &$traitFoun
 					&& !$node instanceof Node\Stmt\Namespace_
 					&& !$node instanceof Node\Stmt\Declare_
 					&& !$node instanceof Node\Stmt\Use_
-					&& !$node instanceof Node\Stmt\UseUse
 					&& !$node instanceof Node\Stmt\GroupUse
 					&& !$node instanceof Node\Stmt\TraitUse
 					&& !$node instanceof Node\Stmt\TraitUseAdaptation