Revert "More match fixes"

This reverts commit d87b3a5.

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -1527,20 +1527,17 @@ private function resolveType(string $exprString, Expr $node): Type
 					);
 				}
 
-				$noopCallback = static function (): void {
-				};
-				$filteringExprResult = $this->nodeScopeResolver->processExprNode(new Node\Stmt\Expression($filteringExpr), $filteringExpr, $matchScope, $noopCallback, ExpressionContext::createDeep());
-
 				$filteringExprType = $matchScope->getType($filteringExpr);
+
 				if (!$filteringExprType->isFalse()->yes()) {
-					$truthyScope = $filteringExprResult->getTruthyScope();
+					$truthyScope = $matchScope->filterByTruthyValue($filteringExpr);
 					if ($node->hasAttribute(self::KEEP_VOID_ATTRIBUTE_NAME)) {
 						$arm->body->setAttribute(self::KEEP_VOID_ATTRIBUTE_NAME, $node->getAttribute(self::KEEP_VOID_ATTRIBUTE_NAME));
 					}
 					$types[] = $truthyScope->getType($arm->body);
 				}
 
-				$matchScope = $filteringExprResult->getFalseyScope();
+				$matchScope = $matchScope->filterByFalseyValue($filteringExpr);
 			}
 
 			return TypeCombinator::union(...$types);

src/Analyser/NodeScopeResolver.php

@@ -2885,24 +2885,23 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 					);
 				}
 
-				$filteringExprResult = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
-				}, $deepContext);
-				$truthyScope = $filteringExprResult->getTruthyScope();
-				$matchArmBody = new MatchExpressionArmBody($truthyScope, $arm->body);
+				$bodyScope = $this->processExprNode($stmt, $filteringExpr, $matchScope, static function (): void {
+				}, $deepContext)->getTruthyScope();
+				$matchArmBody = new MatchExpressionArmBody($bodyScope, $arm->body);
 				$armNodes[] = new MatchExpressionArm($matchArmBody, $condNodes, $arm->getLine());
 
 				$armResult = $this->processExprNode(
 					$stmt,
 					$arm->body,
-					$truthyScope,
+					$bodyScope,
 					$nodeCallback,
 					ExpressionContext::createTopLevel(),
 				);
 				$armScope = $armResult->getScope();
 				$scope = $scope->mergeWith($armScope);
 				$hasYield = $hasYield || $armResult->hasYield();
 				$throwPoints = array_merge($throwPoints, $armResult->getThrowPoints());
-				$matchScope = $filteringExprResult->getFalseyScope();
+				$matchScope = $matchScope->filterByFalseyValue($filteringExpr);
 			}
 
 			$remainingType = $matchScope->getType($expr->cond);

tests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.php

@@ -534,4 +534,13 @@ public function testBug6407(): void
 		$this->analyse([__DIR__ . '/data/bug-6407.php'], []);
 	}
 
+	public function testBugUnhandledTrueWithComplexCondition(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-unhandled-true-with-complex-condition.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-unhandled-true-with-complex-condition.php

@@ -0,0 +1,34 @@
+<?php // lint >= 8.1
+
+namespace MatchUnhandledTrueWithComplexCondition;
+
+enum Bar
+{
+
+	case ONE;
+	case TWO;
+	case THREE;
+
+}
+
+class Foo
+{
+
+	public Bar $type;
+
+	public function getRand(): int
+	{
+		return rand(0, 10);
+	}
+
+	public function getPriority(): int
+	{
+		return match (true) {
+			$this->type === Bar::ONE => 0,
+			$this->type === Bar::TWO && $this->getRand() !== 8 => 1,
+			$this->type === BAR::THREE => 2,
+			$this->type === BAR::TWO => 3,
+		};
+	}
+
+}