Rest of src/ changes

ondrejmirtes · ondrejmirtes · commit 749e9158cf49 · 2023-12-30T20:49:46.000+01:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1783,3 +1783,19 @@ parameters:
 			message: "#^PHPDoc tag @var assumes the expression with type PHPStan\\\\Type\\\\Generic\\\\TemplateType is always PHPStan\\\\Type\\\\Generic\\\\TemplateMixedType but it's error\\-prone and dangerous\\.$#"
 			count: 1
 			path: tests/PHPStan/Type/IterableTypeTest.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class PHPStan\\\\Rules\\\\Arrays\\\\EmptyArrayItemRule\\:
+				Since PHP\\-Parser 5\\.0 this is a parse error\\.$#
+			"""
+			count: 1
+			path: tests/PHPStan/Rules/Arrays/EmptyArrayItemRuleTest.php
+
+		-
+			message: """
+				#^Return type of method PHPStan\\\\Rules\\\\Arrays\\\\EmptyArrayItemRuleTest\\:\\:getRule\\(\\) has typehint with deprecated class PHPStan\\\\Rules\\\\Arrays\\\\EmptyArrayItemRule\\:
+				Since PHP\\-Parser 5\\.0 this is a parse error\\.$#
+			"""
+			count: 1
+			path: tests/PHPStan/Rules/Arrays/EmptyArrayItemRuleTest.php
diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -456,10 +456,6 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):
 			return false;
 		}
 
-		if ($items[0] === null) {
-			return false;
-		}
-
 		$itemType = $scope->getType($items[0]->value);
 		return $itemType->isClassStringType()->yes();
 	}
diff --git a/src/Node/ClassPropertiesNode.php b/src/Node/ClassPropertiesNode.php
@@ -267,9 +267,6 @@ private function collectUninitializedProperties(array $constructors, array $unin
 				$statementResult = $executionEnd->getStatementResult();
 				$endNode = $executionEnd->getNode();
 				if ($statementResult->isAlwaysTerminating()) {
-					if ($endNode instanceof Node\Stmt\Throw_) {
-						continue;
-					}
 					if ($endNode instanceof Node\Stmt\Expression) {
 						$exprType = $statementResult->getScope()->getType($endNode->expr);
 						if ($exprType instanceof NeverType && $exprType->isExplicit()) {
diff --git a/src/Node/ClassPropertyNode.php b/src/Node/ClassPropertyNode.php
@@ -2,11 +2,11 @@
 
 namespace PHPStan\Node;
 
+use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\NodeAbstract;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Type;
@@ -72,28 +72,28 @@ public function getPhpDocType(): ?Type
 
 	public function isPublic(): bool
 	{
-		return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
-			|| ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
+		return ($this->flags & Modifiers::PUBLIC) !== 0
+			|| ($this->flags & Modifiers::VISIBILITY_MASK) === 0;
 	}
 
 	public function isProtected(): bool
 	{
-		return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
+		return (bool) ($this->flags & Modifiers::PROTECTED);
 	}
 
 	public function isPrivate(): bool
 	{
-		return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
+		return (bool) ($this->flags & Modifiers::PRIVATE);
 	}
 
 	public function isStatic(): bool
 	{
-		return (bool) ($this->flags & Class_::MODIFIER_STATIC);
+		return (bool) ($this->flags & Modifiers::STATIC);
 	}
 
 	public function isReadOnly(): bool
 	{
-		return (bool) ($this->flags & Class_::MODIFIER_READONLY) || $this->isReadonlyClass;
+		return (bool) ($this->flags & Modifiers::READONLY) || $this->isReadonlyClass;
 	}
 
 	public function isReadOnlyByPhpDoc(): bool
diff --git a/src/Node/ClassStatementsGatherer.php b/src/Node/ClassStatementsGatherer.php
@@ -204,9 +204,6 @@ private function gatherNodes(Node $node, Scope $scope): void
 			$this->propertyUsages[] = new PropertyWrite($node->expr, $scope, false);
 			return;
 		}
-		if ($node instanceof Node\Scalar\EncapsedStringPart) {
-			return;
-		}
 		if ($node instanceof FunctionCallableNode) {
 			$node = $node->getOriginalNode();
 		} elseif ($node instanceof InstantiationCallableNode) {
diff --git a/src/Node/LiteralArrayItem.php b/src/Node/LiteralArrayItem.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Node;
 
-use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\ArrayItem;
 use PHPStan\Analyser\Scope;
 
 /** @api */
diff --git a/src/Parser/LastConditionVisitor.php b/src/Parser/LastConditionVisitor.php
@@ -18,7 +18,11 @@ public function enterNode(Node $node): ?Node
 			$lastElseIf = count($node->elseifs) - 1;
 
 			$elseIsMissingOrThrowing = $node->else === null
-				|| (count($node->else->stmts) === 1 && $node->else->stmts[0] instanceof Node\Stmt\Throw_);
+				|| (
+					count($node->else->stmts) === 1
+					&& $node->else->stmts[0] instanceof Node\Stmt\Expression
+					&& $node->else->stmts[0]->expr instanceof Node\Expr\Throw_
+				);
 
 			foreach ($node->elseifs as $i => $elseif) {
 				$isLast = $i === $lastElseIf && $elseIsMissingOrThrowing;
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -495,10 +495,6 @@ public function getArrayType(Expr\Array_ $expr, callable $getTypeCallback): Type
 		$arrayBuilder = ConstantArrayTypeBuilder::createEmpty();
 		$isList = null;
 		foreach ($expr->items as $arrayItem) {
-			if ($arrayItem === null) {
-				continue;
-			}
-
 			$valueType = $getTypeCallback($arrayItem->value);
 			if ($arrayItem->unpack) {
 				if (count($valueType->getConstantArrays()) === 1) {
diff --git a/src/Rules/Arrays/ArrayDestructuringRule.php b/src/Rules/Arrays/ArrayDestructuringRule.php
@@ -40,7 +40,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->var instanceof Node\Expr\List_ && !$node->var instanceof Node\Expr\Array_) {
+		if (!$node->var instanceof Node\Expr\List_) {
 			return [];
 		}
 
@@ -52,10 +52,9 @@ public function processNode(Node $node, Scope $scope): array
 	}
 
 	/**
-	 * @param Node\Expr\List_|Node\Expr\Array_ $var
 	 * @return list<IdentifierRuleError>
 	 */
-	private function getErrors(Scope $scope, Expr $var, Expr $expr): array
+	private function getErrors(Scope $scope, Node\Expr\List_ $var, Expr $expr): array
 	{
 		$exprTypeResult = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
@@ -100,7 +99,7 @@ private function getErrors(Scope $scope, Expr $var, Expr $expr): array
 			);
 			$errors = array_merge($errors, $itemErrors);
 
-			if (!$item->value instanceof Node\Expr\List_ && !$item->value instanceof Node\Expr\Array_) {
+			if (!$item->value instanceof Node\Expr\List_) {
 				$i++;
 				continue;
 			}
diff --git a/src/Rules/Arrays/ArrayUnpackingRule.php b/src/Rules/Arrays/ArrayUnpackingRule.php
@@ -3,7 +3,7 @@
 namespace PHPStan\Rules\Arrays;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\ArrayItem;
+use PhpParser\Node\ArrayItem;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
 use PHPStan\Php\PhpVersion;
diff --git a/src/Rules/Arrays/EmptyArrayItemRule.php b/src/Rules/Arrays/EmptyArrayItemRule.php
@@ -9,6 +9,7 @@
 use PHPStan\Rules\RuleErrorBuilder;
 
 /**
+ * @deprecated Since PHP-Parser 5.0 this is a parse error.
  * @implements Rule<LiteralArrayNode>
  */
 class EmptyArrayItemRule implements Rule
diff --git a/src/Rules/Arrays/InvalidKeyInArrayItemRule.php b/src/Rules/Arrays/InvalidKeyInArrayItemRule.php
@@ -11,7 +11,7 @@
 use function sprintf;
 
 /**
- * @implements Rule<Node\Expr\ArrayItem>
+ * @implements Rule<Node\ArrayItem>
  */
 class InvalidKeyInArrayItemRule implements Rule
 {
@@ -22,7 +22,7 @@ public function __construct(private bool $reportMaybes)
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\ArrayItem::class;
+		return Node\ArrayItem::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
diff --git a/src/Rules/Cast/InvalidPartOfEncapsedStringRule.php b/src/Rules/Cast/InvalidPartOfEncapsedStringRule.php
@@ -14,7 +14,7 @@
 use function sprintf;
 
 /**
- * @implements Rule<Node\Scalar\Encapsed>
+ * @implements Rule<Node\Scalar\InterpolatedString>
  */
 class InvalidPartOfEncapsedStringRule implements Rule
 {
@@ -28,14 +28,14 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return Node\Scalar\Encapsed::class;
+		return Node\Scalar\InterpolatedString::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
 		$messages = [];
 		foreach ($node->parts as $part) {
-			if ($part instanceof Node\Scalar\EncapsedStringPart) {
+			if ($part instanceof Node\InterpolatedStringPart) {
 				continue;
 			}
 
diff --git a/src/Rules/Functions/UnusedClosureUsesRule.php b/src/Rules/Functions/UnusedClosureUsesRule.php
@@ -34,7 +34,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		return $this->check->getUnusedParameters(
 			$scope,
-			array_map(static function (Node\Expr\ClosureUse $use): string {
+			array_map(static function (Node\ClosureUse $use): string {
 				if (!is_string($use->var->name)) {
 					throw new ShouldNotHappenException();
 				}
diff --git a/src/Rules/NullsafeCheck.php b/src/Rules/NullsafeCheck.php
@@ -36,7 +36,7 @@ public function containsNullSafe(Expr $expr): bool
 			return $this->containsNullSafe($expr->class);
 		}
 
-		if ($expr instanceof Expr\List_ || $expr instanceof Expr\Array_) {
+		if ($expr instanceof Expr\List_) {
 			foreach ($expr->items as $item) {
 				if ($item === null) {
 					continue;
diff --git a/src/Rules/Operators/InvalidAssignVarRule.php b/src/Rules/Operators/InvalidAssignVarRule.php
@@ -85,7 +85,7 @@ private function containsNonAssignableExpression(Expr $expr): bool
 			return false;
 		}
 
-		if ($expr instanceof Expr\List_ || $expr instanceof Expr\Array_) {
+		if ($expr instanceof Expr\List_) {
 			foreach ($expr->items as $item) {
 				if ($item === null) {
 					continue;
diff --git a/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php b/src/Rules/PhpDoc/WrongVariableNameInVarTagRule.php
@@ -195,7 +195,7 @@ private function getAssignedVariables(Expr $expr): array
 			return [];
 		}
 
-		if ($expr instanceof Expr\List_ || $expr instanceof Expr\Array_) {
+		if ($expr instanceof Expr\List_) {
 			$names = [];
 			foreach ($expr->items as $item) {
 				if ($item === null) {
diff --git a/src/Rules/UnusedFunctionParametersCheck.php b/src/Rules/UnusedFunctionParametersCheck.php
@@ -69,7 +69,7 @@ private function getUsedVariables(Scope $scope, $node): array
 			if ($node instanceof Node\Expr\Variable && is_string($node->name) && $node->name !== 'this') {
 				return [$node->name];
 			}
-			if ($node instanceof Node\Expr\ClosureUse && is_string($node->var->name)) {
+			if ($node instanceof Node\ClosureUse && is_string($node->var->name)) {
 				return [$node->var->name];
 			}
 			if (
diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php
@@ -515,7 +515,6 @@ function (Node $node) use ($fileName, $lookForTrait, $phpDocNodeMap, &$traitFoun
 					$node instanceof Node\Stmt
 					&& !$node instanceof Node\Stmt\Namespace_
 					&& !$node instanceof Node\Stmt\Declare_
-					&& !$node instanceof Node\Stmt\DeclareDeclare
 					&& !$node instanceof Node\Stmt\Use_
 					&& !$node instanceof Node\Stmt\UseUse
 					&& !$node instanceof Node\Stmt\GroupUse
diff --git a/src/Type/Php/IsCallableFunctionTypeSpecifyingExtension.php b/src/Type/Php/IsCallableFunctionTypeSpecifyingExtension.php
@@ -51,10 +51,6 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 			&& $valueType->isConstantArray()->yes()
 			&& !$valueType->isCallable()->no()
 		) {
-			if ($value->items[0] === null || $value->items[1] === null) {
-				throw new ShouldNotHappenException();
-			}
-
 			$functionCall = new FuncCall(new Name('method_exists'), [
 				new Arg($value->items[0]->value),
 				new Arg($value->items[1]->value),

Original file line number	Diff line number	Diff line change
`@@ -456,10 +456,6 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):`
`456`	`456`	`return false;`
`457`	`457`	`}`
`458`	`458`
`459`		`- if ($items[0] === null) {`
`460`		`- return false;`
`461`		`- }`
`462`		`-`
`463`	`459`	`$itemType = $scope->getType($items[0]->value);`
`464`	`460`	`return $itemType->isClassStringType()->yes();`
`465`	`461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Node;`
`4`	`4`
	`5`	`+use PhpParser\Modifiers;`
`5`	`6`	`use PhpParser\Node;`
`6`	`7`	`use PhpParser\Node\Expr;`
`7`	`8`	`use PhpParser\Node\Identifier;`
`8`	`9`	`use PhpParser\Node\Name;`
`9`		`-use PhpParser\Node\Stmt\Class_;`
`10`	`10`	`use PhpParser\NodeAbstract;`
`11`	`11`	`use PHPStan\Reflection\ClassReflection;`
`12`	`12`	`use PHPStan\Type\Type;`
`@@ -72,28 +72,28 @@ public function getPhpDocType(): ?Type`
`72`	`72`
`73`	`73`	`public function isPublic(): bool`
`74`	`74`	`{`
`75`		`- return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0`
`76`		`- \|\| ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;`
	`75`	`+ return ($this->flags & Modifiers::PUBLIC) !== 0`
	`76`	`+ \|\| ($this->flags & Modifiers::VISIBILITY_MASK) === 0;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public function isProtected(): bool`
`80`	`80`	`{`
`81`		`- return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);`
	`81`	`+ return (bool) ($this->flags & Modifiers::PROTECTED);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function isPrivate(): bool`
`85`	`85`	`{`
`86`		`- return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);`
	`86`	`+ return (bool) ($this->flags & Modifiers::PRIVATE);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public function isStatic(): bool`
`90`	`90`	`{`
`91`		`- return (bool) ($this->flags & Class_::MODIFIER_STATIC);`
	`91`	`+ return (bool) ($this->flags & Modifiers::STATIC);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public function isReadOnly(): bool`
`95`	`95`	`{`
`96`		`- return (bool) ($this->flags & Class_::MODIFIER_READONLY) \|\| $this->isReadonlyClass;`
	`96`	`+ return (bool) ($this->flags & Modifiers::READONLY) \|\| $this->isReadonlyClass;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public function isReadOnlyByPhpDoc(): bool`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function getNodeType(): string`
`40`	`40`
`41`	`41`	`public function processNode(Node $node, Scope $scope): array`
`42`	`42`	`{`
`43`		`- if (!$node->var instanceof Node\Expr\List_ && !$node->var instanceof Node\Expr\Array_) {`
	`43`	`+ if (!$node->var instanceof Node\Expr\List_) {`
`44`	`44`	`return [];`
`45`	`45`	`}`
`46`	`46`
`@@ -52,10 +52,9 @@ public function processNode(Node $node, Scope $scope): array`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * @param Node\Expr\List_\|Node\Expr\Array_ $var`
`56`	`55`	`* @return list<IdentifierRuleError>`
`57`	`56`	`*/`
`58`		`- private function getErrors(Scope $scope, Expr $var, Expr $expr): array`
	`57`	`+ private function getErrors(Scope $scope, Node\Expr\List_ $var, Expr $expr): array`
`59`	`58`	`{`
`60`	`59`	`$exprTypeResult = $this->ruleLevelHelper->findTypeToCheck(`
`61`	`60`	`$scope,`
`@@ -100,7 +99,7 @@ private function getErrors(Scope $scope, Expr $var, Expr $expr): array`
`100`	`99`	`);`
`101`	`100`	`$errors = array_merge($errors, $itemErrors);`
`102`	`101`
`103`		`- if (!$item->value instanceof Node\Expr\List_ && !$item->value instanceof Node\Expr\Array_) {`
	`102`	`+ if (!$item->value instanceof Node\Expr\List_) {`
`104`	`103`	`$i++;`
`105`	`104`	`continue;`
`106`	`105`	`}`