From b2647fc39cadbc88a19ad1ef4bb56a2d7128bad9 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 27 Jan 2025 10:05:44 +0100 Subject: [PATCH] [TASK] Drop PHP_CodeSniffer The GPG keys used to sign the PHARs are no longer available, which breaks installation of PHP_CodeSniffer (and its fixer), which breaks the build. In `main`, we already dropped the tool in #468. Also update PHPStan as the old version was signed with a key that is no longer available. --- .github/workflows/ci.yml | 4 +--- .phive/phars.xml | 4 +--- composer.json | 8 +------- config/phpcs.xml | 17 ----------------- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 config/phpcs.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 815ccb43..020b11cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,8 +85,6 @@ jobs: fail-fast: false matrix: include: - - command: sniffer - php-version: '7.4' - command: fixer php-version: '7.4' - command: stan @@ -121,7 +119,7 @@ jobs: - name: Install development tools run: | - phive --no-progress install --trust-gpg-keys 0FDE18AE1D09E19F60F6B1CBC00543248C87FB13,BBAB5DF0A0D6672989CF1869E82B2FB314E9906E,689DAD778FF08760E046228BA978220305CD5C32,CA7C2C7A30C8E8E1274A847651C67305FFC2E5C0 + phive --no-progress install --trust-gpg-keys BBAB5DF0A0D6672989CF1869E82B2FB314E9906E,CA7C2C7A30C8E8E1274A847651C67305FFC2E5C0,D32680D5957DC7116BE29C14CF1A108D0E7AE720 - name: Run Command run: composer ci:php:${{ matrix.command }} diff --git a/.phive/phars.xml b/.phive/phars.xml index 875c1d19..c1fb5dad 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,7 +1,5 @@ - - - + diff --git a/composer.json b/composer.json index e562ed6d..b3f9d723 100644 --- a/composer.json +++ b/composer.json @@ -52,30 +52,24 @@ "@ci:static" ], "ci:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots bin src tests", - "ci:php:sniffer": "@php ./.phive/phpcs.phar --standard=config/phpcs.xml bin src tests", "ci:php:stan": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon", "ci:static": [ "@ci:php:fixer", - "@ci:php:sniffer", "@ci:php:stan" ], "fix:php": [ - "@fix:php:fixer", - "@fix:php:sniffer" + "@fix:php:fixer" ], "fix:php:fixer": "@php ./.phive/php-cs-fixer.phar --config=config/php-cs-fixer.php fix bin src tests", - "fix:php:sniffer": "@php ./.phive/phpcbf.phar --standard=config/phpcs.xml bin src tests", "phpstan:baseline": "@php ./.phive/phpstan.phar --configuration=config/phpstan.neon --generate-baseline=config/phpstan-baseline.neon" }, "scripts-descriptions": { "ci": "Runs all dynamic and static code checks (i.e. currently, only the static checks).", "ci:php:fixer": "Checks the code style with PHP CS Fixer.", - "ci:php:sniffer": "Checks the code style with PHP_CodeSniffer.", "ci:php:stan": "Checks the types with PHPStan.", "ci:static": "Runs all static code analysis checks for the code.", "fix:php": "Autofixes all autofixable issues in the PHP code.", "fix:php:fixer": "Fixes autofixable issues found by PHP CS Fixer.", - "fix:php:sniffer": "Fixes autofixable issues found by PHP_CodeSniffer.", "phpstand:baseline": "Updates the PHPStan baseline file to match the code." } } diff --git a/config/phpcs.xml b/config/phpcs.xml deleted file mode 100644 index 14473bb2..00000000 --- a/config/phpcs.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - This standard requires PHP_CodeSniffer >= 3.6.0. - - - - - - - - - - - - -