Merge pull request #282 from humanmade/update-phpcs

Update PHPCS to support PHP 8+

Author: tfrommen

.travis.yml

@@ -31,6 +31,23 @@ jobs:
         - composer install
       script:
         - vendor/bin/phpunit
+    - language: php
+      php: 8.0
+      install:
+        # For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
+        - composer install --ignore-platform-reqs
+      script:
+        - vendor/bin/phpunit
+    - language: php
+      php: 8.1
+      install:
+        # For PHP 8.0+, we need to ignore platform reqs as PHPUnit 7 is still used.
+        - composer install --ignore-platform-reqs
+      script:
+        # For PHP 8.1+, we need to ignore the config file so that PHPUnit 7 doesn't try to read it and cause an error.
+        # Instead, we pass all required settings as part of the phpunit command.
+        - vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/AllSniffs.php
+        - vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests tests/FixtureTests.php
     - language: node_js
       node_js: 16
       install:

composer.json

@@ -5,15 +5,15 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.1",
-		"wp-coding-standards/wpcs": "2.2.1",
+		"wp-coding-standards/wpcs": "2.3.0",
 		"automattic/vipwpcs": "2.0.0",
 		"fig-r/psr2r-sniffer": "^0.5.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.0.0",
-		"squizlabs/php_codesniffer": "~3.5.0",
+		"squizlabs/php_codesniffer": "~3.5",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^5.7"
+		"phpunit/phpunit": "^7"
 	},
 	"scripts": {
 		"test": "phpunit"

phpunit.xml.dist

@@ -1,4 +1,5 @@
 <phpunit
+	beStrictAboutTestsThatDoNotTestAnything="false"
 	bootstrap="tests/bootstrap.php"
 	colors="true"
 	convertErrorsToExceptions="true"
@@ -7,7 +8,7 @@
 >
 	<testsuites>
 		<!-- Default test suite to run all tests -->
-		<testsuite>
+		<testsuite name="all">
 			<file>tests/AllSniffs.php</file>
 			<file>tests/FixtureTests.php</file>
 		</testsuite>

tests/AllSniffs.php

@@ -42,6 +42,7 @@ public static function main() {
 	public static function suite() {
 		$GLOBALS['PHP_CODESNIFFER_SNIFF_CODES']   = array();
 		$GLOBALS['PHP_CODESNIFFER_FIXABLE_CODES'] = array();
+		$GLOBALS['PHP_CODESNIFFER_SNIFF_CASE_FILES'] = array();
 
 		$suite = new TestSuite( 'HM Standards' );
 

tests/bootstrap.php

@@ -6,8 +6,8 @@
 
 // Check phpcs is installed.
 $phpcs_dir = dirname( __DIR__ ) . '/vendor/squizlabs/php_codesniffer';
-if ( ! file_exists($phpcs_dir)) {
-	throw new Exception( 'Could not find PHP_CodeSniffer. Run `composer install --prefer-source --dev`' );
+if ( ! file_exists( $phpcs_dir ) ) {
+	throw new Exception( 'Could not find PHP_CodeSniffer. Run `composer install --prefer-source`' );
 }
 
 // Check phpcs' test framework is available.