Skip to content

Commit b818fae

Browse files
committed
Composer/lint: remove redundant duplicate script
The `lint-gte84` script became a duplicate of the `lint-gte80` script with the version drop of PHP < 7.0 in PR 192, so let's remove this duplication.
1 parent 33d5b8d commit b818fae

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ jobs:
7070
if: ${{ startsWith( matrix.php, '7' ) && matrix.php != '7.0' }}
7171
run: composer lint7
7272

73-
- name: "Lint PHP files against parse errors - PHP 8.0 - 8.3"
74-
if: ${{ matrix.php != 'nightly' && matrix.php >= 8.0 && matrix.php < 8.4 }}
73+
- name: "Lint PHP files against parse errors - PHP 8.0+"
74+
if: ${{ matrix.php == 'nightly' || matrix.php >= 8.0 }}
7575
run: composer lint-gte80 -- --checkstyle | cs2pr
76-
77-
- name: "Lint PHP files against parse errors - PHP >= 8.4"
78-
if: ${{ matrix.php == 'nightly' || matrix.php >= 8.4 }}
79-
run: composer lint-gte84

composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
"lint-gte80": [
6868
"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
6969
],
70-
"lint-gte84": [
71-
"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
72-
],
7370
"check-cs": [
7471
"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --runtime-set testVersion 7.0-"
7572
],
@@ -92,8 +89,7 @@
9289
"scripts-descriptions": {
9390
"lint7": "Check the PHP files for parse errors. (PHP 7.1 - 7.4)",
9491
"lint70": "Check the PHP files for parse errors. (PHP 7.0)",
95-
"lint-gte80": "Check the PHP files for parse errors. (PHP 8.0 - 8.3)",
96-
"lint-gte84": "Check the PHP files for parse errors. (PHP 8.4+)",
92+
"lint-gte80": "Check the PHP files for parse errors. (PHP 8.0+)",
9793
"check-cs": "Check the PHP files for code style violations and best practices.",
9894
"fix-cs": "Auto-fix code style violations in the PHP files.",
9995
"test": "Run the unit tests without code coverage (PHPUnit < 10).",

0 commit comments

Comments
 (0)