Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -2987,7 +2987,7 @@ private static function intersectButNotNever(Type $nativeType, Type $inferredTyp
 		return $result;
 	}
 
-	public function enterMatch(Expr\Match_ $expr): self
+	public function enterMatch(Expr\Match_ $expr, Type $condType, Type $condNativeType): self
 	{
 		if ($expr->cond instanceof Variable) {
 			return $this;
@@ -3001,8 +3001,8 @@ public function enterMatch(Expr\Match_ $expr): self
 			return $this;
 		}
 
-		$type = $this->getType($cond);
-		$nativeType = $this->getNativeType($cond);
+		$type = $condType;
+		$nativeType = $condNativeType;
 		$condExpr = new AlwaysRememberedExpr($cond, $type, $nativeType);
 		$expr->cond = $condExpr;
 

src/Analyser/NodeScopeResolver.php

@@ -4184,13 +4184,14 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 		} elseif ($expr instanceof Expr\Match_) {
 			$deepContext = $context->enterDeep();
 			$condType = $scope->getType($expr->cond);
+			$condNativeType = $scope->getNativeType($expr->cond);
 			$condResult = $this->processExprNode($stmt, $expr->cond, $scope, $storage, $nodeCallback, $deepContext);
 			$scope = $condResult->getScope();
 			$hasYield = $condResult->hasYield();
 			$throwPoints = $condResult->getThrowPoints();
 			$impurePoints = $condResult->getImpurePoints();
 			$isAlwaysTerminating = $condResult->isAlwaysTerminating();
-			$matchScope = $scope->enterMatch($expr);
+			$matchScope = $scope->enterMatch($expr, $condType, $condNativeType);
 			$armNodes = [];
 			$hasDefaultCond = false;
 			$hasAlwaysTrueCond = false;

tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php

@@ -446,4 +446,23 @@ public function testBug9534(): void
 		]);
 	}
 
+	#[RequiresPhp('>= 8.0')]
+	public function testBug11310(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11310.php'], [
+			[
+				'Match arm comparison between int<1, max> and 0 is always false.',
+				24,
+			],
+			[
+				'Match arm comparison between int<1, 6>|int<8, 14> and 0 is always false.',
+				49,
+			],
+			[
+				'Match arm comparison between 1|2|3|4|5|6 and 0 is always false.',
+				74,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-11310.php

@@ -0,0 +1,78 @@
+<?php // lint >= 8.0
+
+namespace Bug11310;
+
+/** @param int<0, max> $i */
+function foo(int $i): void {
+	echo match ($i++) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param int<0, max> $i */
+function bar(int $i): void {
+	echo match ($i--) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param int<0, max> $i */
+function baz(int $i): void {
+	echo match (++$i) {
+		0 => 'zero',
+		1 => 'one',
+		default => 'default',
+	};
+}
+
+/** @param int<0, 5>|int<7, 13> $i */
+function foo2(int $i): void {
+	echo match ($i++) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param int<0, 5>|int<7, 13> $i */
+function bar2(int $i): void {
+	echo match ($i--) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param int<0, 5>|int<7, 13> $i */
+function baz2(int $i): void {
+	echo match (++$i) {
+		0 => 'zero',
+		1 => 'one',
+		default => 'default',
+	};
+}
+
+/** @param 0|1|2|3|4|5 $i */
+function foo3(int $i): void {
+	echo match ($i++) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param 0|1|2|3|4|5 $i */
+function bar3(int $i): void {
+	echo match ($i--) {
+		0 => 'zero',
+		default => 'default',
+	};
+}
+
+/** @param 0|1|2|3|4|5 $i */
+function baz3(int $i): void {
+	echo match (++$i) {
+		0 => 'zero',
+		1 => 'one',
+		default => 'default',
+	};
+}