Fix psalm

Author: ajgarlag

src/Command/CreateClientCommand.php

@@ -135,11 +135,11 @@ private function buildClientFromInput(InputInterface $input): ClientInterface
         $client->setActive(true);
         $client->setAllowPlainTextPkce($input->getOption('allow-plain-text-pkce'));
 
-        /** @var list<string> $redirectUriStrings */
+        /** @var list<non-empty-string> $redirectUriStrings */
         $redirectUriStrings = $input->getOption('redirect-uri');
-        /** @var list<string> $grantStrings */
+        /** @var list<non-empty-string> $grantStrings */
         $grantStrings = $input->getOption('grant-type');
-        /** @var list<string> $scopeStrings */
+        /** @var list<non-empty-string> $scopeStrings */
         $scopeStrings = $input->getOption('scope');
 
         return $client

src/Command/ListClientsCommand.php

@@ -80,11 +80,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     private function getFindByCriteria(InputInterface $input): ClientFilter
     {
-        /** @var list<string> $grantStrings */
+        /** @var list<non-empty-string> $grantStrings */
         $grantStrings = $input->getOption('grant-type');
-        /** @var list<string> $redirectUriStrings */
+        /** @var list<non-empty-string> $redirectUriStrings */
         $redirectUriStrings = $input->getOption('redirect-uri');
-        /** @var list<string> $scopeStrings */
+        /** @var list<non-empty-string> $scopeStrings */
         $scopeStrings = $input->getOption('scope');
 
         return ClientFilter::create()

src/Converter/UserConverter.php

@@ -18,7 +18,11 @@ public function toLeague(?UserInterface $user): UserEntityInterface
     {
         $userEntity = new User();
         if ($user instanceof UserInterface) {
-            $userEntity->setIdentifier(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername());
+            $identifier = method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername();
+            if ('' === $identifier) {
+                throw new \RuntimeException('Emtpy identifier not allowed');
+            }
+            $userEntity->setIdentifier($identifier);
         }
 
         return $userEntity;

src/DBAL/Type/ImplodedArray.php

@@ -49,6 +49,7 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): arr
 
         \assert(\is_string($value), 'Expected $value of be either a string or null.');
 
+        /** @var list<non-empty-string> $values */
         $values = explode(self::VALUE_DELIMITER, $value);
 
         return $this->convertDatabaseValues($values);
@@ -87,7 +88,7 @@ private function assertValueCanBeImploded($value): void
     }
 
     /**
-     * @param list<string> $values
+     * @param list<non-empty-string> $values
      *
      * @return list<T>
      */

src/DBAL/Type/Scope.php

@@ -22,7 +22,7 @@ public function getName(): string
     }
 
     /**
-     * @param list<string> $values
+     * @param list<non-empty-string> $values
      *
      * @return list<ScopeModel>
      */

src/EventListener/AddClientDefaultScopesListener.php

@@ -15,12 +15,12 @@
 class AddClientDefaultScopesListener
 {
     /**
-     * @var list<string>
+     * @var list<non-empty-string>
      */
     private $defaultScopes;
 
     /**
-     * @param list<string> $defaultScopes
+     * @param list<non-empty-string> $defaultScopes
      */
     public function __construct(array $defaultScopes)
     {

src/Model/AbstractClient.php

@@ -16,6 +16,7 @@
 abstract class AbstractClient implements ClientInterface
 {
     private string $name;
+    /** @var non-empty-string */
     protected string $identifier;
     private ?string $secret;
 
@@ -33,6 +34,8 @@ abstract class AbstractClient implements ClientInterface
 
     /**
      * @psalm-mutation-free
+     *
+     * @param non-empty-string $identifier
      */
     public function __construct(string $name, string $identifier, ?string $secret)
     {

src/Model/ClientInterface.php

@@ -13,6 +13,9 @@
  */
 interface ClientInterface
 {
+    /**
+     * @return non-empty-string
+     */
     public function getIdentifier(): string;
 
     public function getSecret(): ?string;

src/Repository/AccessTokenRepository.php

@@ -42,12 +42,13 @@ public function __construct(
         $this->scopeConverter = $scopeConverter;
     }
 
-    public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, mixed $userIdentifier = null): AccessTokenEntityInterface
+    public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, ?string $userIdentifier = null): AccessTokenEntityInterface
     {
-        /** @var int|string|null $userIdentifier */
         $accessToken = new AccessTokenEntity();
         $accessToken->setClient($clientEntity);
-        $accessToken->setUserIdentifier($userIdentifier);
+        if (null !== $userIdentifier && '' !== $userIdentifier) {
+            $accessToken->setUserIdentifier($userIdentifier);
+        }
 
         foreach ($scopes as $scope) {
             $accessToken->addScope($scope);
@@ -99,9 +100,6 @@ private function buildAccessTokenModel(AccessTokenEntityInterface $accessTokenEn
         $client = $this->clientManager->find($accessTokenEntity->getClient()->getIdentifier());
 
         $userIdentifier = $accessTokenEntity->getUserIdentifier();
-        if (null !== $userIdentifier) {
-            $userIdentifier = (string) $userIdentifier;
-        }
 
         return new AccessTokenModel(
             $accessTokenEntity->getIdentifier(),

src/Repository/AuthCodeRepository.php

@@ -90,7 +90,7 @@ private function buildAuthorizationCode(AuthCodeEntityInterface $authCodeEntity)
 
         $userIdentifier = $authCodeEntity->getUserIdentifier();
         if (null !== $userIdentifier) {
-            $userIdentifier = (string) $userIdentifier;
+            $userIdentifier = $userIdentifier;
         }
 
         return new AuthorizationCode(

src/Repository/NullAccessTokenRepository.php

@@ -11,12 +11,13 @@
 
 final class NullAccessTokenRepository implements AccessTokenRepositoryInterface
 {
-    public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, mixed $userIdentifier = null): AccessTokenEntityInterface
+    public function getNewToken(ClientEntityInterface $clientEntity, array $scopes, ?string $userIdentifier = null): AccessTokenEntityInterface
     {
-        /** @var int|string|null $userIdentifier */
         $accessToken = new AccessTokenEntity();
         $accessToken->setClient($clientEntity);
-        $accessToken->setUserIdentifier($userIdentifier);
+        if (null !== $userIdentifier && '' !== $userIdentifier) {
+            $accessToken->setUserIdentifier($userIdentifier);
+        }
 
         foreach ($scopes as $scope) {
             $accessToken->addScope($scope);

src/ValueObject/Scope.php

@@ -10,12 +10,14 @@
 class Scope
 {
     /**
-     * @var string
+     * @var non-empty-string
      */
     private $scope;
 
     /**
      * @psalm-mutation-free
+     *
+     * @param non-empty-string $scope
      */
     public function __construct(string $scope)
     {
@@ -24,6 +26,8 @@ public function __construct(string $scope)
 
     /**
      * @psalm-mutation-free
+     *
+     * @return non-empty-string
      */
     public function __toString(): string
     {