php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 06:11:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update PHPStan/Psalm annotations for ArrayHelper::merge (#20430)

Browse Source 
Co-authored-by: Samuel Rajan D <samuelrajan.david@handbuiltapps.com>
This commit is contained in:
Samuel Rajan D
2025-06-27 13:01:26 +05:30
committed by GitHub
parent f3eefee572
commit a7aa327b19
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
framework/helpers/BaseArrayHelper.php
View File

@ -117,16 +117,20 @@ class BaseArrayHelper
* @param array $b array to be merged from. You can specify additional
* arrays via third argument, fourth argument etc.
* @return array the merged array (the original arrays are not changed.)
* @phpstan-template TItemA
* @phpstan-template TItemB
* @psalm-template TItemA
* @psalm-template TItemB
* @phpstan-param array<TItemA> $a
* @phpstan-param array<array<TItemB>> ...$b
* @psalm-param array<TItemA> $a
* @psalm-param array<array<TItemB>> ...$b
* @phpstan-return array<TItemA|TItemB>
* @psalm-return array<TItemA|TItemB>
* @phpstan-template TKeyA
* @phpstan-template TValueA
* @phpstan-template TKeyB
* @phpstan-template TValueB
* @psalm-template TKeyA
* @psalm-template TValueA
* @psalm-template TKeyB
* @psalm-template TValueB
* @phpstan-param array<TKeyA, TValueA> $a
* @phpstan-param array<array<TKeyB, TValueB>> ...$b
* @psalm-param array<TKeyA, TValueA> $a
* @psalm-param array<array<TKeyB, TValueB>> ...$b
* @phpstan-return array<TKeyA|TKeyB, TValueA|TValueB>
* @psalm-return array<TKeyA|TKeyB, TValueA|TValueB>
*/
public static function merge($a, ...$b)
{