Skip to content

Commit bbdc3d0

Browse files
committed
Merge branch '3.x' into 4.x
2 parents 0c3dc35 + 3d9e4c6 commit bbdc3d0

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

.github/workflows/verify-release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ jobs:
141141
env:
142142
FINGERPRINT: "0xD91D86963AF3A29B6520462297B02DD8E5071466"
143143
run: gpg --keyserver "hkps://keys.openpgp.org" --recv-keys "$FINGERPRINT"
144+
145+
- name: Download public key (Aug 2026)
146+
env:
147+
FINGERPRINT: "0x5CB4F778BF9BC4FB67AE511D96E91A992CF22FF4"
148+
run: gpg --keyserver "hkps://keys.openpgp.org" --recv-keys "$FINGERPRINT"
144149

145150
- name: Verify signature of the PHAR file
146151
run: gpg --verify ${{ steps.source.outputs.FILE }}.asc ${{ steps.source.outputs.FILE }}
@@ -230,7 +235,7 @@ jobs:
230235
- name: Install
231236
run: >
232237
phive install ${{ matrix.pharfile }} --copy
233-
--trust-gpg-keys 689DAD778FF08760E046228BA978220305CD5C32,D91D86963AF3A29B6520462297B02DD8E5071466
238+
--trust-gpg-keys 689DAD778FF08760E046228BA978220305CD5C32,D91D86963AF3A29B6520462297B02DD8E5071466,5CB4F778BF9BC4FB67AE511D96E91A992CF22FF4
234239
235240
- name: "DEBUG: List files"
236241
run: ls -R

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ php phpcbf.phar -h
5050
```
5151

5252
These Phars are signed with the official Release key for PHPCS with the
53-
fingerprint `D91D 8696 3AF3 A29B 6520 4622 97B0 2DD8 E507 1466`.
53+
fingerprint `5CB4 F778 BF9B C4FB 67AE 511D 96E9 1A99 2CF2 2FF4`.
5454

5555
As of PHP_CodeSniffer 3.10.3, the provenance of PHAR files associated with a release can be verified via [GitHub Artifact Attestations](https://docs.github.com/en/actions/how-tos/secure-your-work/use-artifact-attestations/use-artifact-attestations) using the [GitHub CLI tool](https://cli.github.com/) with the following command: `gh attestation verify [phpcs|phpcbf].phar -o PHPCSStandards`.
5656

@@ -80,8 +80,8 @@ You will then be able to run PHP_CodeSniffer from the vendor bin directory:
8080
### Phive
8181
If you use Phive, you can install PHP_CodeSniffer as a project tool using the following commands:
8282
```bash
83-
phive install --trust-gpg-keys D91D86963AF3A29B6520462297B02DD8E5071466 phpcs
84-
phive install --trust-gpg-keys D91D86963AF3A29B6520462297B02DD8E5071466 phpcbf
83+
phive install --trust-gpg-keys 5CB4F778BF9BC4FB67AE511D96E91A992CF22FF4 phpcs
84+
phive install --trust-gpg-keys 5CB4F778BF9BC4FB67AE511D96E91A992CF22FF4 phpcbf
8585
```
8686
You will then be able to run PHP_CodeSniffer from the `tools` directory:
8787
```bash

0 commit comments

Comments
 (0)