Fix gettype in match expression

phpstan · Jun 19, 2023 · e4ef00c · e4ef00c
1 parent b4a6eb4
commit e4ef00c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1043,6 +1043,11 @@ private function specifyTypesForConstantStringBinaryExpression(
 		?Expr $rootExpr,
 	): ?SpecifiedTypes
 	{
+		$unwrappedExprNode = $exprNode;
+		if ($exprNode instanceof AlwaysRememberedExpr) {
+			$unwrappedExprNode = $exprNode->getExpr();
+		}
+
 		if (
 			$context->truthy()
 			&& $exprNode instanceof FuncCall
@@ -1075,10 +1080,10 @@ private function specifyTypesForConstantStringBinaryExpression(
 		}
 
 		if (
-			$exprNode instanceof FuncCall
-			&& $exprNode->name instanceof Name
-			&& strtolower($exprNode->name->toString()) === 'gettype'
-			&& isset($exprNode->getArgs()[0])
+			$unwrappedExprNode instanceof FuncCall
+			&& $unwrappedExprNode->name instanceof Name
+			&& strtolower($unwrappedExprNode->name->toString()) === 'gettype'
+			&& isset($unwrappedExprNode->getArgs()[0])
 		) {
 			$type = null;
 			if ($constantType->getValue() === 'string') {
@@ -1107,8 +1112,8 @@ private function specifyTypesForConstantStringBinaryExpression(
 			}
 
 			if ($type !== null) {
-				$callType = $this->create($exprNode, $constantType, $context, false, $scope, $rootExpr);
-				$argType = $this->create($exprNode->getArgs()[0]->value, $type, $context, false, $scope, $rootExpr);
+				$callType = $this->create($unwrappedExprNode, $constantType, $context, false, $scope, $rootExpr);
+				$argType = $this->create($unwrappedExprNode->getArgs()[0]->value, $type, $context, false, $scope, $rootExpr);
 				return $callType->unionWith($argType);
 			}
 		}

diff --git a/tests/PHPStan/Analyser/data/match-expr.php b/tests/PHPStan/Analyser/data/match-expr.php
@@ -68,4 +68,12 @@ public function doBar(int $i): void
 		};
 	}
 
+	public function doGettype(int|float|bool|string|object|array $value): void
+	{
+		match (gettype($value)) {
+			'integer' => assertType('int', $value),
+			'string' => assertType('string', $value),
+		};
+	}
+
 }