Skip to content

Commit 9556ac9

Browse files
SpomkySpomky
authored
Merge pull request #527 from web-token/3.3.x-merge-up-into-4.0.x_xxf8htti
Merge release 3.3.0 into 4.0.x
2 parents 3baba46 + f4c0e0e commit 9556ac9

File tree

797 files changed

+5862
-6644
lines changed

Some content is hidden

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

797 files changed

+5862
-6644
lines changed

‎.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ block_comment_end = */
1717
[{*.yml,*.yaml}]
1818
indent_size = 2
1919

20+
[*.neon]
21+
indent_style = tab
22+
2023
[*.md]
2124
trim_trailing_whitespace = false
2225

‎.github/workflows/infection.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow
2+
3+
name: "Integrate"
4+
5+
on:
6+
push:
7+
branches:
8+
- "*.x"
9+
10+
jobs:
11+
mutation_testing:
12+
name: "5️⃣ Mutation Testing"
13+
needs:
14+
- "byte_level"
15+
- "syntax_errors"
16+
runs-on: "ubuntu-latest"
17+
steps:
18+
- name: "Set up PHP"
19+
uses: "shivammathur/setup-php@v2"
20+
with:
21+
php-version: "8.1"
22+
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
23+
24+
- name: "Checkout code"
25+
uses: "actions/checkout@v4"
26+
27+
- name: "Fetch Git base reference"
28+
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
29+
30+
- name: "Install dependencies"
31+
uses: "ramsey/composer-install@v2"
32+
with:
33+
dependency-versions: "highest"
34+
composer-options: "--optimize-autoloader"
35+
36+
- name: "Execute Infection"
37+
run: "make ci-mu"

‎.github/workflows/integrate.yml

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: "ubuntu-latest"
1515
steps:
1616
- name: "Checkout code"
17-
uses: "actions/checkout@v3"
17+
uses: "actions/checkout@v4"
1818

1919
- name: "Check file permissions"
2020
run: |
@@ -34,7 +34,7 @@ jobs:
3434
php-version: "8.1"
3535

3636
- name: "Checkout code"
37-
uses: "actions/checkout@v3"
37+
uses: "actions/checkout@v4"
3838

3939
- name: "Install dependencies"
4040
uses: "ramsey/composer-install@v2"
@@ -55,6 +55,8 @@ jobs:
5555
- "ubuntu-latest"
5656
php-version:
5757
- "8.1"
58+
- "8.2"
59+
- "8.3"
5860
dependencies:
5961
- "lowest"
6062
- "highest"
@@ -68,7 +70,7 @@ jobs:
6870
coverage: "xdebug"
6971

7072
- name: "Checkout code"
71-
uses: "actions/checkout@v3"
73+
uses: "actions/checkout@v4"
7274

7375
- name: "Install dependencies"
7476
uses: "ramsey/composer-install@v2"
@@ -101,7 +103,7 @@ jobs:
101103
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
102104

103105
- name: "Checkout code"
104-
uses: "actions/checkout@v3"
106+
uses: "actions/checkout@v4"
105107

106108
- name: "Validate Composer configuration"
107109
run: "composer validate --strict"
@@ -129,7 +131,7 @@ jobs:
129131
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
130132

131133
- name: "Checkout code"
132-
uses: "actions/checkout@v3"
134+
uses: "actions/checkout@v4"
133135

134136
- name: "Check adherence to EditorConfig"
135137
uses: "greut/eclint-action@v0"
@@ -143,34 +145,6 @@ jobs:
143145
- name: "Check coding style"
144146
run: "make ci-cs"
145147

146-
mutation_testing:
147-
name: "5️⃣ Mutation Testing"
148-
needs:
149-
- "byte_level"
150-
- "syntax_errors"
151-
runs-on: "ubuntu-latest"
152-
steps:
153-
- name: "Set up PHP"
154-
uses: "shivammathur/setup-php@v2"
155-
with:
156-
php-version: "8.1"
157-
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
158-
159-
- name: "Checkout code"
160-
uses: "actions/checkout@v3"
161-
162-
- name: "Fetch Git base reference"
163-
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
164-
165-
- name: "Install dependencies"
166-
uses: "ramsey/composer-install@v2"
167-
with:
168-
dependency-versions: "highest"
169-
composer-options: "--optimize-autoloader"
170-
171-
- name: "Execute Infection"
172-
run: "make ci-mu"
173-
174148
rector_checkstyle:
175149
name: "6️⃣ Rector Checkstyle"
176150
needs:
@@ -186,7 +160,7 @@ jobs:
186160
coverage: "xdebug"
187161

188162
- name: "Checkout code"
189-
uses: "actions/checkout@v3"
163+
uses: "actions/checkout@v4"
190164

191165
- name: "Fetch Git base reference"
192166
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
@@ -208,7 +182,7 @@ jobs:
208182
runs-on: "ubuntu-20.04"
209183
steps:
210184
- name: "Checkout code"
211-
uses: "actions/checkout@v3"
185+
uses: "actions/checkout@v4"
212186

213187
- name: "Check exported files"
214188
run: |

‎.github/workflows/merge-me.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/workflows/release-on-milestone-closed.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414

1515
steps:
1616
- name: "Checkout"
17-
uses: "actions/checkout@v3"
17+
uses: "actions/checkout@v4"
18+
with:
19+
fetch-depth: 0
1820

