Fixed PhpStan issues

Author: yann-eugone

phpstan-baseline.neon

@@ -1,30 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:addDefaultsIfNotSet\\(\\)\\.$#"
-			count: 2
-			path: src/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 2
-			path: src/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:useAttributeAsKey\\(\\)\\.$#"
-			count: 1
-			path: src/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Yokai\\\\SecurityTokenBundle\\\\Entity\\\\Token\\:\\:getLastUsage\\(\\) should return Yokai\\\\SecurityTokenBundle\\\\Entity\\\\TokenUsage\\|null but returns mixed\\.$#"
-			count: 1
-			path: src/Entity/Token.php
-
-		-
-			message: "#^Method Yokai\\\\SecurityTokenBundle\\\\Entity\\\\Token\\:\\:getUsages\\(\\) should return array\\<Yokai\\\\SecurityTokenBundle\\\\Entity\\\\TokenUsage\\> but returns array\\.$#"
-			count: 1
-			path: src/Entity/Token.php
-
 		-
 			message: "#^Property Yokai\\\\SecurityTokenBundle\\\\Entity\\\\Token\\:\\:\\$id is never written, only read\\.$#"
 			count: 1
@@ -35,18 +10,3 @@ parameters:
 			count: 1
 			path: src/Entity/TokenUsage.php
 
-		-
-			message: "#^Cannot cast mixed to string\\.$#"
-			count: 1
-			path: src/Manager/ChainUserManager.php
-
-		-
-			message: "#^Cannot cast mixed to string\\.$#"
-			count: 1
-			path: src/Manager/DoctrineUserManager.php
-
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\EntityManager\\:\\:flush\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Repository/DoctrineORMTokenRepository.php
-

src/Archive/ArchivistInterface.php

@@ -18,5 +18,5 @@ interface ArchivistInterface
      *
      * @return integer
      */
-    public function archive(string $purpose = null): int;
+    public function archive(string|null $purpose = null): int;
 }

src/Archive/DeleteArchivist.php

@@ -27,7 +27,7 @@ public function __construct(EntityRepository $tokenRepository)
         $this->tokenRepository = $tokenRepository;
     }
 
-    public function archive(string $purpose = null): int
+    public function archive(string|null $purpose = null): int
     {
         $builder = $this->tokenRepository->createQueryBuilder('token')
             ->delete($this->tokenRepository->getClassName(), 'token');

src/Entity/Token.php

@@ -70,7 +70,7 @@ class Token
     private $keepUntil;
 
     /**
-     * @var Collection<TokenUsage>
+     * @var Collection<int, TokenUsage>
      */
     private $usages;
 
@@ -192,15 +192,15 @@ public function getUsages(): array
         return $this->usages->toArray();
     }
 
-    public function getLastUsage(): ?TokenUsage
+    public function getLastUsage(): TokenUsage|null
     {
-        return $this->usages->last();
+        return $this->usages->last() ?: null;
     }
 
     /**
      * @throws LogicException
      */
-    public function consume(array $information, DateTime $date = null): void
+    public function consume(array $information, DateTime|null $date = null): void
     {
         if ($this->isConsumed()) {
             throw new LogicException(

src/Entity/TokenUsage.php

@@ -31,7 +31,7 @@ class TokenUsage
     /**
      * @param array<string, mixed> $information
      */
-    public function __construct(Token $token, array $information, DateTime $createdAt = null)
+    public function __construct(Token $token, array $information, DateTime|null $createdAt = null)
     {
         $this->token = $token;
         $this->information = $information;

src/EventDispatcher.php

@@ -53,7 +53,7 @@ public function tokenCreated(Token $token): TokenCreatedEvent
         return $event;
     }
 
-    public function consumeToken(Token $token, DateTime $at = null, array $information = []): ConsumeTokenEvent
+    public function consumeToken(Token $token, DateTime|null $at = null, array $information = []): ConsumeTokenEvent
     {
         $this->eventDispatcher->dispatch(
             $event = new ConsumeTokenEvent($token, $at, $information)
@@ -71,7 +71,6 @@ public function tokenConsumed(Token $token): TokenConsumedEvent
         return $event;
     }
 
-    
     public function tokenTotallyConsumed(Token $token): TokenTotallyConsumedEvent
     {
         $this->eventDispatcher->dispatch(

src/Manager/ChainUserManager.php

@@ -108,10 +108,18 @@ private function getManagerForUser($user): UserManagerInterface
             $tries[] = get_class($manager);
         }
 
-        if (is_object($user) && !method_exists($user, '__toString')) {
-            $userAsString = sprintf('%s::%s', get_class($user), spl_object_hash($user));
+        if (is_object($user)) {
+            if (!method_exists($user, '__toString')) {
+                $userAsString = sprintf('%s::%s', get_class($user), spl_object_hash($user));
+            } else {
+                $userAsString = (string)$user;
+            }
         } else {
-            $userAsString = (string)$user;
+            if (is_scalar($user)) {
+                $userAsString = (string)$user;
+            } else {
+                $userAsString = get_debug_type($user);
+            }
         }
 
         throw new \InvalidArgumentException(

src/Manager/DoctrineUserManager.php

@@ -69,7 +69,15 @@ public function getId($user): string
             throw new \InvalidArgumentException('Entities with composite ids are not supported');
         }
 
-        return (string) reset($identifiers);
+        $identifier = reset($identifiers);
+        if (is_scalar($identifier)
+            || $identifier === null
+            || (is_object($identifier) && method_exists($identifier, '__toString'))
+        ) {
+            return (string)$identifier;
+        }
+
+        throw new \InvalidArgumentException('Entities with non stringable ids are not supported');
     }
 
     /**

src/Manager/TokenManager.php

@@ -101,7 +101,7 @@ public function create(string $purpose, $user, array $payload = []): Token
         return $token;
     }
 
-    public function consume(Token $token, DateTime $at = null): void
+    public function consume(Token $token, DateTime|null $at = null): void
     {
         $event = $this->eventDispatcher->consumeToken($token, $at, $this->informationGuesser->get());
 

src/Manager/TokenManagerInterface.php

@@ -48,7 +48,7 @@ public function create(string $purpose, $user, array $payload = []): Token;
      * @param Token         $token The token to consume
      * @param DateTime|null $at    The date/time at which the token was consumed (defaults to now)
      */
-    public function consume(Token $token, DateTime $at = null): void;
+    public function consume(Token $token, DateTime|null $at = null): void;
 
     /**
      * Get the user associated to a token.