Updated PHPCS: Packages and Debugger

_inc/lib/debugger/class-jetpack-cxn-tests.php

@@ -7,13 +7,12 @@
 
 use Automattic\Jetpack\Connection\Client;
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
+use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Status;
-use Automattic\Jetpack\Connection\Utils as Connection_Utils;
-use Automattic\Jetpack\Sync\Modules;
-use Automattic\Jetpack\Sync\Settings as Sync_Settings;
 use Automattic\Jetpack\Sync\Health as Sync_Health;
+use Automattic\Jetpack\Sync\Modules;
 use Automattic\Jetpack\Sync\Sender as Sync_Sender;
-use Automattic\Jetpack\Redirect;
+use Automattic\Jetpack\Sync\Settings as Sync_Settings;
 
 /**
  * Class Jetpack_Cxn_Tests contains all of the actual tests.

_inc/lib/debugger/class-jetpack-debug-data.php

@@ -5,12 +5,12 @@
  * @package jetpack
  */
 
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Constants;
-use Automattic\Jetpack\Sync\Modules;
+use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Sync\Functions;
+use Automattic\Jetpack\Sync\Modules;
 use Automattic\Jetpack\Sync\Sender;
-use Automattic\Jetpack\Redirect;
-use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 
 /**
  * Class Jetpack_Debug_Data

_inc/lib/debugger/class-jetpack-debugger.php

@@ -5,8 +5,8 @@
  * @package jetpack
  */
 
-use Automattic\Jetpack\Status;
 use Automattic\Jetpack\Redirect;
+use Automattic\Jetpack\Status;
 
 /**
  * Class Jetpack_Debugger

_inc/lib/debugger/debug-functions.php

@@ -52,7 +52,7 @@ function jetpack_debugger_site_status_tests( $core_tests ) {
 			 *      @type string $test Unique test identifier.
 			 *  }
 			 */
