Skip to content

Commit 84854c3

Browse files
jrfnlgrogy
authored andcommitted
PHPCS: use PHP-Code-Style 2.0
* Composer: require `php-parallel-lint/php-code-style` at 2.0 or higher. * Composer: remove the requirement for PHPCS. This will now be inherited from the code style repo. * GH Actions, test workflow: adjust the removal of the PHPCS dependency to match.
1 parent da39cd2 commit 84854c3

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ jobs:
4040
coverage: none
4141
tools: cs2pr
4242

43-
# Remove PHPCS as it has a minimum PHP requirements of PHP 5.4 and would block install on PHP 5.3.
43+
# Remove the PHPCS standard as it has a minimum PHP requirements of PHP 5.4 and would block install on PHP 5.3.
4444
- name: 'Composer: remove PHPCS'
4545
if: ${{ matrix.php < 5.4 }}
46-
run: composer remove --dev squizlabs/php_codesniffer --no-update
46+
run: composer remove --dev php-parallel-lint/php-code-style --no-update
4747

4848
# Install dependencies and handle caching in one go.
4949
# @link https://github.com/marketplace/actions/install-composer-dependencies

composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
"phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
2222
"php-parallel-lint/php-parallel-lint": "^1.0",
2323
"php-parallel-lint/php-var-dump-check": "0.*",
24-
"squizlabs/php_codesniffer": "3.*",
25-
"php-parallel-lint/php-code-style": "1.0"
24+
"php-parallel-lint/php-code-style": "^2.0"
2625
},
2726
"replace": {
2827
"jakub-onderka/php-console-color": "*"

0 commit comments

Comments
 (0)