PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot (#28176)

We're going to update the WordPress-Coding-Standards library from a 2022-02-07 snapshot to a 2023-01-04 snapshot, which brings in a number of new sniffs. So first we need to fix the stuff the new sniffs will complain about. This PR updates for the following sniffs: * Generic.WhiteSpace.IncrementDecrementSpacing.SpaceAfterIncrement * Modernize.FunctionCalls.Dirname * PSR12.Functions.ReturnTypeDeclaration.SpaceBeforeColon * PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose * Universal.Constants.UppercaseMagicConstants * Universal.Operators.DisallowStandalonePostIncrementDecrement Then it has to do a bit more cleanup on touched lines in some of the excluded files. Yay tech debt.
Automattic · Jan 4, 2023 · 5463f2e · 5463f2e
1 parent 54789e6
commit 5463f2e
Show file tree

Hide file tree

Showing 264 changed files with 338 additions and 456 deletions.
diff --git a/projects/packages/a8c-mc-stats/changelog/update-wpcs-pre-phpcbf b/projects/packages/a8c-mc-stats/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/a8c-mc-stats/src/class-a8c-mc-stats.php b/projects/packages/a8c-mc-stats/src/class-a8c-mc-stats.php
@@ -100,7 +100,6 @@ public function get_stats_urls() {
 		}
 
 		return $urls;
-
 	}
 
 	/**

diff --git a/projects/packages/a8c-mc-stats/tests/php/test_Stats.php b/projects/packages/a8c-mc-stats/tests/php/test_Stats.php
@@ -53,7 +53,6 @@ public function test_add_get() {
 		$this->assertFalse( $stats->add( 'group2', 'test3' ) );
 		$this->assertFalse( $stats->add( true, 'test3' ) );
 		$this->assertFalse( $stats->add( array( 123 ), 'test3' ) );
-
 	}
 
 	/**
@@ -72,7 +71,6 @@ public function test_get_group_query_args() {
 		$this->assertCount( 1, $check );
 		$this->assertArrayHasKey( 'x_jetpack-group', $check );
 		$this->assertEquals( 'test,test2', $check['x_jetpack-group'] );
-
 	}
 
 }
diff --git a/projects/packages/admin-ui/changelog/update-wpcs-pre-phpcbf b/projects/packages/admin-ui/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-admin-ui",
-	"version": "0.2.14",
+	"version": "0.2.15-alpha",
 	"description": "Generic Jetpack wp-admin UI elements",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/admin-ui/#readme",
 	"bugs": {

diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.14';
+	const PACKAGE_VERSION = '0.2.15-alpha';
 
 	/**
 	 * Whether this class has been initialized

diff --git a/projects/packages/admin-ui/tests/php/test_admin_menu.php b/projects/packages/admin-ui/tests/php/test_admin_menu.php
@@ -57,7 +57,6 @@ public function test_page_suffix_matches( $menu_slug ) {
 		$wp_suffix  = add_submenu_page( 'jetpack', 'Test', 'Test', 'read', $menu_slug, '__return_null' );
 
 		$this->assertSame( $our_suffix, $wp_suffix );
-
 	}
 
 	/**

diff --git a/projects/packages/assets/changelog/update-wpcs-pre-phpcbf b/projects/packages/assets/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php
@@ -278,7 +278,7 @@ public static function normalize_path( $path ) {
 			} elseif ( '..' === $pp[ $i ] ) {
 				array_splice( $pp, --$i, 2 );
 			} else {
-				$i++;
+				++$i;
 			}
 		}
 		$ret .= join( '/', $pp );

diff --git a/projects/packages/backup/changelog/update-wpcs-pre-phpcbf b/projects/packages/backup/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/backup/src/class-jetpack-backup-upgrades.php b/projects/packages/backup/src/class-jetpack-backup-upgrades.php
@@ -30,7 +30,6 @@ public static function upgrade() {
 			call_user_func( array( __CLASS__, $upgrade ) );
 
 		}
-
 	}
 
 	/**

diff --git a/projects/packages/backup/src/class-jetpack-backup.php b/projects/packages/backup/src/class-jetpack-backup.php
@@ -457,7 +457,6 @@ public static function get_site_current_purchases() {
 		return rest_ensure_response(
 			json_decode( $response['body'], true )
 		);
-
 	}
 
 	/**

diff --git a/projects/packages/blocks/changelog/update-wpcs-pre-phpcbf b/projects/packages/blocks/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/blocks/tests/php/test-blocks.php b/projects/packages/blocks/tests/php/test-blocks.php
@@ -319,7 +319,6 @@ public function test_jetpack_register_block_with_editor_style() {
 		} finally {
 			remove_filter( 'jetpack_is_standalone_block', '__return_false' );
 		}
-
 	}
 
 	/**

diff --git a/projects/packages/changelogger/changelog/update-wpcs-pre-phpcbf b/projects/packages/changelogger/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/changelogger/src/AddCommand.php b/projects/packages/changelogger/src/AddCommand.php
@@ -195,7 +195,7 @@ protected function execute( InputInterface $input, OutputInterface $output ) {
 				if ( file_exists( "$dir/$filename" ) && $input->getOption( 'filename-auto-suffix' ) ) {
 					$i = 2;
 					while ( file_exists( "$dir/$filename#$i" ) ) {
-						$i++;
+						++$i;
 					}
 					$output->writeln( "File \"$filename\" already exists. Creating \"$filename#$i\" instead.", OutputInterface::VERBOSITY_VERBOSE );
 					$filename = "$filename#$i";

diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php
@@ -18,7 +18,7 @@
  */
 class Application extends SymfonyApplication {
 
-	const VERSION = '3.3.0';
+	const VERSION = '3.3.1-alpha';
 
 	/**
 	 * Constructor.

diff --git a/projects/packages/changelogger/src/Plugins/SemverVersioning.php b/projects/packages/changelogger/src/Plugins/SemverVersioning.php
@@ -160,16 +160,16 @@ public function nextVersion( $version, array $changes, array $extra = array() )
 					$out->writeln( '<warning>Semver does not automatically move version 0.y.z to 1.0.0.</>' );
 					$out->writeln( '<warning>You will have to do that manually when you\'re ready for the first release.</>' );
 				}
-				$info['minor']++;
+				++$info['minor'];
 			} else {
 				$info['minor'] = 0;
-				$info['major']++;
+				++$info['major'];
 			}
 		} elseif ( isset( $significances['minor'] ) ) {
 			$info['patch'] = 0;
-			$info['minor']++;
+			++$info['minor'];
 		} else {
-			$info['patch']++;
+			++$info['patch'];
 		}
 
 		return $this->normalizeVersion( $info );

diff --git a/projects/packages/changelogger/src/Plugins/WordpressVersioning.php b/projects/packages/changelogger/src/Plugins/WordpressVersioning.php
@@ -151,7 +151,7 @@ public function nextVersion( $version, array $changes, array $extra = array() )
 		);
 
 		if ( $this->input->getOption( 'point-release' ) ) {
-			$info['point']++;
+			++$info['point'];
 		} else {
 			$info['point']  = 0;
 			$info['major'] += 0.1;

diff --git a/projects/packages/changelogger/src/ValidateCommand.php b/projects/packages/changelogger/src/ValidateCommand.php
@@ -95,7 +95,7 @@ private function msg( $type, $file, $line, $msg ) {
 			$postfix = '</>';
 		}
 		$this->output->writeln( $prefix . $msg . $postfix );
-		$this->counts[ $type ]++;
+		++$this->counts[ $type ];
 	}
 
 	/**

diff --git a/projects/packages/changelogger/src/php7/CommandLoader.php b/projects/packages/changelogger/src/php7/CommandLoader.php
@@ -22,7 +22,7 @@ class CommandLoader extends CommandLoaderBase implements CommandLoaderInterface
 	 * @param string $name Command name.
 	 * @return bool
 	 */
-	public function has( $name ) : bool {
+	public function has( $name ): bool {
 		return $this->doHas( $name );
 	}
 
@@ -33,7 +33,7 @@ public function has( $name ) : bool {
 	 * @return Command
 	 * @throws CommandNotFoundException If the command is not found.
 	 */
-	public function get( $name ) : Command {
+	public function get( $name ): Command {
 		return $this->doGet( $name );
 	}
 
@@ -42,7 +42,7 @@ public function get( $name ) : Command {
 	 *
 	 * @return string[] All registered command names
 	 */
-	public function getNames() : array {
+	public function getNames(): array {
 		return $this->doGetNames();
 	}
 }
diff --git a/projects/packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php b/projects/packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php
@@ -40,7 +40,6 @@ public function process( File $phpcs_file, $stack_ptr ) {
 				'ShouldNotBeUsed'
 			);
 		}
-
 	}
 
 }
diff --git a/projects/packages/codesniffer/changelog/update-wpcs-pre-phpcbf b/projects/packages/codesniffer/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/connection/changelog/update-wpcs-pre-phpcbf b/projects/packages/connection/changelog/update-wpcs-pre-phpcbf
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: PHPCS: Fix most auto-fixable sniffs coming in new WPCS snapshot. No user-visible change to the project.
+
+
diff --git a/projects/packages/connection/src/class-error-handler.php b/projects/packages/connection/src/class-error-handler.php
@@ -288,7 +288,6 @@ public function store_error( \WP_Error $error ) {
 		}
 
 		return false;
-
 	}
 
 	/**
@@ -326,7 +325,6 @@ public function wp_error_to_array( \WP_Error $error ) {
 		);
 
 		return $error_array;
-
 	}
 
 	/**
@@ -380,7 +378,6 @@ public function encrypt_data_to_wpcom( $data ) {
 		}
 
 		return $encrypted_data;
-
 	}
 
 	/**
@@ -401,7 +398,6 @@ public function get_user_id_from_token( $token ) {
 		}
 
 		return $user_id;
-
 	}
 
 	/**
@@ -566,7 +562,6 @@ public function verify_error( $error ) {
 		$verified_errors[ $error_code ][ $user_id ] = $error;
 
 		update_option( self::STORED_VERIFIED_ERRORS_OPTION, $verified_errors );
-
 	}
 
 	/**
@@ -612,7 +607,6 @@ public function verify_xml_rpc_error( \WP_REST_Request $request ) {
 		}
 
 		return new \WP_REST_Response( false, 200 );
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-heartbeat.php b/projects/packages/connection/src/class-heartbeat.php
@@ -164,7 +164,6 @@ public static function generate_stats_array( $prefix = '' ) {
 		}
 
 		return $return;
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-manager.php b/projects/packages/connection/src/class-manager.php
@@ -1778,7 +1778,6 @@ public function verify_secrets( $action, $secret_1, $user_id ) {
 	 * Should be changed to protected.
 	 */
 	public function handle_authorization() {
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.48.1';
+	const PACKAGE_VERSION = '1.48.2-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/projects/packages/connection/src/class-plugin-storage.php b/projects/packages/connection/src/class-plugin-storage.php
@@ -180,7 +180,6 @@ public static function configure() {
 		}
 
 		self::$configured = true;
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-rest-connector.php b/projects/packages/connection/src/class-rest-connector.php
@@ -365,7 +365,6 @@ function ( &$data, $slug ) {
 		}
 
 		return array_values( $plugins );
-
 	}
 
 	/**
@@ -398,7 +397,6 @@ public static function connection_plugins_permission_check() {
 		}
 
 		return new WP_Error( 'invalid_user_permission_activate_plugins', self::get_user_permissions_error_msg(), array( 'status' => rest_authorization_required_code() ) );
-
 	}
 
 	/**
@@ -495,7 +493,6 @@ public static function get_user_connection_data( $rest_response = true ) {
 		}
 
 		return $response;
-
 	}
 
 	/**
@@ -513,7 +510,6 @@ public static function user_connection_data_permission_check() {
 			self::get_user_permissions_error_msg(),
 			array( 'status' => rest_authorization_required_code() )
 		);
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-secrets.php b/projects/packages/connection/src/class-secrets.php
@@ -40,7 +40,7 @@ private function secret_callable_method() {
 		$attempts      = 1;
 		$secret_length = strlen( $secret );
 		while ( $secret_length < 32 && $attempts < 32 ) {
-			$attempts++;
+			++$attempts;
 			$secret       .= wp_generate_password( 32, false );
 			$secret_length = strlen( $secret );
 		}

diff --git a/projects/packages/connection/src/class-server-sandbox.php b/projects/packages/connection/src/class-server-sandbox.php
@@ -146,7 +146,6 @@ private function get_new_signature( $url, $headers, $data, $method ) {
 		} else {
 			$this->log_new_signature_error( 'Empty Authorization Header' );
 		}
-
 	}
 
 	/**

diff --git a/projects/packages/connection/src/class-tracking.php b/projects/packages/connection/src/class-tracking.php
@@ -316,6 +316,5 @@ public function tracks_get_identity( $user_id ) {
 			'_ut' => 'anon',
 			'_ui' => $anon_id,
 		);
-
 	}
 }
diff --git a/projects/packages/connection/src/class-webhooks.php b/projects/packages/connection/src/class-webhooks.php
@@ -93,7 +93,6 @@ public function controller( $force = false ) {
 				break;
 			// Class Jetpack::admin_page_load() still handles other cases.
 		}
-
 	}
 
 	/**