From 779aff190608671eb2c4cb47e4b02aea2499f81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20H=C3=A9lias?= <maximehelias16@gmail.com>
Date: Fri, 3 Mar 2023 14:44:42 +0100
Subject: [PATCH] Allow lcobucci/jwt v5

Psalm auto target php version 8 (inferred from composer.json)
---
 .github/workflows/ci.yaml                                     | 2 +-
 app/composer.json                                             | 2 +-
 composer.json                                                 | 2 +-
 src/trusted-device/composer.json                              | 2 +-
 .../TwoFactor/Trusted/TrustedDeviceTokenEncoderTest.php       | 4 ++--
 tests/Security/TwoFactor/Trusted/TrustedDeviceTokenTest.php   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2b2847a5..c2175aec 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                    - '8.1'
+                    - '8.0'
 
         steps:
             -   name: 'Checkout code'
diff --git a/app/composer.json b/app/composer.json
index 4eeb6ddd..1c9380b0 100644
--- a/app/composer.json
+++ b/app/composer.json
@@ -9,7 +9,7 @@
         "egulias/email-validator": "^3.0",
         "endroid/qr-code": "^4.0",
         "lcobucci/clock": "^2.0 || ^3.0",
-        "lcobucci/jwt": "^4.1",
+        "lcobucci/jwt": "^4.1 || ^5.0",
         "paragonie/constant_time_encoding": "^2.4",
         "spomky-labs/otphp": "^10.0 || ^11.0",
         "symfony/dotenv": "^5.4 || ^6.0",
diff --git a/composer.json b/composer.json
index 705770eb..37b3de6b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "ext-json": "*",
         "lcobucci/clock": "^2.0 || ^3.0",
-        "lcobucci/jwt": "^4.1",
+        "lcobucci/jwt": "^4.1 || ^5.0",
         "paragonie/constant_time_encoding": "^2.4",
         "spomky-labs/otphp": "^10.0 || ^11.0",
         "symfony/config": "^5.4 || ^6.0",
diff --git a/src/trusted-device/composer.json b/src/trusted-device/composer.json
index 6f18601e..4a6829ab 100644
--- a/src/trusted-device/composer.json
+++ b/src/trusted-device/composer.json
@@ -15,7 +15,7 @@
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "scheb/2fa-bundle": "self.version",
         "lcobucci/clock": "^2.0 || ^3.0",
-        "lcobucci/jwt": "^4.1"
+        "lcobucci/jwt": "^4.1 || ^5.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenEncoderTest.php b/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenEncoderTest.php
index eab7f571..3d5c975c 100644
--- a/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenEncoderTest.php
+++ b/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenEncoderTest.php
@@ -35,7 +35,7 @@ public function generateToken_parametersGiven_returnTrustedDeviceToken(): void
             ->expects($this->once())
             ->method('generateToken')
             ->with('username', 'firewallName', 1, new DateTime('2018-01-01 01:00:00'))
-            ->willReturn(new Plain(new DataSet([], ''), new DataSet([], ''), Signature::fromEmptyData()));
+            ->willReturn(new Plain(new DataSet([], ''), new DataSet([], ''), new Signature('', '')));
 
         $token = $this->tokenEncoder->generateToken('username', 'firewallName', 1);
         $this->assertInstanceOf(TrustedDeviceToken::class, $token);
@@ -49,7 +49,7 @@ public function decodeToken_validToken_returnDecodedTrustedDeviceToken(): void
         $this->jwtEncoder
             ->expects($this->once())
             ->method('decodeToken')
-            ->willReturn(new Plain(new DataSet([], ''), new DataSet([], ''), Signature::fromEmptyData()));
+            ->willReturn(new Plain(new DataSet([], ''), new DataSet([], ''), new Signature('', '')));
 
         $returnValue = $this->tokenEncoder->decodeToken('validToken');
         $this->assertInstanceOf(TrustedDeviceToken::class, $returnValue);
diff --git a/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenTest.php b/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenTest.php
index a9049cab..343eb854 100644
--- a/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenTest.php
+++ b/tests/Security/TwoFactor/Trusted/TrustedDeviceTokenTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
             JwtTokenEncoder::CLAIM_FIREWALL => 'firewallName',
             JwtTokenEncoder::CLAIM_VERSION => 1,
         ], 'encodedClaims');
-        $jwtToken = new Plain(new DataSet([], 'encodedHeaders'), $claims, Signature::fromEmptyData());
+        $jwtToken = new Plain(new DataSet([], 'encodedHeaders'), $claims, new Signature('', ''));
         $this->trustedToken = new TrustedDeviceToken($jwtToken);
     }