Skip to content

Replace abandoned packages #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
May 30, 2025
Merged

Replace abandoned packages #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cd665bf
fix: replace abandoned packages
Jun 13, 2024
b39b700
fix: require php8.1
Jun 13, 2024
321925e
fix: resolve deprecation
Jun 13, 2024
fd2b5ac
fix: add missing dependency for AESKW\A128KW
Jun 13, 2024
ccca5fb
fix: bump version
Jun 13, 2024
922093b
fix: require verifier v0.5
Jun 13, 2024
05c885a
fix: attempt verifier v0.5 support - requires more domain knowledge
Jun 13, 2024
ce11b9c
Implement unit testing for builders
cooperaj Mar 6, 2025
9b4b38e
Ensure all original builder configurations are carried through
cooperaj Mar 6, 2025
4f01a03
Ran cs-fix
cooperaj Mar 6, 2025
0817018
Synced psalm stub files with upstream verifier library
cooperaj Mar 6, 2025
fe2a054
Use different psalm types to clear up IssuerMetadata errors
cooperaj Mar 7, 2025
3835261
Further psalm error fixes
cooperaj Mar 7, 2025
05393e2
More psalm fixes. Had to alter some logic for these ones.
cooperaj Mar 7, 2025
2f43040
Merge remote-tracking branch 'origin/master' into webtoken-abandonment
cooperaj Mar 7, 2025
83bcd40
Use of generics templating in Facile\JoseVerifier\Builder\TokenVerifi…
cooperaj Mar 7, 2025
a735a05
Missed CI matrix condition for PHP 7.4
cooperaj Mar 10, 2025
bb7fcee
Add minimal matrix condition for 8.1
cooperaj Mar 10, 2025
d017fe0
Reorder fixed matrix conditions
cooperaj Mar 10, 2025
4da8265
Force rebuild with minor change.
cooperaj Mar 11, 2025
e4983bc
Allow use of php-cs-fixer in a PHP 8.4 environment.
cooperaj Mar 11, 2025
f7b4ff6
Code review changes
cooperaj May 27, 2025
db9b823
Add psalm suppress for access that is definitely ok but psalm seems t…
cooperaj May 28, 2025
084c7d2
Refactor affected parser methods to not require pslam suppression sta…
cooperaj May 29, 2025
10b1e67
Fix missed phpcs check failure
cooperaj May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
Expand All @@ -59,10 +57,10 @@ jobs:
codestyle:
- "false"
include:
- php-version: "8.2"
- php-version: "8.4"
deps: "locked"
codestyle: "true"
- php-version: "7.4"
- php-version: "8.1"
deps: "lowest"
codestyle: "false"

Expand Down
34 changes: 7 additions & 27 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"identity"
],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.1",
"ext-json": "*",
"facile-it/php-jose-verifier": "^0.3 || ^0.4.3",
"facile-it/php-jose-verifier": "^0.5.0-beta1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: if everything is ok, we should re-tag as stable and change the requirement here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quite possibly. Though I've not used any of that library in anger apart from what this library touches so I can't vouch for it all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the 0.5 tag available on that repo yet? I've an issue open there but it is still open?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet, I'm thinking that we can use the beta version, and tag this PR in beta too

"php-http/discovery": "^1.6",
"psr/http-client": "^1.0",
"psr/http-client-implementation": "^1.0",
Expand All @@ -39,12 +39,8 @@
"psr/http-message": "^1.0 || ^2.0",
"psr/http-message-implementation": "^1.0",
"psr/http-server-middleware": "^1.0",
"web-token/jwt-checker": "^2.0 || ^3.0",
"web-token/jwt-core": "^2.0 || ^3.0",
"web-token/jwt-encryption": "^2.0 || ^3.0",
"web-token/jwt-key-mgmt": "^2.0.7 || ^3.0",
"web-token/jwt-signature": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-rsa": "^2.0 || ^3.0"
"spomky-labs/aes-key-wrap": "^7.0",
"web-token/jwt-library": "^3.4.3"
},
"autoload": {
"files": [
Expand Down Expand Up @@ -83,32 +79,16 @@
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^8.5.14 || ^9.3",
"symfony/console": "^4.3 || ^5.0 || ^6.0",
"vimeo/psalm": "^5.6.0",
"web-token/jwt-encryption-algorithm-aescbc": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-aesgcm": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-aesgcmkw": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-aeskw": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-dir": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-ecdh-es": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-eddsa": "^2.2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-ecdh-es": "^2.2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-experimental": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-pbes2": "^2.0 || ^3.0",
"web-token/jwt-encryption-algorithm-rsa": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-ecdsa": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-eddsa": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-experimental": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-hmac": "^2.0 || ^3.0",
"web-token/jwt-signature-algorithm-none": "^2.0 || ^3.0"
"vimeo/psalm": "^5.6.0"
},
"suggest": {
"facile-it/php-oauth2-http-client": "To use a PSR HTTP client to interact with OAuth2/OpenID protected APIs",
"web-token/jwt-signature-algorithm-hmac": "To use the client_secret_jwt auth method and symmetric key signature",
"dflydev/fig-cookies": "To use the SessionCookieMiddleware"
},
"scripts": {
"cs-check": "php-cs-fixer fix --dry-run --diff --allow-risky=yes",
"cs-fix": "php-cs-fixer fix --diff --allow-risky=yes",
"cs-check": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run --diff --allow-risky=yes",
"cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --diff --allow-risky=yes",
"psalm": "psalm",
"test": "phpunit",
"test-coverage": "phpunit --coverage-text",
Expand Down
Loading