Skip to content

Commit 40140f9

Browse files
SpomkySpomky
authored
Preparing 4.0.0 (#529)
Preparing 4.0.0
1 parent 9556ac9 commit 40140f9

File tree

256 files changed

+457
-3140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+457
-3140
lines changed

‎.github/workflows/infection.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: "Set up PHP"
1919
uses: "shivammathur/setup-php@v2"
2020
with:
21-
php-version: "8.1"
21+
php-version: "8.3"
2222
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
2323

2424
- name: "Checkout code"

‎.github/workflows/integrate.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "Set up PHP"
3232
uses: "shivammathur/setup-php@v2"
3333
with:
34-
php-version: "8.1"
34+
php-version: "8.3"
3535

3636
- name: "Checkout code"
3737
uses: "actions/checkout@v4"
@@ -54,8 +54,6 @@ jobs:
5454
operating-system:
5555
- "ubuntu-latest"
5656
php-version:
57-
- "8.1"
58-
- "8.2"
5957
- "8.3"
6058
dependencies:
6159
- "lowest"
@@ -81,14 +79,6 @@ jobs:
8179
- name: "Execute unit tests"
8280
run: "make ci-cc"
8381

84-
# - name: Send coverage to Coveralls
85-
# if: "matrix.php-version == '8.1' && matrix.dependencies == 'highest'"
86-
# env:
87-
# COVERALLS_REPO_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
88-
# run: |
89-
# wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.2/php-coveralls.phar"
90-
# php ./php-coveralls.phar -v
91-
9282
static_analysis:
9383
name: "3️⃣ Static Analysis"
9484
needs:
@@ -99,7 +89,7 @@ jobs:
9989
- name: "Set up PHP"
10090
uses: "shivammathur/setup-php@v2"
10191
with:
102-
php-version: "8.1"
92+
php-version: "8.3"
10393
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
10494

10595
- name: "Checkout code"
@@ -127,7 +117,7 @@ jobs:
127117
- name: "Set up PHP"
128118
uses: "shivammathur/setup-php@v2"
129119
with:
130-
php-version: "8.1"
120+
php-version: "8.3"
131121
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
132122

133123
- name: "Checkout code"
@@ -155,7 +145,7 @@ jobs:
155145
- name: "Set up PHP"
156146
uses: "shivammathur/setup-php@v2"
157147
with:
158-
php-version: "8.1"
148+
php-version: "8.3"
159149
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
160150
coverage: "xdebug"
161151

‎.gitsplit.yml

-50
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,6 @@ splits:
55
target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
66
- prefix: "src/Experimental"
77
target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
8-
- prefix: "src/Deprecated/Signature"
9-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
10-
- prefix: "src/Deprecated/Checker"
11-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
12-
- prefix: "src/Deprecated/Console"
13-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git"
14-
- prefix: "src/Deprecated/Core"
15-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git"
16-
- prefix: "src/Deprecated/Ecc"
17-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git"
18-
- prefix: "src/Deprecated/Encryption"
19-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption.git"
20-
- prefix: "src/Deprecated/KeyManagement"
21-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
22-
- prefix: "src/Deprecated/NestedToken"
23-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
24-
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC"
25-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
26-
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM"
27-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcm.git"
28-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
29-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcmkw.git"
30-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW"
31-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aeskw.git"
32-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct"
33-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-dir.git"
34-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES"
35-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-ecdh-es.git"
36-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2"
37-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-pbes2.git"
38-
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA"
39-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-rsa.git"
40-
- prefix: "src/Deprecated/SignatureAlgorithm/ECDSA"
41-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-ecdsa.git"
42-
- prefix: "src/Deprecated/SignatureAlgorithm/EdDSA"
43-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-eddsa.git"
44-
- prefix: "src/Deprecated/SignatureAlgorithm/None"
45-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-none.git"
46-
- prefix: "src/Deprecated/SignatureAlgorithm/HMAC"
47-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-hmac.git"
48-
- prefix: "src/Deprecated/SignatureAlgorithm/RSA"
49-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-rsa.git"
50-
- prefix: "src/Deprecated/SignatureAlgorithm/Experimental"
51-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-experimental.git"
52-
- prefix: "src/Deprecated/EncryptionAlgorithm/Experimental"
53-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
54-
- prefix: "src/Deprecated/Pack/Encryption"
55-
target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
56-
- prefix: "rc/Deprecated/Pack/Signature"
57-
target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
588

599
origins:
6010
- ^\d+\.\d+\.x$

‎composer.json

+22-54
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
],
3535
"autoload": {
3636
"psr-4": {
37-
"Jose\\": "src/",
3837
"Jose\\Bundle\\JoseFramework\\": "src/Bundle/",
3938
"Jose\\Experimental\\": "src/Experimental/",
4039
"Jose\\Component\\": "src/Library/"
@@ -47,93 +46,62 @@
4746
}
4847
},
4948
"require": {
50-
"php": ">=8.1",
49+
"php": ">=8.3",
5150
"ext-json": "*",
5251
"ext-mbstring": "*",
5352
"ext-openssl": "*",
54-
"ext-sodium": "*",
55-
"brick/math": "^0.9|^0.10|^0.11|^0.12",
53+
"brick/math": "^0.12",
5654
"paragonie/constant_time_encoding": "^2.6",
5755
"paragonie/sodium_compat": "^1.20",
5856
"psr/clock": "^1.0",
5957
"psr/event-dispatcher": "^1.0",
60-
"psr/http-client": "^1.0",
61-
"psr/http-factory": "^1.0",
62-
"spomky-labs/aes-key-wrap": "^7.0",
6358
"spomky-labs/pki-framework": "^1.0",
64-
"symfony/config": "^5.4|^6.0|^7.0",
65-
"symfony/console": "^5.4|^6.0|^7.0",
66-
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
67-
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
68-
"symfony/http-client": "^5.4|^6.0|^7.0",
69-
"symfony/http-kernel": "^5.4|^6.0|^7.0",
59+
"symfony/config": "^7.0",
60+
"symfony/console": "^7.0",
61+
"symfony/dependency-injection": "^7.0",
62+
"symfony/event-dispatcher": "^7.0",
63+
"symfony/http-client": "^7.0",
64+
"symfony/http-kernel": "^7.0",
7065
"symfony/polyfill-mbstring": "^1.12"
7166
},
7267
"require-dev": {
7368
"ext-curl": "*",
7469
"ext-gmp": "*",
70+
"ext-sodium": "*",
7571
"bjeavons/zxcvbn-php": "^1.3",
7672
"ekino/phpstan-banned-code": "^1.0",
7773
"infection/infection": "^0.27",
7874
"matthiasnoback/symfony-config-test": "^5.0",
79-
"nyholm/psr7": "^1.8",
80-
"php-http/mock-client": "^1.5",
75+
"nikic/php-parser": "^4.18",
8176
"php-parallel-lint/php-parallel-lint": "^1.3",
8277
"phpbench/phpbench": "^1.2",
8378
"phpstan/extension-installer": "^1.3",
8479
"phpstan/phpstan": "^1.8",
8580
"phpstan/phpstan-deprecation-rules": "^1.0",
8681
"phpstan/phpstan-phpunit": "^1.1",
8782
"phpstan/phpstan-strict-rules": "^1.4",
88-
"phpunit/phpunit": "^10.1",
83+
"phpunit/phpunit": "^10.5.10",
8984
"qossmic/deptrac-shim": "^1.0",
9085
"rector/rector": "^1.0",
9186
"roave/security-advisories": "dev-latest",
92-
"symfony/browser-kit": "^6.1|^7.0",
93-
"symfony/finder": "^6.1|^7.0",
94-
"symfony/framework-bundle": "^6.1|^7.0",
95-
"symfony/phpunit-bridge": "^6.1|^7.0",
96-
"symfony/serializer": "^6.1|^7.0",
97-
"symfony/var-dumper": "^6.1|^7.0",
98-
"symfony/yaml": "^6.1|^7.0",
87+
"spomky-labs/aes-key-wrap": "^7.0",
88+
"symfony/browser-kit": "^7.0",
89+
"symfony/clock": "^7.0",
90+
"symfony/finder": "^7.0",
91+
"symfony/framework-bundle": "^7.0",
92+
"symfony/phpunit-bridge": "^7.0",
93+
"symfony/serializer": "^7.0",
94+
"symfony/var-dumper": "^7.0",
95+
"symfony/yaml": "^7.0",
9996
"symplify/easy-coding-standard": "^12.0"
10097
},
10198
"replace": {
102-
"web-token/encryption-pack": "self.version",
10399
"web-token/jwt-bundle": "self.version",
104100
"web-token/jwt-library": "self.version",
105-
"web-token/jwt-checker": "self.version",
106-
"web-token/jwt-console": "self.version",
107-
"web-token/jwt-core": "self.version",
108-
"web-token/jwt-encryption": "self.version",
109-
"web-token/jwt-encryption-algorithm-aescbc": "self.version",
110-
"web-token/jwt-encryption-algorithm-aesgcm": "self.version",
111-
"web-token/jwt-encryption-algorithm-aesgcmkw": "self.version",
112-
"web-token/jwt-encryption-algorithm-aeskw": "self.version",
113-
"web-token/jwt-encryption-algorithm-dir": "self.version",
114-
"web-token/jwt-encryption-algorithm-ecdh-es": "self.version",
115-
"web-token/jwt-encryption-algorithm-experimental": "self.version",
116-
"web-token/jwt-encryption-algorithm-pbes2": "self.version",
117-
"web-token/jwt-encryption-algorithm-rsa": "self.version",
118-
"web-token/jwt-key-mgmt": "self.version",
119-
"web-token/jwt-nested-token": "self.version",
120-
"web-token/jwt-signature": "self.version",
121-
"web-token/jwt-signature-algorithm-ecdsa": "self.version",
122-
"web-token/jwt-signature-algorithm-eddsa": "self.version",
123-
"web-token/jwt-signature-algorithm-experimental": "self.version",
124-
"web-token/jwt-signature-algorithm-hmac": "self.version",
125-
"web-token/jwt-signature-algorithm-none": "self.version",
126-
"web-token/jwt-signature-algorithm-rsa": "self.version",
127-
"web-token/jwt-signature-pack": "self.version",
128-
"web-token/jwt-util-ecc": "self.version",
129-
"web-token/signature-pack": "self.version",
130101
"web-token/jwt-experimental": "self.version"
131102
},
132103
"suggest": {
133104
"bjeavons/zxcvbn-php": "Adds key quality check for oct keys.",
134-
"php-http/httplug": "To enable JKU/X5U support.",
135-
"php-http/httplug-bundle": "To enable JKU/X5U support.",
136-
"php-http/message-factory": "To enable JKU/X5U support.",
137105
"symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens.",
138106
"symfony/var-dumper": "Used to show data on the debug toolbar.",
139107
"spomky-labs/aes-key-wrap": "To enable AES Key Wrap algorithm."
@@ -144,10 +112,10 @@
144112
"config": {
145113
"sort-packages": true,
146114
"allow-plugins": {
147-
"infection/extension-installer": true,
148115
"composer/package-versions-deprecated": true,
149116
"phpstan/extension-installer": true,
150-
"php-http/discovery": true
117+
"php-http/discovery": true,
118+
"infection/extension-installer": false
151119
}
152120
}
153121
}

