Rework

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -2987,7 +2987,7 @@ private static function intersectButNotNever(Type $nativeType, Type $inferredTyp
 		return $result;
 	}
 
-	public function enterMatch(Expr\Match_ $expr, ?Type $condType, ?Type $condNativeType): 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, ?Type $condType, ?Type $condNative
 			return $this;
 		}
 
-		$type = $condType ?? $this->getType($cond);
-		$nativeType = $condNativeType ?? $this->getNativeType($cond);
+		$type = $condType;
+		$nativeType = $condNativeType;
 		$condExpr = new AlwaysRememberedExpr($cond, $type, $nativeType);
 		$expr->cond = $condExpr;
 

src/Analyser/NodeScopeResolver.php

@@ -4178,10 +4178,6 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$hasYield = true;
 		} elseif ($expr instanceof Expr\Match_) {
 			$deepContext = $context->enterDeep();
-			$condIsIncDec = $expr->cond instanceof Expr\PreInc
-				|| $expr->cond instanceof Expr\PostInc
-				|| $expr->cond instanceof Expr\PreDec
-				|| $expr->cond instanceof Expr\PostDec;
 			$condType = $scope->getType($expr->cond);
 			$condNativeType = $scope->getNativeType($expr->cond);
 			$condResult = $this->processExprNode($stmt, $expr->cond, $scope, $storage, $nodeCallback, $deepContext);
@@ -4190,7 +4186,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$throwPoints = $condResult->getThrowPoints();
 			$impurePoints = $condResult->getImpurePoints();
 			$isAlwaysTerminating = $condResult->isAlwaysTerminating();
-			$matchScope = $scope->enterMatch($expr, $condIsIncDec ? $condType : null, $condIsIncDec ? $condNativeType : null);
+			$matchScope = $scope->enterMatch($expr, $condType, $condNativeType);
 			$armNodes = [];
 			$hasDefaultCond = false;
 			$hasAlwaysTrueCond = false;