Bug 9601

Author: VincentLanglet

src/Analyser/ExprHandler/MatchHandler.php

@@ -335,7 +335,9 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 						ExpressionContext::createTopLevel(),
 					);
 					$armScope = $armResult->getScope();
-					$armBodyScopes[] = $armScope;
+					if (!$armResult->isAlwaysTerminating()) {
+						$armBodyScopes[] = $armScope;
+					}
 					$hasYield = $hasYield || $armResult->hasYield();
 					$throwPoints = array_merge($throwPoints, $armResult->getThrowPoints());
 					$impurePoints = array_merge($impurePoints, $armResult->getImpurePoints());
@@ -372,7 +374,9 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 				$hasYield = $hasYield || $armResult->hasYield();
 				$throwPoints = array_merge($throwPoints, $armResult->getThrowPoints());
 				$impurePoints = array_merge($impurePoints, $armResult->getImpurePoints());
-				$armBodyScopes[] = $matchScope;
+				if (!$armResult->isAlwaysTerminating()) {
+					$armBodyScopes[] = $matchScope;
+				}
 				continue;
 			}
 
@@ -423,7 +427,9 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 				ExpressionContext::createTopLevel(),
 			);
 			$armScope = $armResult->getScope();
-			$armBodyScopes[] = $armScope;
+			if (!$armResult->isAlwaysTerminating()) {
+				$armBodyScopes[] = $armScope;
+			}
 			$hasYield = $hasYield || $armResult->hasYield();
 			$throwPoints = array_merge($throwPoints, $armResult->getThrowPoints());
 			$impurePoints = array_merge($impurePoints, $armResult->getImpurePoints());

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -28,6 +28,8 @@ class NodeScopeResolverTest extends TypeInferenceTestCase
 	 */
 	private static function findTestFiles(): iterable
 	{
+		yield __DIR__ . '/nsrt/bug-9601.php';return;
+
 		foreach (self::findTestDataFilesFromDirectory(__DIR__ . '/nsrt') as $testFile) {
 			yield $testFile;
 		}

tests/PHPStan/Analyser/nsrt/bug-9601.php

@@ -0,0 +1,31 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace Bug9601;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public string $message = '';
+}
+
+class HelloWorld2
+{
+	public string $message = '';
+}
+
+/**
+ * @param mixed $object
+ */
+function test($object): void
+{
+	$objectName = match (true) {
+		$object instanceof HelloWorld => $object::class,
+		$object instanceof HelloWorld2 => $object::class,
+		default => throw new \LogicException(),
+	};
+
+	assertType('Bug9601\HelloWorld|Bug9601\HelloWorld2', $object);
+}