Merge pull request #832 from WordPress/feature/update-to-wpcs-3.0

.github/workflows/cs.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: 'latest'
           coverage: none
           tools: cs2pr
 

.phpcs.xml.dist

@@ -71,12 +71,6 @@
 		<!-- Replaced by the Squiz version of the sniff which doesn't enforce whitespace around array index keys. -->
 		<exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions"/>
 
-		<!-- Disabled as the preference for this repo is no spaces on the inside of parentheses.
-			 Once WPCS 3.0.0 comes out, the opposite can be enforced via the
-			 NormalizedArrays.Arrays.ArrayBraceSpacing sniff from PHPCSExtra. -->
-		<exclude name="WordPress.Arrays.ArrayDeclarationSpacing.NoSpaceAfterArrayOpener"/>
-		<exclude name="WordPress.Arrays.ArrayDeclarationSpacing.NoSpaceBeforeArrayCloser"/>
-
 		<!-- Let spacing before a cast be determined by the operator/parentheses whitespace rule
 			 of the preceding character. -->
 		<exclude name="WordPress.WhiteSpace.CastStructureSpacing"/>
@@ -86,7 +80,7 @@
 			 ========================================================================== -->
 		<exclude name="WordPress.PHP.YodaConditions"/>
 		<!-- A while loop is the only valid control structure where an assignment can be justified. -->
-		<exclude name="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
+		<exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition"/>
 
 		<!-- ==========================================================================
 			 Miscellaneous other exclusions.
@@ -96,7 +90,7 @@
 		<exclude name="WordPress.Files.FileName"/>
 
 		<!-- WPCS demands long arrays. We'll be using short arrays from now on. -->
-		<exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax"/>
 
 		<!-- Ignore WP specific sniffs as Requests is also used outside of a WP context. -->
 		<exclude name="WordPress.WP"/>
@@ -133,6 +127,12 @@
 		</properties>
 	</rule>
 
+	<rule ref="NormalizedArrays.Arrays.ArrayBraceSpacing">
+		<properties>
+			<property name="spacesSingleLine" value="0"/>
+		</properties>
+	</rule>
+
 	<!-- Include replacement sniffs which enforce the opposite of WPCS for several excluded sniffs. -->
 	<rule ref="Squiz.WhiteSpace.ControlStructureSpacing">
 		<exclude name="Squiz.WhiteSpace.ControlStructureSpacing.LineAfterClose"/>
@@ -173,7 +173,7 @@
 	<!-- Allow error silencing only for a select group of functions. -->
 	<rule ref="WordPress.PHP.NoSilencedErrors">
 		<properties>
-			<property name="custom_whitelist" type="array">
+			<property name="customAllowedFunctionsList" type="array">
 				<element value="gzdecode"/>
 				<element value="gzinflate"/>
 				<element value="gzuncompress"/>

composer.json

@@ -41,14 +41,12 @@
     "ext-json": "*"
   },
   "require-dev": {
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
     "php-parallel-lint/php-console-highlighter": "^1.0.0",
     "php-parallel-lint/php-parallel-lint": "^1.3.2",
     "phpcompatibility/php-compatibility": "^9.0",
     "requests/test-server": "dev-main",
     "roave/security-advisories": "dev-latest",
-    "squizlabs/php_codesniffer": "^3.7.1",
-    "wp-coding-standards/wpcs": "^2.0",
+    "wp-coding-standards/wpcs": "^3.0",
     "yoast/phpunit-polyfills": "^2.0.0"
   },
   "suggest": {

library/Requests.php

@@ -53,6 +53,8 @@ class Requests extends WpOrg\Requests\Requests {
 	 *
 	 * @codeCoverageIgnore
 	 *
+	 * @phpcs:disable Universal.NamingConventions.NoReservedKeywordParameterNames.classFound -- Deprecated, so not relevant to change.
+	 *
 	 * @param string $class Class name to load
 	 */
 	public static function autoloader($class) {

src/Session.php

@@ -227,7 +227,13 @@ public function patch($url, $headers, $data = [], $options = []) {
 	 * @throws \WpOrg\Requests\Exception On invalid URLs (`nonhttp`)
 	 */
 	public function request($url, $headers = [], $data = [], $type = Requests::GET, $options = []) {
-		$request = $this->merge_request(compact('url', 'headers', 'data', 'options'));
+		$request = [
+			'url'     => $url,
+			'headers' => $headers,
+			'data'    => $data,
+			'options' => $options,
+		];
+		$request = $this->merge_request($request);
 
 		return Requests::request($request['url'], $request['headers'], $request['data'], $type, $request['options']);
 	}

tests/Autoload/AutoloadTest.php

@@ -67,7 +67,7 @@ static function ($errno, $errstr) {
 	public function testAutoloadOfOldRequestsClassDoesNotThrowAFatalForFinalClass() {
 		define('REQUESTS_SILENCE_PSR0_DEPRECATIONS', true);
 
-		$this->assertInstanceOf(FilteredIterator::class, new Requests_utility_filteredIterator([], static function() {}));
+		$this->assertInstanceOf(FilteredIterator::class, new Requests_utility_filteredIterator([], static function () {}));
 	}
 
 	/**

tests/Cookie/ConstructorTest.php

@@ -356,7 +356,7 @@ public function testAttributesAreNormalizedInDictionary() {
 	 *
 	 * @return array
 	 */
-	private function arrayUnshiftAssoc($base_array, $key, $value ) {
+	private function arrayUnshiftAssoc($base_array, $key, $value) {
 		$base_array       = array_reverse($base_array, true);
 		$base_array[$key] = $value;
 		return array_reverse($base_array, true);

tests/Hooks/DispatchTest.php

@@ -120,48 +120,48 @@ public function testDispatchRespectsHookPriority() {
 		// Register multiple callbacks for the same hook with a variation of priorities.
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "no prio 0\n";
 			}
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio 10-1\n";
 			},
 			10
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio -3\n";
 			},
 			-3
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio 5\n";
 			},
 			5
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio 2-1\n";
 			},
 			2
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio 2-2\n";
 			},
 			2
 		);
 		$this->hooks->register(
 			'hook_a',
-			static function(&$text) {
+			static function (&$text) {
 				$text .= "prio 10-2\n";
 			},
 			10

tests/Hooks/RegisterTest.php

@@ -183,7 +183,7 @@ public function testRegister() {
 	public function testRegisterClosureCallback() {
 		$this->hooks->register(
 			'hookname',
-			static function($param) {
+			static function () {
 				return true;
 			}
 		);