‎deptrac.yaml

+11-51
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,32 @@ parameters:
22
paths:
33
- './src'
44
layers:
5-
- name: 'Core'
5+
- name: 'Library'
66
collectors:
7-
- { type: className, regex: '^Jose\\Component\\Core\\' }
8-
- name: 'Checker'
7+
- { type: className, regex: '^Jose\\Component\\' }
8+
- name: 'Experimental'
99
collectors:
10-
- { type: className, regex: '^Jose\\Component\\Checker\\' }
11-
- name: 'Console'
12-
collectors:
13-
- { type: className, regex: '^Jose\\Component\\Console\\' }
14-
- name: 'KeyManagement'
15-
collectors:
16-
- { type: className, regex: '^Jose\\Component\\KeyManagement\\' }
17-
- name: 'NestedToken'
18-
collectors:
19-
- { type: className, regex: '^Jose\\Component\\NestedToken\\' }
20-
- name: 'Encryption'
21-
collectors:
22-
- { type: className, regex: '^Jose\\Component\\Encryption\\' }
23-
- name: 'Signature'
24-
collectors:
25-
- { type: className, regex: '^Jose\\Component\\Signature\\' }
10+
- { type: className, regex: '^Jose\\Experimental\\' }
2611
- name: 'Bundle'
2712
collectors:
28-
- { type: className, regex: '^Jose\\Bundle\\JoseFramework\\' }
13+
- { type: className, regex: '^Jose\\Bundle\\' }
2914
- name: 'Vendors'
3015
collectors:
3116
- { type: className, regex: '^Symfony\\' }
3217
- { type: className, regex: '^SpomkyLabs\\Pki\\' }
3318
- { type: className, regex: '^ParagonIE\\' }
3419
- { type: className, regex: '^Psr\\EventDispatcher\\' }
35-
- { type: className, regex: '^Psr\\Http\\' }
20+
- { type: className, regex: '^Psr\\Clock\\' }
3621
- { type: className, regex: '^Brick\\Math\\' }
3722
- { type: className, regex: '^AESKW\\' }
3823
- { type: className, regex: '^ZxcvbnPhp\\' }
3924
ruleset:
40-
Core:
41-
- 'Vendors'
42-
Checker:
43-
- 'Core'
44-
- 'Vendors'
45-
Console:
46-
- 'Core'
47-
- 'KeyManagement'
48-
- 'Vendors'
49-
KeyManagement:
50-
- 'Core'
51-
- 'Vendors'
52-
Encryption:
53-
- 'Core'
54-
- 'Checker'
55-
- 'Vendors'
56-
Signature:
57-
- 'Core'
58-
- 'Checker'
25+
Library:
5926
- 'Vendors'
60-
NestedToken:
61-
- 'Core'
62-
- 'Encryption'
63-
- 'Signature'
27+
Experimental:
28+
- 'Library'
6429
- 'Vendors'
6530
Bundle:
66-
- 'Core'
67-
- 'Checker'
68-
- 'Console'
69-
- 'KeyManagement'
70-
- 'Encryption'
71-
- 'Signature'
72-
- 'NestedToken'
31+
- 'Library'
32+
- 'Experimental'
7333
- 'Vendors'

0 commit comments

Comments
 (0)