Match expression isset() fix

ondrejmirtes · ondrejmirtes · commit 3c7d9c8dcf6a · 2022-04-24T11:22:43.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -703,35 +703,6 @@ private function resolveType(Expr $node): Type
 			return new ConstantBooleanType(!$result);
 		}
 
-		if ($node instanceof Expr\Isset_) {
-			$issetResult = true;
-			foreach ($node->vars as $var) {
-				$result = $this->issetCheck($var, static function (Type $type): ?bool {
-					$isNull = (new NullType())->isSuperTypeOf($type);
-					if ($isNull->maybe()) {
-						return null;
-					}
-
-					return !$isNull->yes();
-				});
-				if ($result !== null) {
-					if (!$result) {
-						return new ConstantBooleanType($result);
-					}
-
-					continue;
-				}
-
-				$issetResult = $result;
-			}
-
-			if ($issetResult === null) {
-				return new BooleanType();
-			}
-
-			return new ConstantBooleanType($issetResult);
-		}
-
 		if ($node instanceof Node\Expr\BooleanNot) {
 			if ($this->treatPhpDocTypesAsCertain) {
 				$exprBooleanType = $this->getType($node->expr)->toBoolean();
@@ -2020,6 +1991,35 @@ private function resolveType(Expr $node): Type
 			return $this->moreSpecificTypes[$exprString]->getType();
 		}
 
+		if ($node instanceof Expr\Isset_) {
+			$issetResult = true;
+			foreach ($node->vars as $var) {
+				$result = $this->issetCheck($var, static function (Type $type): ?bool {
+					$isNull = (new NullType())->isSuperTypeOf($type);
+					if ($isNull->maybe()) {
+						return null;
+					}
+
+					return !$isNull->yes();
+				});
+				if ($result !== null) {
+					if (!$result) {
+						return new ConstantBooleanType($result);
+					}
+
+					continue;
+				}
+
+				$issetResult = $result;
+			}
+
+			if ($issetResult === null) {
+				return new BooleanType();
+			}
+
+			return new ConstantBooleanType($issetResult);
+		}
+
 		if ($node instanceof Expr\AssignOp\Coalesce) {
 			return $this->getType(new BinaryOp\Coalesce($node->var, $node->expr, $node->getAttributes()));
 		}
diff --git a/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php b/tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php
@@ -185,4 +185,13 @@ public function testBug6115(): void
 		]);
 	}
 
+	public function testBug7095(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-7095.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-7095.php b/tests/PHPStan/Rules/Comparison/data/bug-7095.php
@@ -0,0 +1,8 @@
+<?php // lint >= 8.0
+
+namespace Bug7095;
+
+match (isset($foo)) {
+	true => 'a',
+	false => 'b',
+};

Original file line number	Diff line number	Diff line change
`@@ -185,4 +185,13 @@ public function testBug6115(): void`
`185`	`185`	`]);`
`186`	`186`	`}`
`187`	`187`
	`188`	`+ public function testBug7095(): void`
	`189`	`+ {`
	`190`	`+ if (PHP_VERSION_ID < 80000) {`
	`191`	`+ $this->markTestSkipped('Test requires PHP 8.0.');`
	`192`	`+ }`
	`193`	`+`
	`194`	`+ $this->analyse([__DIR__ . '/data/bug-7095.php'], []);`
	`195`	`+ }`
	`196`	`+`
`188`	`197`	`}`