Merge pull request #207 from oat-sa/fix/compatibility-issues

Fix compatibility issues

Author: kilatib

.github/workflows/build.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
@@ -41,6 +41,7 @@ jobs:
             || ./vendor/bin/phpunit
 
       - name: Psalm
+        if: ${{ matrix.php == '8.0' }}
         run: |
           ./vendor/bin/psalm --shepherd
 

psalm.xml.dist

@@ -27,43 +27,49 @@
                 <file name="src/Resource/ResourceCollectionInterface.php" />
             </errorLevel>
         </PossiblyUnusedReturnValue>
-        
+
         <MissingTemplateParam>
             <errorLevel type="suppress">
                 <file name="src/Resource/ResourceCollectionInterface.php" />
                 <file name="src/Util/Collection/CollectionInterface.php" />
             </errorLevel>
         </MissingTemplateParam>
-        
+
         <FalsableReturnStatement>
             <errorLevel type="suppress">
                 <file name="src/Role/Type/CustomRole.php" />
             </errorLevel>
         </FalsableReturnStatement>
-        
+
         <PossiblyFalseArgument>
             <errorLevel type="suppress">
                 <file name="src/Security/Jwks/Exporter/Jwk/JwkRS256Exporter.php" />
             </errorLevel>
         </PossiblyFalseArgument>
-        
+
         <PossiblyInvalidArrayAccess>
             <errorLevel type="suppress">
                 <file name="src/Security/Jwks/Exporter/Jwk/JwkRS256Exporter.php" />
             </errorLevel>
         </PossiblyInvalidArrayAccess>
-        
+
         <UnusedProperty>
             <errorLevel type="suppress">
                 <file name="src/Security/Jwks/Fetcher/JwksFetcher.php" />
             </errorLevel>
         </UnusedProperty>
-        
+
         <InternalClass>
             <errorLevel type="suppress">
-                <file name="src/Security/Jwt/Signer/SignerFactory.php"/>
+                <file name="src/Security/Jwt/Signer/SignerFactory.php" />
             </errorLevel>
         </InternalClass>
+
+        <TooManyArguments>
+            <errorLevel type="suppress">
+                <file name="src/Security/Jwt/Configuration/ConfigurationFactory.php" />
+            </errorLevel>
+        </TooManyArguments>
     </issueHandlers>
     <mockClasses>
         <class name="PHPUnit\Framework\MockObject\MockObject"/>

src/Security/OAuth2/Entity/Client.php

@@ -37,7 +37,7 @@ public function __construct(RegistrationInterface $registration)
     {
         $this->registration = $registration;
         $this->name = $this->registration->getTool()->getName();
-        $this->redirectUri = $this->registration->getTool()->getLaunchUrl();
+        $this->redirectUri = (string)$this->registration->getTool()->getLaunchUrl();
         $this->isConfidential = true;
     }
 

src/Security/OAuth2/Repository/AccessTokenRepository.php

@@ -53,7 +53,9 @@ public function getNewToken(ClientEntityInterface $clientEntity, array $scopes,
         $accessToken = new AccessToken();
 
         $accessToken->setClient($clientEntity);
-        $accessToken->setUserIdentifier($userIdentifier);
+        if (null !== $userIdentifier) {
+            $accessToken->setUserIdentifier($userIdentifier);
+        }
 
         foreach ($scopes as $scope) {
             $accessToken->addScope($scope);

src/Security/OAuth2/Repository/ScopeRepository.php

@@ -58,7 +58,8 @@ public function finalizeScopes(
         array $scopes,
         $grantType,
         ClientEntityInterface $clientEntity,
-        $userIdentifier = null
+        $userIdentifier = null,
+        ?string $authCodeId = null,
     ): array {
         return $scopes;
     }

tests/Integration/Security/OAuth2/Repository/AccessTokenRepositoryTest.php

@@ -23,6 +23,7 @@
 namespace OAT\Library\Lti1p3Core\Tests\Integration\Security\OAuth2\Repository;
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
+use DateTimeImmutable;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use OAT\Library\Lti1p3Core\Security\OAuth2\Entity\AccessToken;
 use OAT\Library\Lti1p3Core\Security\OAuth2\Entity\Client;
@@ -94,6 +95,7 @@ private function createAccessToken($accessTokenIdentifier = null): AccessTokenEn
         $accessToken = new AccessToken();
 
         $accessToken->setIdentifier($accessTokenIdentifier ?? 'accessTokenIdentifier');
+        $accessToken->setExpiryDateTime(new DateTimeImmutable('+1 minute'));
         $accessToken->setClient(new Client($this->createTestRegistration()));
         $accessToken->addScope(new Scope('scope1'));
         $accessToken->addScope(new Scope('scope2'));

tests/Unit/Security/OAuth2/ResponseType/ScopedBearerTokenResponseTest.php

@@ -22,7 +22,7 @@
 
 namespace OAT\Library\Lti1p3Core\Tests\Unit\Security\OAuth2\ResponseType;
 
-use Carbon\Carbon;
+use DateTimeImmutable;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 use League\OAuth2\Server\ResponseTypes\BearerTokenResponse;
@@ -53,7 +53,7 @@ public function testItAddScopeToResponse(): void
 
         /** @var AccessTokenEntityInterface|MockObject $accessToken */
         $accessToken = $this->createMock(AccessTokenEntityInterface::class);
-        $accessToken->method('getExpiryDateTime')->willReturn(Carbon::now());
+        $accessToken->method('getExpiryDateTime')->willReturn(new DateTimeImmutable());
         $accessToken->method('getScopes')->willReturn([$scope]);
 
         $this->subject->setAccessToken($accessToken);