1921
- name: "Release"
2022
uses: "laminas/automatic-releases@1.24.0"
@@ -35,7 +37,9 @@ jobs:
3537

3638
steps:
3739
- name: "Checkout"
38-
uses: "actions/checkout@v3"
40+
uses: "actions/checkout@v4"
41+
with:
42+
fetch-depth: 0
3943

4044
- name: "Create Merge-Up Pull Request"
4145
uses: "laminas/automatic-releases@1.24.0"
@@ -56,7 +60,9 @@ jobs:
5660

5761
steps:
5862
- name: "Checkout"
59-
uses: "actions/checkout@v3"
63+
uses: "actions/checkout@v4"
64+
with:
65+
fetch-depth: 0
6066

6167
- name: "Create and/or Switch to new Release Branch"
6268
uses: "laminas/automatic-releases@1.24.0"
@@ -77,7 +83,7 @@ jobs:
7783

7884
steps:
7985
- name: "Checkout"
80-
uses: "actions/checkout@v3"
86+
uses: "actions/checkout@v4"
8187
with:
8288
fetch-depth: 0
8389

@@ -100,7 +106,9 @@ jobs:
100106

101107
steps:
102108
- name: "Checkout"
103-
uses: "actions/checkout@v3"
109+
uses: "actions/checkout@v4"
110+
with:
111+
fetch-depth: 0
104112

105113
- name: "Create new milestones"
106114
uses: "laminas/automatic-releases@1.24.0"

‎.gitsplit.yml

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,59 @@
11
splits:
2-
- prefix: "src/Component/Core"
3-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git"
4-
- prefix: "src/Component/Checker"
5-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
6-
- prefix: "src/Component/Signature"
2+
- prefix: "src/Bundle"
3+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
4+
- prefix: "src/Library"
5+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
6+
- prefix: "src/Experimental"
7+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
8+
- prefix: "src/Deprecated/Signature"
79
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
8-
- prefix: "src/Component/Encryption"
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"
919
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption.git"
10-
- prefix: "src/Component/KeyManagement"
20+
- prefix: "src/Deprecated/KeyManagement"
1121
target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
12-
- prefix: "src/Component/Console"
13-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git"
14-
- prefix: "src/Component/NestedToken"
22+
- prefix: "src/Deprecated/NestedToken"
1523
target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
16-
- prefix: "src/Bundle/JoseFramework"
17-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
18-
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESCBC"
24+
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC"
1925
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
20-
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESGCM"
26+
- prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM"
2127
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcm.git"
22-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
28+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
2329
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcmkw.git"
24-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/AESKW"
30+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW"
2531
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aeskw.git"
26-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/Direct"
32+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct"
2733
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-dir.git"
28-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/ECDHES"
34+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES"
2935
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-ecdh-es.git"
30-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/PBES2"
36+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2"
3137
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-pbes2.git"
32-
- prefix: "src/EncryptionAlgorithm/KeyEncryption/RSA"
38+
- prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA"
3339
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-rsa.git"
34-
- prefix: "src/SignatureAlgorithm/ECDSA"
40+
- prefix: "src/Deprecated/SignatureAlgorithm/ECDSA"
3541
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-ecdsa.git"
36-
- prefix: "src/SignatureAlgorithm/EdDSA"
42+
- prefix: "src/Deprecated/SignatureAlgorithm/EdDSA"
3743
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-eddsa.git"
38-
- prefix: "src/SignatureAlgorithm/None"
44+
- prefix: "src/Deprecated/SignatureAlgorithm/None"
3945
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-none.git"
40-
- prefix: "src/SignatureAlgorithm/HMAC"
46+
- prefix: "src/Deprecated/SignatureAlgorithm/HMAC"
4147
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-hmac.git"
42-
- prefix: "src/SignatureAlgorithm/RSA"
48+
- prefix: "src/Deprecated/SignatureAlgorithm/RSA"
4349
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-rsa.git"
44-
- prefix: "src/SignatureAlgorithm/Experimental"
50+
- prefix: "src/Deprecated/SignatureAlgorithm/Experimental"
4551
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-experimental.git"
46-
- prefix: "src/EncryptionAlgorithm/Experimental"
52+
- prefix: "src/Deprecated/EncryptionAlgorithm/Experimental"
4753
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
48-
- prefix: "src/Ecc"
49-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git"
50-
- prefix: "packs/encryption"
54+
- prefix: "src/Deprecated/Pack/Encryption"
5155
target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
52-
- prefix: "packs/signature"
56+
- prefix: "rc/Deprecated/Pack/Signature"
5357
target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
5458

5559
origins:

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ st: vendor ## Run static analyse
2525

2626
################################################
2727

28-
ci-mu: vendor ## Mutation tests (for Github only)
28+
ci-mu: vendor ## Mutation tests (for GitHub only)
2929
vendor/bin/infection --logger-github -s --threads=$$(nproc) --min-msi=45 --min-covered-msi=60
3030

3131
ci-cc: vendor ## Show test coverage rates (console)

‎SECURITY.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
| Version | Supported |
66
|---------|--------------------|
77
| 4.0.x | :white_check_mark: |
8-
| 3.1.x | :white_check_mark: |
9-
| 3.0.x | :white_check_mark: |
10-
| < 3.0.0 | :x: |
8+
| 3.3.x | :white_check_mark: |
9+
| < 3.3.0 | :x: |
1110

1211
## Reporting a Vulnerability
1312

0 commit comments

Comments
 (0)