ExpressionTypeHolder - variadic mergeWith preparation

Author: ondrejmirtes

src/Analyser/ExpressionTypeHolder.php

@@ -6,6 +6,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use function count;
 
 final class ExpressionTypeHolder
 {
@@ -33,21 +34,34 @@ public function equals(self $other): bool
 		return $this->type->equals($other->type);
 	}
 
-	public function and(self $other): self
+	public function and(self ...$others): self
 	{
-		if ($this->type->equals($other->type)) {
-			if ($this->certainty->equals($other->certainty)) {
-				return $this;
+		if ($others === []) {
+			return $this;
+		}
+
+		$types = [$this->type];
+		$certainty = $this->certainty;
+		foreach ($others as $other) {
+			$certainty = $certainty->and($other->certainty);
+			if ($types[0] === $other->type || $other->type->equals($types[0])) {
+				continue;
 			}
+			$types[] = $other->type;
+		}
 
-			$type = $this->type;
-		} else {
-			$type = TypeCombinator::union($this->type, $other->type);
+		if (count($types) === 1) {
+			return new self(
+				$this->expr,
+				$types[0],
+				$certainty,
+			);
 		}
+
 		return new self(
 			$this->expr,
-			$type,
-			$this->certainty->and($other->certainty),
+			TypeCombinator::union(...$types),
+			$certainty,
 		);
 	}
 

tests/PHPStan/Analyser/nsrt/array-key-exists.php

@@ -101,7 +101,7 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int
 			assertType("'3'|'4'", $key2);
 		}
 		if (array_key_exists($key3, [3 => 'foo', 4 => 'bar'])) {
-			assertType("3|4|'3'|'4'", $key3);
+			assertType("(3|4|'3'|'4')", $key3);
 		}
 		if (array_key_exists($key4, [3 => 'foo', 4 => 'bar'])) {
 			assertType("(3|4|'3'|'4')", $key4);

tests/PHPStan/Analyser/nsrt/key-exists.php

@@ -100,7 +100,7 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int
 			assertType("'3'|'4'", $key2);
 		}
 		if (key_exists($key3, [3 => 'foo', 4 => 'bar'])) {
-			assertType("3|4|'3'|'4'", $key3);
+			assertType("(3|4|'3'|'4')", $key3);
 		}
 		if (key_exists($key4, [3 => 'foo', 4 => 'bar'])) {
 			assertType("(3|4|'3'|'4')", $key4);