-			'test'  => function() use ( $test, $cxn_tests ) {
+			'test'  => function () use ( $test, $cxn_tests ) {
 				$results = $cxn_tests->run_test( $test['name'] );
 				if ( is_wp_error( $results ) ) {
 					return;

packages/abtest/src/class-abtest.php

@@ -8,7 +8,6 @@
 namespace Automattic\Jetpack;
 
 use Automattic\Jetpack\Connection\Client;
-use Automattic\Jetpack\Error;
 
 /**
  * This class provides an interface to the WP.com A/B tests.

packages/abtest/tests/php/test-abtest.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 /**
  * Tests the AB Test package.
  *
@@ -7,10 +7,9 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Abtest;
-use PHPUnit\Framework\TestCase;
 use phpmock\Mock;
 use phpmock\MockBuilder;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class Test_Abtest
@@ -30,7 +29,7 @@ public function setUp() {
 		$builder->setNamespace( __NAMESPACE__ )
 			->setName( 'is_wp_error' )
 			->setFunction(
-				function( $object ) {
+				function ( $object ) {
 					return is_a( $object, __NAMESPACE__ . '\\Error' );
 				}
 			);

packages/assets/src/class-assets.php

@@ -163,7 +163,7 @@ public static function enqueue_async_script( $handle, $min_path, $non_min_path,
 	public static function add_resource_hint( $urls, $type = 'dns-prefetch' ) {
 		add_filter(
 			'wp_resource_hints',
-			function( $hints, $resource_type ) use ( $urls, $type ) {
+			function ( $hints, $resource_type ) use ( $urls, $type ) {
 				if ( $resource_type === $type ) {
 					// Type casting to array required since the function accepts a single string.
 					foreach ( (array) $urls as $url ) {

packages/assets/tests/php/test-assets.php

@@ -7,10 +7,10 @@
 
 namespace Automattic\Jetpack;
 
-use PHPUnit\Framework\TestCase;
 use Automattic\Jetpack\Constants as Jetpack_Constants;
 use Brain\Monkey;
 use Brain\Monkey\Filters;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Retrieves a URL within the plugins or mu-plugins directory.

packages/autoloader/src/AutoloadProcessor.php

@@ -14,8 +14,6 @@
 
 namespace Automattic\Jetpack\Autoloader;
 
-use Composer\Util\Filesystem;
-
 /**
  * Class AutoloadProcessor.
  */

packages/autoloader/src/CustomAutoloaderPlugin.php

@@ -15,11 +15,11 @@
 namespace Automattic\Jetpack\Autoloader;
 
 use Composer\Composer;
+use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\IO\IOInterface;
+use Composer\Plugin\PluginInterface;
 use Composer\Script\Event;
 use Composer\Script\ScriptEvents;
-use Composer\Plugin\PluginInterface;
-use Composer\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Class CustomAutoloaderPlugin.
@@ -81,7 +81,6 @@ public function uninstall( Composer $composer, IOInterface $io ) {
 		 */
 	}
 
-
 	/**
 	 * Tell composer to listen for events and do something with them.
 	 *

packages/autoloader/src/autoload.php

@@ -1,6 +1,6 @@
 <?php
 /* HEADER */ // phpcs:ignore
 
-require_once trailingslashit( dirname( __FILE__ ) ) . 'jetpack-autoloader/autoload_functions.php';
+require_once trailingslashit( __DIR__ ) . 'jetpack-autoloader/autoload_functions.php';
 
 set_up_autoloader();

packages/autoloader/src/class-plugins-handler.php

@@ -122,7 +122,7 @@ private function get_plugins_activating_via_request() {
 	 * @return string The path of the current plugin.
 	 */
 	public function get_current_plugin_path() {
-		$vendor_path = str_replace( '\\', '/', dirname( dirname( __FILE__ ) ) );
+		$vendor_path = str_replace( '\\', '/', dirname( __DIR__ ) );
 		// Path to the plugin's folder (the parent of the vendor/jetpack-autoloader folder).
 		return substr( $vendor_path, 0, strrpos( $vendor_path, '/' ) );
 	}

packages/autoloader/tests/php/tests/test_AutoloadProcessor.php

@@ -5,8 +5,8 @@
  * @package automattic/jetpack-autoloader
  */
 
-use PHPUnit\Framework\TestCase;
 use Automattic\Jetpack\Autoloader\AutoloadProcessor;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the Autoload processor.

packages/autoloader/tests/php/tests/test_Autoloader.php

@@ -5,8 +5,8 @@
  * @package automattic/jetpack-autoloader
  */
 
-use PHPUnit\Framework\TestCase;
 use Jetpack\AutoloaderTestData\Plugin\Test;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the Autoloader.

packages/autoloader/tests/php/tests/test_ManifestGenerator.php

@@ -5,8 +5,8 @@
  * @package automattic/jetpack-autoloader
  */
 
-use PHPUnit\Framework\TestCase;
 use Automattic\Jetpack\Autoloader\ManifestGenerator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the manifest generator

packages/autoloader/tests/php/tests/test_version_loader.php

@@ -5,9 +5,9 @@
  * @package automattic/jetpack-autoloader
  */
 
-use PHPUnit\Framework\TestCase;
-use \Jetpack\AutoloaderTestData\Plugin\Test;
 use \Jetpack\AutoloaderTestData\Plugin\Psr4\Test as Psr4Test;
+use \Jetpack\AutoloaderTestData\Plugin\Test;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test suite class for the Autoloader part that handles file loading.

packages/blocks/src/class-blocks.php

@@ -73,7 +73,7 @@ public static function jetpack_register_block( $slug, $args = array() ) {
 
 			add_action(
 				'jetpack_register_gutenberg_extensions',
-				function() use ( $feature_name, $method_name ) {
+				function () use ( $feature_name, $method_name ) {
 					call_user_func( array( 'Jetpack_Gutenberg', $method_name ), $feature_name );
 				}
 			);

packages/blocks/tests/php/test-blocks.php

@@ -9,7 +9,6 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Blocks;
 use PHPUnit\Framework\TestCase;
 
 /**

packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php

@@ -4,7 +4,6 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Sniffer that looks for JETPACK_MASTER_USER constant usage
@@ -19,7 +18,6 @@ public function register() {
 		return array( T_STRING );
 	}
 
-
 	/**
 	 * Processes the tokens that this sniff is interested in.
 	 *

packages/compat/legacy/class-jetpack-sync-settings.php

@@ -66,7 +66,6 @@ public static function is_network_setting( $setting ) {
 		return Settings::is_network_setting( $setting );
 	}
 
-
 	/**
 	 * Return blocklisted post types SQL.
 	 *

packages/config/src/class-config.php

@@ -13,9 +13,9 @@
  * must require the corresponding packages to use these features.
  */
 use Automattic\Jetpack\Connection\Manager;
-use Automattic\Jetpack\JITMS\JITM as JITMS_JITM;
-use Automattic\Jetpack\JITM as JITM;
 use Automattic\Jetpack\Connection\Plugin;
+use Automattic\Jetpack\JITM as JITM;
+use Automattic\Jetpack\JITMS\JITM as JITMS_JITM;
 use Automattic\Jetpack\Sync\Main as Sync_Main;
 
 /**

packages/connection/legacy/class-jetpack-xmlrpc-server.php

@@ -9,7 +9,6 @@
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Connection\Utils as Connection_Utils;
 use Automattic\Jetpack\Roles;
-use Automattic\Jetpack\Sync\Modules;
 use Automattic\Jetpack\Sync\Functions;
 use Automattic\Jetpack\Sync\Sender;
 

packages/connection/src/class-error-handler.php

@@ -465,7 +465,7 @@ private function garbage_collector( $errors ) {
 		// Clear empty error codes.
 		$errors = array_filter(
 			$errors,
-			function( $user_errors ) {
+			function ( $user_errors ) {
 				return ! empty( $user_errors );
 			}
 		);

packages/connection/src/class-manager.php

@@ -8,13 +8,13 @@
 namespace Automattic\Jetpack\Connection;
 
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Heartbeat;
 use Automattic\Jetpack\Roles;
 use Automattic\Jetpack\Status;
 use Automattic\Jetpack\Tracking;
 use Jetpack_Options;
 use WP_Error;
 use WP_User;
-use Automattic\Jetpack\Heartbeat;
 
 /**
  * The Jetpack Connection Manager class that is used as a single gateway between WordPress.com
@@ -1624,7 +1624,7 @@ public function verify_secrets( $action, $secret_1, $user_id ) {
 		 */
 		do_action( 'jetpack_verify_secrets_begin', $action, $user );
 
-		$return_error = function( \WP_Error $error ) use ( $action, $user ) {
+		$return_error = function ( \WP_Error $error ) use ( $action, $user ) {
 			/**
 			 * Verifying of the previously generated secret has failed.
 			 *

packages/connection/src/class-rest-connector.php

@@ -176,7 +176,6 @@ public static function connection_status( $rest_response = true ) {
 		}
 	}
 
-
 	/**
 	 * Get plugins connected to the Jetpack.
 	 *
@@ -193,7 +192,7 @@ public function get_connection_plugins() {
 
 		array_walk(
 			$plugins,
-			function( &$data, $slug ) {
+			function ( &$data, $slug ) {
 				$data['slug'] = $slug;
 			}
 		);

packages/connection/tests/php/test-rest-endpoints.php

@@ -7,10 +7,10 @@
 use Automattic\Jetpack\Constants;
 use phpmock\MockBuilder;
 use PHPUnit\Framework\TestCase;
+use Requests_Utility_CaseInsensitiveDictionary;
 use WorDBless\Options as WorDBless_Options;
 use WP_REST_Request;
 use WP_REST_Server;
-use Requests_Utility_CaseInsensitiveDictionary;
 use WP_User;
 
 /**
@@ -111,12 +111,12 @@ public function test_remote_authorize() {
 		);
 
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		$options_filter = function( $value ) use ( $secrets ) {
+		$options_filter = function ( $value ) use ( $secrets ) {
 			return $secrets;
 		};
 		add_filter( 'pre_option_' . Manager::SECRETS_OPTION_NAME, $options_filter );
 
-		$user_caps_filter = function( $allcaps, $caps, $args, $user ) {
+		$user_caps_filter = function ( $allcaps, $caps, $args, $user ) {
 			if ( $user instanceof WP_User && self::USER_ID === $user->ID ) {
 				$allcaps['manage_options'] = true;
 				$allcaps['administrator']  = true;
@@ -154,7 +154,7 @@ public function test_connection() {
 		$builder->setNamespace( 'Automattic\Jetpack' )
 				->setName( 'apply_filters' )
 				->setFunction(
-					function( $hook, $value ) {
+					function ( $hook, $value ) {
 						return 'jetpack_offline_mode' === $hook ? true : $value;
 					}
 				);
@@ -192,7 +192,7 @@ public function test_connection_plugins() {
 
 		array_walk(
 			$plugins,
-			function( $plugin ) {
+			function ( $plugin ) {
 				( new Connection_Plugin( $plugin['slug'] ) )->add( $plugin['name'] );
 			}
 		);