Fix ConstantArrayType::isSuperTypeOf() for empty array

phpstan · Aug 8, 2024 · ed6bc0b · ed6bc0b
1 parent 6321600
commit ed6bc0b
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 8 deletions.
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -364,14 +364,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
 		if ($type instanceof self) {
 			if (count($this->keyTypes) === 0) {
-				if (count($type->keyTypes) > 0) {
-					if (count($type->optionalKeys) > 0) {
-						return TrinaryLogic::createMaybe();
-					}
-					return TrinaryLogic::createNo();
-				}
-
-				return TrinaryLogic::createYes();
+				return $type->isIterableAtLeastOnce()->negate();
 			}
 
 			$results = [];

diff --git a/tests/PHPStan/Type/TypeCombinatorTest.php b/tests/PHPStan/Type/TypeCombinatorTest.php
@@ -4252,6 +4252,56 @@ public function dataIntersect(): iterable
 			ClosureType::class,
 			'pure-Closure',
 		];
+
+		$xy = new ConstantArrayType([
+			new ConstantIntegerType(0),
+		], [
+			new ConstantStringType('xy'),
+		]);
+		$abxy = new ConstantArrayType([
+			new ConstantIntegerType(0),
+			new ConstantIntegerType(1),
+		], [
+			new ConstantStringType('ab'),
+			new ConstantStringType('xy'),
+		], [2], [1]);
+
+		yield [
+			[
+				new UnionType([
+					new ConstantArrayType([], []),
+					$xy,
+					$abxy,
+				]),
+				new UnionType([
+					$xy,
+					$abxy,
+				]),
+			],
+			UnionType::class,
+			"array{'xy'}|array{0: 'ab', 1?: 'xy'}",
+		];
+
+		yield [
+			[
+				new ConstantArrayType([], []),
+				new UnionType([
+					$xy,
+					$abxy,
+				]),
+			],
+			NeverType::class,
+			'*NEVER*=implicit',
+		];
+
+		yield [
+			[
+				new ConstantArrayType([], []),
+				$abxy,
+			],
+			NeverType::class,
+			'*NEVER*=implicit',
+		];
 	}
 
 	/**