Fix #20395: Add PHPStan/Psalm annotations for ActiveForm::validate and ArrayHelper::merge

Author: samuelrajan747

framework/CHANGELOG.md

@@ -19,6 +19,8 @@ Yii Framework 2 Change Log
 - Bug #20373: Fixed the type of the first parameter `yii\base\Controller::bindInjectedParams()` (max-s-lab)
 - Enh #20374: Add PHPStan/Psalm annotations for `BaseYii`, `BaseObject`, `Component`, `Model`, `Module` and `yii\base\Controller` (max-s-lab)
 - Enh #20394: Add PHPStan/Psalm annotations for `Yii::getAlias` (max-s-lab)
+- Enh #20395: Add PHPStan/Psalm annotations for `ActiveForm::validate` (samuelrajan747)
+- Enh #20397: Add PHPStan/Psalm annotations for `ArrayHelper::merge` (samuelrajan747)
 
 
 2.0.52 February 13, 2025

framework/helpers/BaseArrayHelper.php

@@ -117,8 +117,18 @@ public static function toArray($object, $properties = [], $recursive = true)
      * @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>
      */
-    public static function merge($a, $b)
+    public static function merge($a, ...$b)
     {
         $args = func_get_args();
         $res = array_shift($args);