Fixed some Psalm issues

src/AutoMapper/RestRequestMapper.php

@@ -43,7 +43,7 @@ abstract class RestRequestMapper implements MapperInterface
      */
     public function map($source, string $targetClass, array $context = []): RestDtoInterface
     {
-        /** @psalm-var class-string $targetClass */
+        /** @psalm-var class-string<RestDtoInterface> $targetClass */
         $destination = new $targetClass();
 
         return $this->mapToObject($source, $destination, $context);

src/Command/ApiKey/ApiKeyHelper.php

@@ -11,10 +11,8 @@
 use App\Entity\ApiKey;
 use App\Resource\ApiKeyResource;
 use App\Security\RolesService;
-use Closure;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Throwable;
-use function array_map;
 use function implode;
 use function sprintf;
 
@@ -90,35 +88,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() 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 @@
     /**
      * Getter method for formatted API key rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */
@@ -99,7 +99,7 @@
             $apiToken->getId(),
             $apiToken->getToken(),
             $apiToken->getDescription(),
             implode(",\n", $apiToken->getUserGroups()->map($userGroupFormatter)->toArray()),
             implode(",\n", $this->rolesService->getInheritedRoles($apiToken->getRoles())),
         ];
     }

src/Command/User/ListUserGroupsCommand.php

@@ -67,7 +67,7 @@
     /**
      * Getter method for formatted user group rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */
@@ -98,7 +98,7 @@
             $userGroup->getId(),
             $userGroup->getName(),
             $userGroup->getRole()->getId(),
             implode(",\n", $userGroup->getUsers()->map($userFormatter)->toArray()),
         ];
     }
 }

src/Command/User/ListUsersCommand.php

@@ -71,7 +71,7 @@
     /**
      * Getter method for formatted user rows for console table.
      *
-     * @return array<int, string>
+     * @return array<array-key, mixed>
      *
      * @throws Throwable
      */
@@ -103,7 +103,7 @@
             $user->getEmail(),
             $user->getFirstName() . ' ' . $user->getLastName(),
             implode(",\n", $this->roles->getInheritedRoles($user->getRoles())),
             implode(",\n", $user->getUserGroups()->map($userGroupFormatter)->toArray()),
         ];
     }
 }

src/Rest/Interfaces/SearchTermInterface.php

@@ -37,7 +37,7 @@ interface SearchTermInterface
      * @param int|null                  $mode    Used mode on LIKE search. See MODE_* constants. Defaults to
      *                                           self::MODE_FULL
      *
-     * @return array<string, array<string, array<string, string>>>|null
+     * @return array<string, array<string, array<string, mixed>>>|null
      */
     public static function getCriteria(
         array | string $column,