diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 4505996..8eb698a 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -49,9 +49,10 @@ jobs: squizlabs/php_codesniffer:"dev-master" phpcsstandards/phpcsutils:"dev-develop" phpcsstandards/phpcsextra:"dev-develop" - wp-coding-standards/wpcs:"dev-develop" + wp-coding-standards/wpcs:"dev-develop as 3.99" # Alias needed to prevent composer conflict with VIPCS. slevomat/coding-standard:"dev-master" sirbrillig/phpcs-variable-analysis:"2.x" + automattic/vipwpcs:"dev-develop" # Install dependencies and handle caching in one go. # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 2a437ba..24e925a 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -62,7 +62,7 @@ jobs: composer require --no-update --no-scripts --no-interaction squizlabs/php_codesniffer:"dev-master" phpcsstandards/phpcsutils:"dev-develop" - wp-coding-standards/wpcs:"dev-develop" + wp-coding-standards/wpcs:"dev-develop as 3.99" # Alias needed to prevent composer conflict with VIPCS. # Install dependencies and handle caching in one go. # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bba6ad7..b7f05df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ concurrency: env: PHPCS_HIGHEST: 'dev-master' UTILS_HIGHEST: 'dev-develop' - WPCS_HIGHEST: 'dev-develop' + WPCS_HIGHEST: 'dev-develop as 3.99' # Alias needed to prevent composer conflict with VIPCS. jobs: #### TEST STAGE #### diff --git a/README.md b/README.md index 33fa713..70551e4 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ The `Yoast` standard for PHP_CodeSniffer is comprised of the following: * Select additional sniffs taken from [`PHP_CodeSniffer`](https://github.com/PHPCSStandards/PHP_CodeSniffer). * Select additional sniffs taken from [`PHPCSExtra`](https://github.com/PHPCSStandards/PHPCSExtra). * Select additional sniffs taken from [`SlevomatCodingStandard`](https://github.com/slevomat/coding-standard). +* Select additional sniffs taken from [WordPress VIP Coding Standards](https://github.com/Automattic/VIP-Coding-Standards/). * A number of custom Yoast specific sniffs. Files within version management and dependency related directories, such as the Composer `vendor` directory, are excluded from the scans by default. diff --git a/Yoast/ruleset.xml b/Yoast/ruleset.xml index 2a0faaf..2c938a6 100644 --- a/Yoast/ruleset.xml +++ b/Yoast/ruleset.xml @@ -405,6 +405,26 @@ + + + + + + + + + + + + + +