Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Aug 12, 2024 · 883f637 · 883f637
2 parents d401944 + 708d938
commit 883f637
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -541,9 +541,7 @@ public function intersectKeyArray(Type $otherArraysType): Type
 		}
 
 		if ($isKeySuperType->yes()) {
-			return $otherArraysType->isIterableAtLeastOnce()->yes()
-				? TypeCombinator::intersect($this, new NonEmptyArrayType())
-				: $this;
+			return $this;
 		}
 
 		return new self($otherArraysType->getIterableKeyType(), $this->getIterableValueType());

diff --git a/tests/PHPStan/Analyser/nsrt/array-intersect-key.php b/tests/PHPStan/Analyser/nsrt/array-intersect-key.php
@@ -15,9 +15,9 @@ class Foo
 	public function nonEmpty(array $arr, array $arr2): void
 	{
 		assertType('non-empty-array<int|string, string>', array_intersect_key($arr));
-		assertType('non-empty-array<int|string, string>', array_intersect_key($arr, $arr));
+		assertType('array<int|string, string>', array_intersect_key($arr, $arr));
 		assertType('array<int, string>', array_intersect_key($arr, $arr2));
-		assertType('non-empty-array<int, string>', array_intersect_key($arr2, $arr));
+		assertType('array<int, string>', array_intersect_key($arr2, $arr));
 		assertType('array{}', array_intersect_key($arr, []));
 		assertType("array<'foo', string>", array_intersect_key($arr, ['foo' => 17]));
 	}

diff --git a/tests/PHPStan/Rules/Comparison/IfConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/IfConstantConditionRuleTest.php
@@ -162,4 +162,10 @@ public function testBug2499(): void
 		$this->analyse([__DIR__ . '/data/bug-2499.php'], []);
 	}
 
+	public function testBug10561(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-10561.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-10561.php b/tests/PHPStan/Rules/Comparison/data/bug-10561.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug10561;
+
+/**
+ * @param mixed[]   $arr1
+ * @param mixed[]   $arr2
+ */
+function func(array $arr1, array $arr2): void {
+
+	/** @var array<string, string>   $inner_arr1 */
+	$inner_arr1 = $arr1['inner_arr'];
+	/** @var array<string, string>   $inner_arr2 */
+	$inner_arr2 = $arr2['inner_arr'];
+
+	if (!$inner_arr1) {
+		return;
+	}
+	if (!$inner_arr2) {
+		return;
+	}
+
+	$arr_intersect = array_intersect_key($inner_arr1, $inner_arr2);
+	if ($arr_intersect) {
+		echo "not empty\n";
+	} else {
+		echo "empty\n";
+	}
+}
+
+$arr1 = ['inner_arr' => ['a' => 'b']];
+$arr2 = ['inner_arr' => ['c' => 'd']];
+func($arr1, $arr2); // Outputs "empty"