Fixes

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -1556,8 +1556,7 @@ private function processStmtNode(
 							}
 							$throwNode = $throwPoint->getNode();
 							if (
-								!$throwNode instanceof Throw_
-								&& !$throwNode instanceof Expr\Throw_
+								!$throwNode instanceof Expr\Throw_
 								&& !($throwNode instanceof Node\Stmt\Expression && $throwNode->expr instanceof Expr\Throw_)
 							) {
 								$onlyExplicitIsThrow = false;
@@ -1858,9 +1857,6 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 				if ($const->namespacedName !== null) {
 					$constantName = new Name\FullyQualified($const->namespacedName->toString());
 				} else {
-					if ($const->name->toString() === '') {
-						throw new ShouldNotHappenException('Constant cannot have a empty name');
-					}
 					$constantName = new Name\FullyQualified($const->name->toString());
 				}
 				$scope = $scope->assignExpression(new ConstFetch($constantName), $scope->getType($const->value), $scope->getNativeType($const->value));

src/Parser/PhpParserFactory.php

@@ -8,7 +8,7 @@
 use PhpParser\ParserAbstract;
 use PHPStan\Php\PhpVersion;
 
-class PhpParserFactory
+final class PhpParserFactory
 {
 
 	public function __construct(private Lexer $lexer, private PhpVersion $phpVersion)

src/Parser/StandaloneThrowExprVisitor.php

@@ -5,7 +5,7 @@
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 
-class StandaloneThrowExprVisitor extends NodeVisitorAbstract
+final class StandaloneThrowExprVisitor extends NodeVisitorAbstract
 {
 
 	public const ATTRIBUTE_NAME = 'standaloneThrowExpr';

src/Rules/ClassForbiddenNameCheck.php

@@ -73,7 +73,7 @@ public function checkClassNames(array $pairs): array
 				$projectName,
 				$className,
 			))
-				->line($pair->getNode()->getLine())
+				->line($pair->getNode()->getStartLine())
 				->identifier('class.prefixed')
 				->nonIgnorable();
 

src/Rules/FunctionDefinitionCheck.php

@@ -204,7 +204,7 @@ public function checkAnonymousFunction(
 		foreach ($returnType->getReferencedClasses() as $returnTypeClass) {
 			if (!$this->reflectionProvider->hasClass($returnTypeClass)) {
 				$errors[] = RuleErrorBuilder::message(sprintf($returnMessage, $returnTypeClass))
-					->line($returnTypeNode->getLine())
+					->line($returnTypeNode->getStartLine())
 					->identifier('class.notFound')
 					->build();
 				continue;

src/Rules/Names/UsedNamesRule.php

@@ -10,7 +10,6 @@
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Trait_;
 use PhpParser\Node\Stmt\Use_;
-use PhpParser\Node\Stmt\UseUse;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\FileNode;
 use PHPStan\Rules\IdentifierRuleError;
@@ -100,7 +99,7 @@ private function findErrorsForNode(Node $node, string $namespace, array &$usedNa
 						$namespace !== '' ? $namespace . '\\' . $node->name->toString() : $node->name->toString(),
 					))
 						->identifier(sprintf('%s.nameInUse', $type))
-						->line($node->getLine())
+						->line($node->getStartLine())
 						->nonIgnorable()
 						->build(),
 				];
@@ -113,7 +112,7 @@ private function findErrorsForNode(Node $node, string $namespace, array &$usedNa
 	}
 
 	/**
-	 * @param UseUse[] $uses
+	 * @param Node\UseItem[] $uses
 	 * @param array<string, string[]> $usedNames
 	 * @return list<IdentifierRuleError>
 	 */
@@ -132,7 +131,7 @@ private function findErrorsInUses(array $uses, string $useGroupPrefix, string $l
 					$use->getAlias()->toString(),
 				))
 					->identifier('use.nameInUse')
-					->line($use->getLine())
+					->line($use->getStartLine())
 					->nonIgnorable()
 					->build();
 				continue;
@@ -142,7 +141,7 @@ private function findErrorsInUses(array $uses, string $useGroupPrefix, string $l
 		return $errors;
 	}
 
-	private function shouldBeIgnored(Use_|GroupUse|UseUse $use): bool
+	private function shouldBeIgnored(Use_|GroupUse|Node\UseItem $use): bool
 	{
 		return in_array($use->type, [Use_::TYPE_FUNCTION, Use_::TYPE_CONSTANT], true);
 	}

src/Rules/PhpDoc/PhpDocLineHelper.php

@@ -19,7 +19,7 @@ public static function detectLine(PhpParserNode $node, PhpDocNode $phpDocNode):
 		$phpDoc = $node->getDocComment();
 
 		if ($phpDocTagLine === null || $phpDoc === null) {
-			return $node->getLine();
+			return $node->getStartLine();
 		}
 
 		return $phpDoc->getStartLine() + $phpDocTagLine - 1;

src/Rules/Variables/ParameterOutExecutionEndTypeRule.php

@@ -57,9 +57,6 @@ public function processNode(Node $node, Scope $scope): array
 				return [];
 			}
 		}
-		if ($endNode instanceof Node\Stmt\Throw_) {
-			return [];
-		}
 
 		$variant = ParametersAcceptorSelector::selectSingle($inFunction->getVariants());
 		$parameters = $variant->getParameters();

src/Testing/TypeInferenceTestCase.php

@@ -178,7 +178,7 @@ public static function gatherAssertTypes(string $file): array
 						'Expected type must be a literal string, %s given in %s on line %d.',
 						$expectedType->describe(VerbosityLevel::precise()),
 						$relativePathHelper->getRelativePath($file),
-						$node->getLine(),
+						$node->getStartLine(),
 					));
 				}
 				$actualType = $scope->getType($node->getArgs()[1]->value);
@@ -190,7 +190,7 @@ public static function gatherAssertTypes(string $file): array
 						'Expected type must be a literal string, %s given in %s on line %d.',
 						$expectedType->describe(VerbosityLevel::precise()),
 						$relativePathHelper->getRelativePath($file),
-						$node->getLine(),
+						$node->getStartLine(),
 					));
 				}
 

src/Type/FileTypeMapper.php

@@ -482,10 +482,6 @@ function (Node $node) use ($fileName, $lookForTrait, $phpDocNodeMap, &$traitFoun
 				$functionName = $functionStack[count($functionStack) - 1] ?? null;
 				$nameScopeKey = $this->getNameScopeKey($originalClassFileName, $className, $lookForTrait, $functionName);
 
-				if ($namespace === '') {
-					throw new ShouldNotHappenException('Namespace cannot be empty.');
-				}
-
 				if ($node instanceof Node\Stmt\ClassLike || $node instanceof Node\Stmt\ClassMethod || $node instanceof Node\Stmt\Function_) {
 					if (array_key_exists($nameScopeKey, $phpDocNodeMap)) {
 						$phpDocNode = $phpDocNodeMap[$nameScopeKey];