Skip to content

Commit 3005ee6

Browse files
committed
Update PHPStan baseline with new types rules
The PHPStan baseline is updated to include newly identified type issues concerning return value types in iterable arrays for getSupportedTypes() method in both JWESerializer and JWSSerializer classes. Also, remove irrelevant default property type issues of various command classes thus reducing noise in the baseline file.
2 parents 570052b + b2be12f commit 3005ee6

File tree

600 files changed

+2240
-5450
lines changed

Some content is hidden

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

600 files changed

+2240
-5450
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
| Q | A
2-
| ------------- | ---
3-
| Branch? | <!-- see below -->
4-
| Bug fix? | yes/no
5-
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
6-
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
7-
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
8-
| License | MIT
1+
Target branch:
2+
Resolves issue # <!-- #-prefixed issue number(s), if any -->
3+
4+
<!-- replace space with "x" in square brackets: [x] -->
5+
- [ ] It is a Bug fix
6+
- [ ] It is a New feature
7+
- [ ] It is related to dependencies
8+
9+
Includes:
10+
- [ ] Breaks BC
11+
- [ ] Deprecations
12+
913
<!--
10-
Replace this notice by a short README for your feature/bugfix. This will help people
11-
understand your PR and can be used as a start for the documentation.
14+
Fill in this template according to the PR you're about to submit.
15+
Replace this comment by a description of what your PR is solving.
1216
13-
Additionally:
14-
- Always add tests and ensure they pass.
15-
- Never break backward compatibility (unless you are working on the next major release branch).
16-
- Bug fixes must be submitted against the lowest maintained branch where they apply
17-
(lowest branches are regularly merged to upper ones so they get the fixes too.)
18-
- Features and deprecations must be submitted against the last major branch (e.g. 1.x).
17+
Please consider the following requirement:
18+
* Modification of existing tests should be avoided unless deemed necessary.
19+
* You MUST never open a PR related to a security issue. Contact Spomky in private at https://gitter.im/Spomky/
1920
-->
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Dependency Review'
2+
on: [pull_request]
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
dependency-review:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 'Checkout Repository'
12+
uses: actions/checkout@v4
13+
- name: 'Dependency Review'
14+
uses: actions/dependency-review-action@v4

.github/workflows/infection.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow
2-
31
name: "Integrate"
42

53
on:
@@ -15,7 +13,7 @@ jobs:
1513
- name: "Set up PHP"
1614
uses: "shivammathur/setup-php@v2"
1715
with:
18-
php-version: "8.1"
16+
php-version: "8.3"
1917
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
2018

2119
- name: "Checkout code"

.github/workflows/integrate.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow
2-
31
name: "Integrate"
42

53
on:
@@ -31,7 +29,7 @@ jobs:
3129
- name: "Set up PHP"
3230
uses: "shivammathur/setup-php@v2"
3331
with:
34-
php-version: "8.1"
32+
php-version: "8.3"
3533

3634
- name: "Checkout code"
3735
uses: "actions/checkout@v4"
@@ -54,8 +52,6 @@ jobs:
5452
operating-system:
5553
- "ubuntu-latest"
5654
php-version:
57-
- "8.1"
58-
- "8.2"
5955
- "8.3"
6056
dependencies:
6157
- "lowest"
@@ -81,14 +77,6 @@ jobs:
8177
- name: "Execute unit tests"
8278
run: "make ci-cc"
8379

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-
9280
static_analysis:
9381
name: "3️⃣ Static Analysis"
9482
needs:
@@ -99,7 +87,7 @@ jobs:
9987
- name: "Set up PHP"
10088
uses: "shivammathur/setup-php@v2"
10189
with:
102-
php-version: "8.1"
90+
php-version: "8.3"
10391
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
10492

10593
- name: "Checkout code"
@@ -127,7 +115,7 @@ jobs:
127115
- name: "Set up PHP"
128116
uses: "shivammathur/setup-php@v2"
129117
with:
130-
php-version: "8.1"
118+
php-version: "8.3"
131119
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
132120

133121
- name: "Checkout code"
@@ -155,7 +143,7 @@ jobs:
155143
- name: "Set up PHP"
156144
uses: "shivammathur/setup-php@v2"
157145
with:
158-
php-version: "8.1"
146+
php-version: "8.3"
159147
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
160148
coverage: "xdebug"
161149

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Lock Issues'
2+
3+
on:
4+
schedule:
5+
- cron: '28 4 * * *'
6+
7+
jobs:
8+
lock:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: dessant/lock-threads@v5
12+
with:
13+
github-token: ${{ github.token }}
14+
issue-inactive-days: '31'
15+
exclude-issue-created-before: ''
16+
exclude-any-issue-labels: ''
17+
add-issue-labels: ''
18+
issue-comment: >
19+
This thread has been automatically locked since there has not been
20+
any recent activity after it was closed. Please open a new issue for
21+
related bugs.
22+
issue-lock-reason: 'resolved'
23+
process-only: 'issues'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
2-
31
name: "Automatic Releases"
42

53
on:

.github/workflows/scorecards.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Scorecards supply-chain security
2+
3+
on:
4+
schedule:
5+
- cron: '34 4 * * 6'
6+
push:
7+
branches: [ "*.*.x" ]
8+
9+
permissions: read-all
10+
11+
jobs:
12+
analysis:
13+
name: Scorecards analysis
14+
runs-on: ubuntu-latest
15+
permissions:
16+
security-events: write
17+
id-token: write
18+
contents: read
19+
actions: read
20+
21+
steps:
22+
- name: "Checkout code"
23+
uses: actions/checkout@v4
24+
with:
25+
persist-credentials: false
26+
27+
- name: "Run analysis"
28+
uses: ossf/scorecard-action@v2.3.1
29+
with:
30+
results_file: results.sarif
31+
results_format: sarif
32+
publish_results: true
33+
34+
- name: "Upload artifact"
35+
uses: actions/upload-artifact@v4.3.1
36+
with:
37+
name: SARIF file
38+
path: results.sarif
39+
retention-days: 5
40+
41+
- name: "Upload to code-scanning"
42+
uses: github/codeql-action/upload-sarif@v3
43+
with:
44+
sarif_file: results.sarif

.gitsplit.yml

Lines changed: 0 additions & 50 deletions
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$

0 commit comments

Comments
 (0)