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

phpstan · Sep 20, 2024 · d547ddc · d547ddc
2 parents e8027e7 + 06ab320
commit d547ddc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/stubs/arrayFunctions.stub b/stubs/arrayFunctions.stub
@@ -16,6 +16,14 @@ function array_reduce(
 	$three = null
 ) {}
 
+/**
+ * @template T of mixed
+ *
+ * @param array<T> $array
+ * @return ($array is non-empty-array ? non-empty-list<T> : list<T>)
+ */
+function array_values(array $array): array {}
+
 /**
  * @template TKey as (int|string)
  * @template T

diff --git a/tests/PHPStan/Analyser/nsrt/array_values.php b/tests/PHPStan/Analyser/nsrt/array_values.php
@@ -37,4 +37,12 @@ public function constantArrayType(): void
 		);
 		assertType("array{0?: 'a'|'b'|'c', 1?: 'b'|'c', 2?: 'c'}", array_values($numbers));
 	}
+
+	/**
+	 * @param array<string, non-empty-array<string, int>> $a
+	 */
+	public function arrayMap(array $a): void
+	{
+		assertType('array<string, non-empty-list<int>>', array_map(array_values(...), $a));
+	}
 }