minor #11 Fix CI (static analysis and unstable tests) (mtarld)

This PR was squashed before being merged into the 0.1-dev branch.

Discussion
----------

Fix CI (static analysis and unstable tests)

- Fix Psalm tests
- Fix unstable tests

Commits
-------

ae929e4 Fix unstable tests
90d22d7 Fix static analysis

Author: chalasr

src/Command/CreateClientCommand.php

@@ -111,7 +111,6 @@ private function buildClientFromInput(InputInterface $input): Client
         /** @var string $identifier */
         $identifier = $input->getArgument('identifier') ?? hash('md5', random_bytes(16));
 
-        /** @var bool $isPublic */
         $isPublic = $input->getOption('public');
 
         if ($isPublic && null !== $input->getArgument('secret')) {

src/Controller/AuthorizationController.php

@@ -13,6 +13,7 @@
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -106,7 +107,10 @@ public function indexAction(Request $request): Response
             $authRequest->setUser($this->userConverter->toLeague($event->getUser()));
 
             if ($event->hasResponse()) {
-                return $this->httpFoundationFactory->createResponse($event->getResponse());
+                /** @var ResponseInterface $response */
+                $response = $event->getResponse();
+
+                return $this->httpFoundationFactory->createResponse($response);
             }
 
             $authRequest->setAuthorizationApproved($event->getAuthorizationResolution());

src/Event/ScopeResolveEvent.php

@@ -52,6 +52,7 @@ public function getScopes(): array
 
     public function setScopes(Scope ...$scopes): self
     {
+        /** @var list<Scope> $scopes */
         $this->scopes = $scopes;
 
         return $this;

src/Manager/InMemory/ClientManager.php

@@ -69,13 +69,10 @@ private static function passesFilter(array $clientValues, array $filterValues):
             return true;
         }
 
-        /** @var list<string> $clientValues */
-        $clientValues = array_map('strval', $clientValues);
-        /** @var list<string> $filterValues */
-        $filterValues = array_map('strval', $filterValues);
-
-        /** @var list<string> $valuesPassed */
-        $valuesPassed = array_intersect($filterValues, $clientValues);
+        $valuesPassed = array_intersect(
+            array_map('strval', $filterValues),
+            array_map('strval', $clientValues)
+        );
 
         return \count($valuesPassed) > 0;
     }

src/Model/Client.php

@@ -86,6 +86,7 @@ public function getRedirectUris(): array
 
     public function setRedirectUris(RedirectUri ...$redirectUris): self
     {
+        /** @var list<RedirectUri> $redirectUris */
         $this->redirectUris = $redirectUris;
 
         return $this;
@@ -103,6 +104,7 @@ public function getGrants(): array
 
     public function setGrants(Grant ...$grants): self
     {
+        /** @var list<Grant> $grants */
         $this->grants = $grants;
 
         return $this;
@@ -120,6 +122,7 @@ public function getScopes(): array
 
     public function setScopes(Scope ...$scopes): self
     {
+        /** @var list<Scope> $scopes */
         $this->scopes = $scopes;
 
         return $this;

tests/Acceptance/TokenEndpointTest.php

@@ -44,7 +44,8 @@ public function testSuccessfulClientCredentialsRequest(): void
         $jsonResponse = json_decode($response->getContent(), true);
 
         $this->assertSame('Bearer', $jsonResponse['token_type']);
-        $this->assertSame(3600, $jsonResponse['expires_in']);
+        $this->assertLessThanOrEqual(3600, $jsonResponse['expires_in']);
+        $this->assertGreaterThan(0, $jsonResponse['expires_in']);
         $this->assertNotEmpty($jsonResponse['access_token']);
     }
 
@@ -73,7 +74,8 @@ public function testSuccessfulPasswordRequest(): void
         $jsonResponse = json_decode($response->getContent(), true);
 
         $this->assertSame('Bearer', $jsonResponse['token_type']);
-        $this->assertSame(3600, $jsonResponse['expires_in']);
+        $this->assertLessThanOrEqual(3600, $jsonResponse['expires_in']);
+        $this->assertGreaterThan(0, $jsonResponse['expires_in']);
         $this->assertNotEmpty($jsonResponse['access_token']);
         $this->assertNotEmpty($jsonResponse['refresh_token']);
     }
@@ -100,7 +102,8 @@ public function testSuccessfulRefreshTokenRequest(): void
         $jsonResponse = json_decode($response->getContent(), true);
 
         $this->assertSame('Bearer', $jsonResponse['token_type']);
-        $this->assertSame(3600, $jsonResponse['expires_in']);
+        $this->assertLessThanOrEqual(3600, $jsonResponse['expires_in']);
+        $this->assertGreaterThan(0, $jsonResponse['expires_in']);
         $this->assertNotEmpty($jsonResponse['access_token']);
         $this->assertNotEmpty($jsonResponse['refresh_token']);
     }
@@ -128,7 +131,8 @@ public function testSuccessfulAuthorizationCodeRequest(): void
         $jsonResponse = json_decode($response->getContent(), true);
 
         $this->assertSame('Bearer', $jsonResponse['token_type']);
-        $this->assertSame(3600, $jsonResponse['expires_in']);
+        $this->assertLessThanOrEqual(3600, $jsonResponse['expires_in']);
+        $this->assertGreaterThan(0, $jsonResponse['expires_in']);
         $this->assertNotEmpty($jsonResponse['access_token']);
     }
 
@@ -154,7 +158,8 @@ public function testSuccessfulAuthorizationCodeRequestWithPublicClient(): void
         $jsonResponse = json_decode($response->getContent(), true);
 
         $this->assertSame('Bearer', $jsonResponse['token_type']);
-        $this->assertSame(3600, $jsonResponse['expires_in']);
+        $this->assertLessThanOrEqual(3600, $jsonResponse['expires_in']);
+        $this->assertGreaterThan(0, $jsonResponse['expires_in']);
         $this->assertNotEmpty($jsonResponse['access_token']);
     }