Upgrade to web-token/jwt-library v4

# Conflicts:
#	src/Decrypter/TokenDecrypter.php

Author: Jean85

.github/workflows/continuous-integration.yml

@@ -18,9 +18,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout"
@@ -49,7 +50,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.2"
         deps:
           - "latest"
         coverage:
@@ -79,15 +80,14 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"
         deps:
           - "latest"
         include:
-          - php-version: "8.1"
+          - php-version: "8.2"
             deps: "lowest"
 
     steps:

composer.json

@@ -32,7 +32,7 @@
         "access token"
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-json": "*",
         "nyholm/psr7": "^1.8",
         "psr/clock": "^1.0",
@@ -43,7 +43,7 @@
         "symfony/http-client": "^6.0 || ^7.0 || ^8.0",
         "symfony/polyfill-mbstring": "^1.15",
         "symfony/polyfill-php83": "^1.33",
-        "web-token/jwt-library": "^3.4"
+        "web-token/jwt-library": "^4.0"
     },
     "autoload": {
         "files": [

src/AbstractTokenVerifier.php

@@ -133,10 +133,10 @@ protected function create(string $jwt): Validate
         $validator = Validate::withToken($jwt)
             ->withJWKSet($this->buildJwks($jwt))
             ->withClaim(new IssuerChecker([$expectedIssuer], true))
-            ->withClaim(new IssuedAtChecker($this->clockTolerance, true, $this->clock))
+            ->withClaim(new IssuedAtChecker($this->clock, $this->clockTolerance, true))
             ->withClaim(new AudienceChecker($this->clientId, true))
-            ->withClaim(new ExpirationTimeChecker($this->clockTolerance, false, $this->clock))
-            ->withClaim(new NotBeforeChecker($this->clockTolerance, true, $this->clock));
+            ->withClaim(new ExpirationTimeChecker($this->clock, $this->clockTolerance, false))
+            ->withClaim(new NotBeforeChecker($this->clock, $this->clockTolerance, true));
 
         if (null !== $this->expectedAzp) {
             $validator = $validator->withClaim(new AzpChecker($this->expectedAzp));

src/Decrypter/TokenDecrypter.php

@@ -130,7 +130,6 @@ public function decrypt(string $jwt): ?string
             new JWESerializerManager([new CompactSerializer()]),
             new JWEDecrypter(
                 new AlgorithmManager($this->algorithms),
-                new AlgorithmManager($this->algorithms),
             ),
             $headerChecker,
         );

tests/Decrypter/TokenDecrypterTest.php

@@ -49,9 +49,8 @@ public function testDecryptWithAsyToken(): void
             new RSAOAEP(),
             new A128GCM(),
         ]);
-        $compressionMethodManager = new CompressionMethodManager();
         $jwsBuilder = new JWSBuilder($algorithmManager);
-        $jweBuilder = new JWEBuilder($algorithmManager, $algorithmManager, $compressionMethodManager);
+        $jweBuilder = new JWEBuilder($algorithmManager);
 
         $builder = new NestedTokenBuilder($jweBuilder, $jweSerializerManager, $jwsBuilder, $jwsSerializerManager);
 
@@ -107,9 +106,8 @@ public function testCreateWithSymNestedToken(): void
             new HS256(),
             new Dir(),
         ]);
-        $compressionMethodManager = new CompressionMethodManager();
         $jwsBuilder = new JWSBuilder($algorithmManager);
-        $jweBuilder = new JWEBuilder($algorithmManager, $algorithmManager, $compressionMethodManager);
+        $jweBuilder = new JWEBuilder($algorithmManager);
 
         $builder = new NestedTokenBuilder($jweBuilder, $jweSerializerManager, $jwsBuilder, $jwsSerializerManager);