Fix #82: Replace web-token/* with web-token/jwt-library and update min version of PHP to 8.1

.github/workflows/bc.yml

@@ -10,4 +10,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']

.github/workflows/build.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']

.github/workflows/composer-require-checker.yml

@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -26,6 +26,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/static.yml

@@ -30,11 +30,3 @@ jobs:
         ['ubuntu-latest']
       php: >-
         ['8.1', '8.2', '8.3']
-  psalm80:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm80.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.0']

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## 2.1.0 under development
 
-- Chg #67: Bump required PHP version to 8.0 (@rustamwin)
 - Enh #75: Add support for `psr/http-message` version `^2.0` (@vjik)
+- Chg #82: Replace `web-token/*` with `web-token/jwt-library` and update min version of PHP to 8.1 (@rustamwin)
 
 ## 2.0.1 September 19, 2023
 

README.md

@@ -19,7 +19,7 @@ The package provides [JWT authentication](https://tools.ietf.org/html/rfc7519) m
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 or higher.
 
 ## Installation
 

composer.json

@@ -29,15 +29,9 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "psr/http-message": "^1.0|^2.0",
-        "web-token/jwt-checker": "~2.2|~3.0",
-        "web-token/jwt-core": "~2.2|~3.0",
-        "web-token/jwt-key-mgmt": "~2.2|~3.0",
-        "web-token/jwt-signature": "~2.2|~3.0",
-        "web-token/jwt-signature-algorithm-ecdsa": "~2.2|~3.0",
-        "web-token/jwt-signature-algorithm-hmac": "~2.2|~3.0",
-        "web-token/jwt-signature-algorithm-rsa": "~2.2|~3.0",
+        "web-token/jwt-library": "^3.3",
         "yiisoft/auth": "^3.0",
         "yiisoft/http": "^1.2",
         "yiisoft/json": "^1.0"

rector.php

@@ -17,6 +17,6 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 };

src/KeyFactory/FromCertificateFile.php

@@ -15,7 +15,7 @@
  */
 final class FromCertificateFile implements KeyFactoryInterface
 {
-    public function __construct(private string $file)
+    public function __construct(private readonly string $file)
     {
     }
 

src/KeyFactory/FromKeyFile.php

@@ -15,7 +15,7 @@
  */
 final class FromKeyFile implements KeyFactoryInterface
 {
-    public function __construct(private string $file, private string $password)
+    public function __construct(private readonly string $file, private readonly string $password)
     {
     }
 

src/KeyFactory/FromPKCS12CertificateFile.php

@@ -15,7 +15,7 @@
  */
 final class FromPKCS12CertificateFile implements KeyFactoryInterface
 {
-    public function __construct(private string $file, private string $secret)
+    public function __construct(private readonly string $file, private readonly string $secret)
     {
     }
 

src/KeyFactory/FromSecret.php

@@ -13,7 +13,7 @@
  */
 final class FromSecret implements KeyFactoryInterface
 {
-    public function __construct(private string $secret)
+    public function __construct(private readonly string $secret)
     {
     }
 

src/TokenFactory.php

@@ -22,9 +22,9 @@ final class TokenFactory implements TokenFactoryInterface
      * @see https://tools.ietf.org/html/rfc7515
      */
     public function __construct(
-        private KeyFactoryInterface $keyFactory,
-        private AlgorithmManager $algorithmManager,
-        private JWSSerializerManager $serializerManager
+        private readonly KeyFactoryInterface $keyFactory,
+        private readonly AlgorithmManager $algorithmManager,
+        private readonly JWSSerializerManager $serializerManager
     ) {
     }
 

src/TokenRepository.php

@@ -25,9 +25,9 @@
      * @see https://tools.ietf.org/html/rfc7515
      */
     public function __construct(
-        private KeyFactoryInterface $keyFactory,
-        private AlgorithmManager $algorithmManager,
-        private JWSSerializerManager $serializerManager
+        private readonly KeyFactoryInterface $keyFactory,
+        private readonly AlgorithmManager $algorithmManager,
+        private readonly JWSSerializerManager $serializerManager
     ) {
     }
 
@@ -51,7 +51,7 @@
         return null;
     }
 
     private function verifyToken(JWS $jws, JWK $jwk, int $signature = 0): bool
     {
         return (new JWSVerifier($this->algorithmManager))->verifyWithKey($jws, $jwk, $signature);
     }

tests/Stub/FakeIdentity.php

@@ -8,7 +8,7 @@
 
 final class FakeIdentity implements IdentityInterface
 {
-    public function __construct(private ?string $id)
+    public function __construct(private readonly ?string $id)
     {
     }
 

tests/Stub/FakeIdentityRepository.php

@@ -9,7 +9,7 @@
 
 final class FakeIdentityRepository implements IdentityRepositoryInterface
 {
-    public function __construct(private ?IdentityInterface $returnIdentity)
+    public function __construct(private readonly ?IdentityInterface $returnIdentity)
     {
     }