Improve psalm types in ArrayHelper::group() (#171)

Author: vjik

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Enh #168: Add benchmark, improve `ArrayHelper::htmlEncode()` performance (@samdark)
 - Enh #169: Bump `yiisoft/strings` dependency to `^2.6` (@vjik)
+- Enh #171: Improve psalm types in `ArrayHelper::group()` (@vjik)
 
 ## 3.2.0 February 01, 2025
 

composer.json

@@ -33,12 +33,12 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit": "^10.5.45",
-        "rector/rector": "^2.0.9",
+        "phpunit/phpunit": "^10.5.48",
+        "rector/rector": "^2.1.2",
         "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
         "vimeo/psalm": "^5.26.1 || ^6.5.1",
-        "phpbench/phpbench": "^1.4"
+        "phpbench/phpbench": "^1.4.1"
     },
     "autoload": {
         "psr-4": {
@@ -52,7 +52,6 @@
     },
     "config": {
         "sort-packages": true,
-        "bump-after-update": "dev",
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true,
             "infection/extension-installer": true,

src/ArrayHelper.php

@@ -797,12 +797,15 @@ public static function index(
      * @param Closure[]|string|string[] $groups The array of keys that will be used to group the input array
      * by one or more keys.
      *
-     * @psalm-param iterable<mixed, array|object> $array
-     *
      * @return array The grouped array.
+     *
+     * @template T as array|object
+     * @psalm-param iterable<mixed, T> $array
+     * @psalm-return array<non-empty-list<T>>
      */
     public static function group(iterable $array, array|string $groups): array
     {
+        /** @psalm-var array<non-empty-list<T>> */
         return self::index($array, null, $groups);
     }