Merge pull request #318 from Yoast/JRF/yoastcs-add-phpcsextra

YoastCS: add dependency on PHPCSExtra and replace some sniffs with versions from Extra
Yoast · Nov 3, 2023 · 6754fc3 · 6754fc3
2 parents b075884 + 9ab69a9
commit 6754fc3
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 523 deletions.
diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml
@@ -54,6 +54,7 @@ jobs:
         run: >
           composer require --no-update --no-scripts --no-interaction
           squizlabs/php_codesniffer:"dev-master"
+          phpcsstandards/phpcsextra:"dev-develop"
 
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies

diff --git a/README.md b/README.md
@@ -66,6 +66,7 @@ The `Yoast` standard for PHP_CodeSniffer is comprised of the following:
 * The `WordPress` ruleset from the [WordPress Coding Standards](https://github.com/WordPress/WordPress-Coding-Standards) implementing the official [WordPress PHP Coding Standards](https://make.wordpress.org/core/handbook/coding-standards/php/), with some [select exclusions](https://github.com/Yoast/yoastcs/blob/develop/Yoast/ruleset.xml#L29-L75).
 * The [`PHPCompatibilityWP`](https://github.com/PHPCompatibility/PHPCompatibilityWP) ruleset which checks code for PHP cross-version compatibility while preventing false positives for functionality polyfilled within WordPress.
 * Select additional sniffs taken from [`PHP_CodeSniffer`](https://github.com/squizlabs/PHP_CodeSniffer).
+* Select additional sniffs taken from [`PHPCSExtra`](https://github.com/PHPCSStandards/PHPCSExtra).
 * 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/Docs/ControlStructures/IfElseDeclarationStandard.xml b/Yoast/Docs/ControlStructures/IfElseDeclarationStandard.xml
diff --git a/Yoast/Docs/Namespaces/NamespaceDeclarationStandard.xml b/Yoast/Docs/Namespaces/NamespaceDeclarationStandard.xml
diff --git a/Yoast/Sniffs/ControlStructures/IfElseDeclarationSniff.php b/Yoast/Sniffs/ControlStructures/IfElseDeclarationSniff.php
diff --git a/Yoast/Sniffs/Namespaces/NamespaceDeclarationSniff.php b/Yoast/Sniffs/Namespaces/NamespaceDeclarationSniff.php