Skip to content

Commit

Permalink
Merge pull request #234 from Yoast/feature/composer-lint-scripts-cleanup
Browse files Browse the repository at this point in the history
Composer/lint: remove redundant duplicate script
  • Loading branch information
jrfnl authored Jan 12, 2025
2 parents 33d5b8d + b818fae commit 1bc0d31
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ jobs:
if: ${{ startsWith( matrix.php, '7' ) && matrix.php != '7.0' }}
run: composer lint7

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

- name: "Lint PHP files against parse errors - PHP >= 8.4"
if: ${{ matrix.php == 'nightly' || matrix.php >= 8.4 }}
run: composer lint-gte84
6 changes: 1 addition & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
"lint-gte80": [
"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
],
"lint-gte84": [
"@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . -e php --show-deprecated --exclude vendor --exclude .git"
],
"check-cs": [
"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --runtime-set testVersion 7.0-"
],
Expand All @@ -92,8 +89,7 @@
"scripts-descriptions": {
"lint7": "Check the PHP files for parse errors. (PHP 7.1 - 7.4)",
"lint70": "Check the PHP files for parse errors. (PHP 7.0)",
"lint-gte80": "Check the PHP files for parse errors. (PHP 8.0 - 8.3)",
"lint-gte84": "Check the PHP files for parse errors. (PHP 8.4+)",
"lint-gte80": "Check the PHP files for parse errors. (PHP 8.0+)",
"check-cs": "Check the PHP files for code style violations and best practices.",
"fix-cs": "Auto-fix code style violations in the PHP files.",
"test": "Run the unit tests without code coverage (PHPUnit < 10).",
Expand Down

0 comments on commit 1bc0d31

Please sign in to comment.