Retain list type via array_push() and array_unshift()

rajyan · Jun 18, 2023 · 1f421d4 · 1f421d4
1 parent 92deb3f
commit 1f421d4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2928,7 +2928,7 @@ static function (?Type $offsetType, Type $valueType, bool $optional) use (&$arra
 					return;
 				}
 
-				$arrayType = new ArrayType($arrayType->getIterableKeyType(), $arrayType->getIterableValueType());
+				$arrayType = TypeCombinator::union($arrayType, new ConstantArrayType([], []));
 			},
 		);
 

diff --git a/tests/PHPStan/Analyser/data/array-push.php b/tests/PHPStan/Analyser/data/array-push.php
@@ -12,8 +12,9 @@
  * @param int[] $b
  * @param non-empty-array<int> $c
  * @param array<int|string> $d
+ * @param list<string> $e
  */
-function arrayPush(array $a, array $b, array $c, array $d, array $arr): void
+function arrayPush(array $a, array $b, array $c, array $d, array $e, array $arr): void
 {
 	array_push($a, ...$b);
 	assertType('array<int|string>', $a);
@@ -32,6 +33,11 @@ function arrayPush(array $a, array $b, array $c, array $d, array $arr): void
 	$d1 = [];
 	array_push($d, ...$d1);
 	assertType('array<bool|int|string|null>', $d);
+
+	/** @var list<bool> $e1 */
+	$e1 = [];
+	array_push($e, ...$e1);
+	assertType('list<bool|string>', $e);
 }
 
 function arrayPushConstantArray(): void

diff --git a/tests/PHPStan/Analyser/data/array-unshift.php b/tests/PHPStan/Analyser/data/array-unshift.php
@@ -12,8 +12,9 @@
  * @param int[] $b
  * @param non-empty-array<int> $c
  * @param array<int|string> $d
+ * @param list<string> $e
  */
-function arrayUnshift(array $a, array $b, array $c, array $d, array $arr): void
+function arrayUnshift(array $a, array $b, array $c, array $d, array $e, array $arr): void
 {
 	array_unshift($a, ...$b);
 	assertType('array<int|string>', $a);
@@ -32,6 +33,11 @@ function arrayUnshift(array $a, array $b, array $c, array $d, array $arr): void
 	$d1 = [];
 	array_unshift($d, ...$d1);
 	assertType('array<bool|int|string|null>', $d);
+
+	/** @var list<bool> $e1 */
+	$e1 = [];
+	array_unshift($e, ...$e1);
+	assertType('list<bool|string>', $e);
 }
 
 function arrayUnshiftConstantArray(): void

diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -1252,6 +1252,11 @@ public function testBug8389(): void
 		$this->analyse([__DIR__ . '/data/bug-8389.php'], []);
 	}
 
+	public function testBug8449(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8449.php'], []);
+	}
+
 	public function testBug5288(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-5288.php'], []);

diff --git a/tests/PHPStan/Rules/Functions/data/bug-8449.php b/tests/PHPStan/Rules/Functions/data/bug-8449.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8449;
+
+/** @var list<int> $a */
+$a = [1];
+/** @var list<int> $b */
+$b = [2];
+
+array_push($a, ...$b);
+
+/**
+ * @param list<int> $parameter
+ */
+function test(array $parameter): void
+{
+}
+
+test($a);