Skip to content

Commit

Permalink
Merge pull request #2049 from WordPress/feature/up-minimum-phpcs-vers…
Browse files Browse the repository at this point in the history
…ion-3.6.2

Composer: up the minimum PHPCS version to 3.6.2
  • Loading branch information
dingo-d authored May 16, 2022
2 parents 7415105 + e5e0fdf commit 1702977
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ When you introduce new `public` sniff properties, or your sniff extends a class

## Pre-requisites
* WordPress-Coding-Standards
* PHP_CodeSniffer 3.3.1 or higher
* PHP_CodeSniffer 3.6.2 or higher
* PHPUnit 4.x, 5.x, 6.x or 7.x

The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/dependency-change.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about: A reminder to take action when a WPCS dependency changes

---

<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 3.5: ... -->
<!-- PLEASE prefix the title the Issue with the dependency name and version when action should be taken e.g. PHPCS 3.7.0: ... -->

## Rationale

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
phpcs_version: [ 'dev-master' ]
include:
- php: '7.3'
phpcs_version: '3.5.0'
phpcs_version: '3.6.2'
- php: '5.4'
phpcs_version: '3.5.0'
phpcs_version: '3.6.2'

steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruleset-checks-sniffs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
strategy:
matrix:
php: [ '7.4' ]
phpcs_version: [ 'dev-master', '3.5.0' ]
phpcs_version: [ 'dev-master', '3.6.2' ]

steps:
- name: Checkout repository
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,10 @@ jobs:
continue-on-error: ${{ matrix.allowed_failure }}
strategy:
matrix:
php: [ '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
phpcs_version: [ 'dev-master', '3.5.0' ]
php: [ '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4' ]
phpcs_version: [ 'dev-master', '3.6.2' ]
allowed_failure: [ false ]
include:
- php: '8.1'
phpcs_version: 'dev-master'
allowed_failure: false
# PHPCS is only compatible with PHP 8.1 as of version 3.6.1.
- php: '8.1'
phpcs_version: '3.6.1'
allowed_failure: false
- php: '8.0'
phpcs_version: 'dev-master'
allowed_failure: false
# PHPCS is only compatible with PHP 8.0 as of version 3.5.7.
- php: '8.0'
phpcs_version: '3.5.7'
allowed_failure: false
# Add extra build to test against PHPCS 4.
#- php: '7.4'
# phpcs_version: '4.0.x-dev as 3.9.99'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ This project is a collection of [PHP_CodeSniffer](https://github.com/squizlabs/P

### Requirements

The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.3.1** or higher.
The WordPress Coding Standards require PHP 5.4 or higher and [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.6.2** or higher.

### Composer

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"require": {
"php": ">=5.4",
"squizlabs/php_codesniffer": "^3.5.0",
"squizlabs/php_codesniffer": "^3.6.2",
"phpcsstandards/phpcsutils": "^1.0",
"phpcsstandards/phpcsextra": "^1.0"
},
Expand Down

0 comments on commit 1702977

Please sign in to comment.