Fixed more Psalm issues

Author: tarlepp

src/Command/ApiKey/ApiKeyHelper.php

@@ -90,35 +90,20 @@ public function getApiKeyMessage(string $message, ApiKey $apiKey): array
      */
     private function getApiKeyEntity(SymfonyStyle $io, string $question): ?ApiKey
     {
+        /** @var array<string, string> $choices */
         $choices = [];
 
-        array_map(
-            $this->getApiKeyIterator($choices),
-            $this->apiKeyResource->find(orderBy: [
-                'token' => 'ASC',
-            ])
-        );
-
-        $choices['Exit'] = 'Exit command';
-
-        return $this->apiKeyResource->findOne((string)$io->choice($question, $choices));
-    }
-
-    /**
-     * Method to return ApiKeyIterator closure. This will format ApiKey
-     * entities for choice list.
-     *
-     * @param array<string, string> $choices
-     */
-    private function getApiKeyIterator(array &$choices): Closure
-    {
-        return function (ApiKey $apiKey) use (&$choices): void {
+        foreach ($this->apiKeyResource->find(orderBy: ['token' => 'ASC']) as $apiKey) {
             $choices[$apiKey->getId()] = sprintf(
                 '[Token: %s] %s - Roles: %s',
                 $apiKey->getToken(),
                 $apiKey->getDescription(),
                 implode(', ', $this->rolesService->getInheritedRoles($apiKey->getRoles())),
             );
-        };
+        }
+
+        $choices['Exit'] = 'Exit command';
+
+        return $this->apiKeyResource->findOne((string)$io->choice($question, $choices));
     }
 }

src/Command/ApiKey/ListApiKeysCommand.php

@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * Getter method for formatted API key rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */

src/Command/User/ListUserGroupsCommand.php

@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * Getter method for formatted user group rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */

src/Command/User/ListUsersCommand.php

@@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * Getter method for formatted user rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */