Fix removeTypeFromExpression()

phpstan · May 6, 2020 · 7747262 · 7747262
1 parent ce0bc46
commit 7747262
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2866,14 +2866,22 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 		);
 	}
 
-	public function removeTypeFromExpression(Expr $expr, Type $type): self
+	public function removeTypeFromExpression(Expr $expr, Type $typeToRemove): self
 	{
+		$exprType = $this->getType($expr);
+		$typeAfterRemove = TypeCombinator::remove($exprType, $typeToRemove);
+		if (
+			!$expr instanceof Variable
+			&& $exprType->equals($typeAfterRemove)
+		) {
+			return $this;
+		}
 		$scope = $this->specifyExpressionType(
 			$expr,
-			TypeCombinator::remove($this->getType($expr), $type)
+			$typeAfterRemove
 		);
 		if ($expr instanceof Variable && is_string($expr->name)) {
-			$scope->nativeExpressionTypes[sprintf('$%s', $expr->name)] = TypeCombinator::remove($this->getNativeType($expr), $type);
+			$scope->nativeExpressionTypes[sprintf('$%s', $expr->name)] = TypeCombinator::remove($this->getNativeType($expr), $typeToRemove);
 		}
 
 		return $scope;