Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2201 - remove 4 params stub restriction on variadic array functions #2212

Merged
merged 1 commit into from
Oct 6, 2019
Merged

Fix #2201 - remove 4 params stub restriction on variadic array functions #2212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/Psalm/Internal/Stubs/CoreGenericFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,12 @@ function array_unique(array $arr, int $sort_flags = 0)
*
* @param array<TKey, TValue> $arr
* @param array $arr2
* @param array|null $arr3
* @param array|null $arr4
* @param array ...$arr3
*
* @return array<TKey, TValue>
* @psalm-pure
*/
function array_intersect(array $arr, array $arr2, array $arr3 = null, array $arr4 = null)
function array_intersect(array $arr, array $arr2, array ...$arr3)
{
}

Expand All @@ -61,13 +60,12 @@ function array_intersect(array $arr, array $arr2, array $arr3 = null, array $arr
*
* @param array<TKey, TValue> $arr
* @param array $arr2
* @param array|null $arr3
* @param array|null $arr4
* @param array ...$arr3
*
* @return array<TKey, TValue>
* @psalm-pure
*/
function array_intersect_key(array $arr, array $arr2, array $arr3 = null, array $arr4 = null)
function array_intersect_key(array $arr, array $arr2, array ...$arr3)
{
}

Expand All @@ -92,13 +90,12 @@ function array_combine(array $arr, array $arr2)
*
* @param array<TKey, TValue> $arr
* @param array $arr2
* @param array|null $arr3
* @param array|null $arr4
* @param array ...$arr3
*
* @return array<TKey, TValue>
* @psalm-pure
*/
function array_diff(array $arr, array $arr2, array $arr3 = null, array $arr4 = null)
function array_diff(array $arr, array $arr2, array ...$arr3)
{
}

Expand All @@ -108,13 +105,12 @@ function array_diff(array $arr, array $arr2, array $arr3 = null, array $arr4 = n
*
* @param array<TKey, TValue> $arr
* @param array $arr2
* @param array|null $arr3
* @param array|null $arr4
* @param array ...$arr3
*
* @return array<TKey, TValue>
* @psalm-pure
*/
function array_diff_key(array $arr, array $arr2, array $arr3 = null, array $arr4 = null)
function array_diff_key(array $arr, array $arr2, array ...$arr3)
{
}

Expand Down
20 changes: 20 additions & 0 deletions tests/FunctionCallTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,16 @@ function foo() { }
'$d' => 'array<string, int>',
],
],
'arrayDiffIsVariadic' => [
'<?php
array_diff([], [], [], [], []);',
'assertions' => [],
],
'arrayDiffKeyIsVariadic' => [
'<?php
array_diff_key([], [], [], [], []);',
'assertions' => [],
],
'arrayPopMixed' => [
'<?php
/** @var mixed */
Expand Down Expand Up @@ -1032,6 +1042,16 @@ function strtr_wrapper($str, array $replace_pairs) {
'$bar' => 'array<int, int>',
],
],
'arrayIntersectIsVariadic' => [
'<?php
array_intersect([], [], [], [], []);',
'assertions' => [],
],
'arrayIntersectKeyIsVariadic' => [
'<?php
array_intersect_key([], [], [], [], []);',
'assertions' => [],
],
'arrayReduce' => [
'<?php
$arr = [2, 3, 4, 5];
Expand Down