Support PHP 8 (#60)

Author: mvdnbrk

.github/workflows/tests.yml

@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 7.3, 7.2]
+        php: [8.0, 7.4, 7.3, 7.2]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
-    
+
     env:
       DHLPARCEL_ACCOUNT_ID: ${{ secrets.DHLPARCEL_ACCOUNT_ID }}
       DHLPARCEL_ID: ${{ secrets.DHLPARCEL_ID }}

composer.json

@@ -17,11 +17,11 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "ext-json": "*",
         "composer/ca-bundle": "^1.2",
         "guzzlehttp/guzzle": "^6.4 || ^7.1",
-        "lcobucci/jwt": "^3.4",
+        "lcobucci/jwt": "^3.4 || ^4.0",
         "ramsey/uuid": "^4.0",
         "tightenco/collect": "^5.8 || ^6.0 || ^7.0 || ^8.0"
     },

src/Resources/AccessToken.php

@@ -3,7 +3,7 @@
 namespace Mvdnbrk\DhlParcel\Resources;
 
 use DateTimeImmutable;
-use Lcobucci\JWT\Parser;
+use Lcobucci\JWT\Configuration;
 
 class AccessToken
 {
@@ -28,7 +28,7 @@ public function __construct(string $token)
 
     private function parseToken(): void
     {
-        $token = (new Parser)->parse($this->token);
+        $token = Configuration::forUnsecuredSigner()->parser()->parse($this->token);
 
         $this->expiresAt = $token->claims()->get('exp') ?: new DateTimeImmutable;
         $this->accounts = $token->claims()->get('accounts');

tests/Feature/Endpoints/AuthenticationTest.php

@@ -2,8 +2,7 @@
 
 namespace Mvdnbrk\DhlParcel\Tests\Feature\Endpoints;
 
-use Lcobucci\JWT\Parser;
-use Lcobucci\JWT\ValidationData;
+use Lcobucci\JWT\Configuration;
 use Mvdnbrk\DhlParcel\Tests\TestCase;
 
 /** @group integration */
@@ -13,9 +12,13 @@ class AuthenticationTest extends TestCase
     public function it_can_retrieve_an_access_token()
     {
         $accessToken = $this->client->authentication->getAccessToken();
+        $parsedToken = Configuration::forUnsecuredSigner()->parser()->parse($accessToken->token);
 
         $this->assertTrue(
-            (new Parser)->parse($accessToken->token)->validate(new ValidationData())
+            Configuration::forUnsecuredSigner()->validator()->validate(
+                $parsedToken,
+                new \Lcobucci\JWT\Validation\Constraint\IdentifiedBy($parsedToken->claims()->get('jti'))
+            )
         );
         $this->assertFalse($accessToken->isExpired());
         $this->assertEquals(getenv('DHLPARCEL_ACCOUNT_ID'), $accessToken->getAccountId());