Skip to content

Commit 86d78b0

Browse files
authored
Merge pull request #47 from cooperaj/webtoken-abandonment
Replace abandoned packages
2 parents a9bff56 + 10b1e67 commit 86d78b0

38 files changed

+3092
-3693
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848
strategy:
4949
matrix:
5050
php-version:
51-
- "7.4"
52-
- "8.0"
5351
- "8.1"
5452
- "8.2"
5553
- "8.3"
@@ -59,10 +57,10 @@ jobs:
5957
codestyle:
6058
- "false"
6159
include:
62-
- php-version: "8.2"
60+
- php-version: "8.4"
6361
deps: "locked"
6462
codestyle: "true"
65-
- php-version: "7.4"
63+
- php-version: "8.1"
6664
deps: "lowest"
6765
codestyle: "false"
6866

composer.json

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"identity"
2929
],
3030
"require": {
31-
"php": "^7.4 || ^8.0",
31+
"php": "^8.1",
3232
"ext-json": "*",
33-
"facile-it/php-jose-verifier": "^0.3 || ^0.4.3",
33+
"facile-it/php-jose-verifier": "^0.5.0-beta1",
3434
"php-http/discovery": "^1.6",
3535
"psr/http-client": "^1.0",
3636
"psr/http-client-implementation": "^1.0",
@@ -39,12 +39,8 @@
3939
"psr/http-message": "^1.0 || ^2.0",
4040
"psr/http-message-implementation": "^1.0",
4141
"psr/http-server-middleware": "^1.0",
42-
"web-token/jwt-checker": "^2.0 || ^3.0",
43-
"web-token/jwt-core": "^2.0 || ^3.0",
44-
"web-token/jwt-encryption": "^2.0 || ^3.0",
45-
"web-token/jwt-key-mgmt": "^2.0.7 || ^3.0",
46-
"web-token/jwt-signature": "^2.0 || ^3.0",
47-
"web-token/jwt-signature-algorithm-rsa": "^2.0 || ^3.0"
42+
"spomky-labs/aes-key-wrap": "^7.0",
43+
"web-token/jwt-library": "^3.4.3"
4844
},
4945
"autoload": {
5046
"files": [
@@ -83,32 +79,16 @@
8379
"phpspec/prophecy-phpunit": "^2.0",
8480
"phpunit/phpunit": "^8.5.14 || ^9.3",
8581
"symfony/console": "^4.3 || ^5.0 || ^6.0",
86-
"vimeo/psalm": "^5.6.0",
87-
"web-token/jwt-encryption-algorithm-aescbc": "^2.0 || ^3.0",
88-
"web-token/jwt-encryption-algorithm-aesgcm": "^2.0 || ^3.0",
89-
"web-token/jwt-encryption-algorithm-aesgcmkw": "^2.0 || ^3.0",
90-
"web-token/jwt-encryption-algorithm-aeskw": "^2.0 || ^3.0",
91-
"web-token/jwt-encryption-algorithm-dir": "^2.0 || ^3.0",
92-
"web-token/jwt-encryption-algorithm-ecdh-es": "^2.0 || ^3.0",
93-
"web-token/jwt-signature-algorithm-eddsa": "^2.2.0 || ^3.0",
94-
"web-token/jwt-encryption-algorithm-ecdh-es": "^2.2.0 || ^3.0",
95-
"web-token/jwt-encryption-algorithm-experimental": "^2.0 || ^3.0",
96-
"web-token/jwt-encryption-algorithm-pbes2": "^2.0 || ^3.0",
97-
"web-token/jwt-encryption-algorithm-rsa": "^2.0 || ^3.0",
98-
"web-token/jwt-signature-algorithm-ecdsa": "^2.0 || ^3.0",
99-
"web-token/jwt-signature-algorithm-eddsa": "^2.0 || ^3.0",
100-
"web-token/jwt-signature-algorithm-experimental": "^2.0 || ^3.0",
101-
"web-token/jwt-signature-algorithm-hmac": "^2.0 || ^3.0",
102-
"web-token/jwt-signature-algorithm-none": "^2.0 || ^3.0"
82+
"vimeo/psalm": "^5.6.0"
10383
},
10484
"suggest": {
10585
"facile-it/php-oauth2-http-client": "To use a PSR HTTP client to interact with OAuth2/OpenID protected APIs",
10686
"web-token/jwt-signature-algorithm-hmac": "To use the client_secret_jwt auth method and symmetric key signature",
10787
"dflydev/fig-cookies": "To use the SessionCookieMiddleware"
10888
},
10989
"scripts": {
110-
"cs-check": "php-cs-fixer fix --dry-run --diff --allow-risky=yes",
111-
"cs-fix": "php-cs-fixer fix --diff --allow-risky=yes",
90+
"cs-check": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run --diff --allow-risky=yes",
91+
"cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --diff --allow-risky=yes",
11292
"psalm": "psalm",
11393
"test": "phpunit",
11494
"test-coverage": "phpunit --coverage-text",

0 commit comments

Comments
 (0)