diff --git a/_inc/lib/debugger/class-jetpack-cxn-tests.php b/_inc/lib/debugger/class-jetpack-cxn-tests.php
index 2c9f8c780ee6..7df08dad36b9 100644
--- a/_inc/lib/debugger/class-jetpack-cxn-tests.php
+++ b/_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.
diff --git a/_inc/lib/debugger/class-jetpack-debug-data.php b/_inc/lib/debugger/class-jetpack-debug-data.php
index 416252e83065..177d48428736 100644
--- a/_inc/lib/debugger/class-jetpack-debug-data.php
+++ b/_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
diff --git a/_inc/lib/debugger/class-jetpack-debugger.php b/_inc/lib/debugger/class-jetpack-debugger.php
index 00fd3a2b0c15..c339f24de127 100644
--- a/_inc/lib/debugger/class-jetpack-debugger.php
+++ b/_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
diff --git a/_inc/lib/debugger/debug-functions.php b/_inc/lib/debugger/debug-functions.php
index 59410f086f74..38b858ce2573 100644
--- a/_inc/lib/debugger/debug-functions.php
+++ b/_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;
diff --git a/packages/abtest/src/class-abtest.php b/packages/abtest/src/class-abtest.php
index 8bf6b34ef113..b69b4caedc70 100644
--- a/packages/abtest/src/class-abtest.php
+++ b/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.
diff --git a/packages/abtest/tests/php/test-abtest.php b/packages/abtest/tests/php/test-abtest.php
index 31908cbc6c06..29c415c09e35 100644
--- a/packages/abtest/tests/php/test-abtest.php
+++ b/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' );
 				}
 			);
diff --git a/packages/assets/src/class-assets.php b/packages/assets/src/class-assets.php
index 85708af9ec55..c9e12d94893d 100644
--- a/packages/assets/src/class-assets.php
+++ b/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 ) {
diff --git a/packages/assets/tests/php/test-assets.php b/packages/assets/tests/php/test-assets.php
index 68a2d27a764a..80b52887e1fb 100644
--- a/packages/assets/tests/php/test-assets.php
+++ b/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.
diff --git a/packages/autoloader/src/AutoloadProcessor.php b/packages/autoloader/src/AutoloadProcessor.php
index 4db5bb113831..70501f221524 100644
--- a/packages/autoloader/src/AutoloadProcessor.php
+++ b/packages/autoloader/src/AutoloadProcessor.php
@@ -14,8 +14,6 @@
 
 namespace Automattic\Jetpack\Autoloader;
 
-use Composer\Util\Filesystem;
-
 /**
  * Class AutoloadProcessor.
  */
diff --git a/packages/autoloader/src/CustomAutoloaderPlugin.php b/packages/autoloader/src/CustomAutoloaderPlugin.php
index 159c74831854..ac8951b656f2 100644
--- a/packages/autoloader/src/CustomAutoloaderPlugin.php
+++ b/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.
 	 *
diff --git a/packages/autoloader/src/autoload.php b/packages/autoloader/src/autoload.php
index 993c8ccaea11..49b998d9a856 100644
--- a/packages/autoloader/src/autoload.php
+++ b/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();
diff --git a/packages/autoloader/src/class-plugins-handler.php b/packages/autoloader/src/class-plugins-handler.php
index 30b2bd2d7784..11d6e8975643 100644
--- a/packages/autoloader/src/class-plugins-handler.php
+++ b/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, '/' ) );
 	}
diff --git a/packages/autoloader/tests/php/tests/test_AutoloadProcessor.php b/packages/autoloader/tests/php/tests/test_AutoloadProcessor.php
index 60b709de98c8..055bde995151 100644
--- a/packages/autoloader/tests/php/tests/test_AutoloadProcessor.php
+++ b/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.
diff --git a/packages/autoloader/tests/php/tests/test_Autoloader.php b/packages/autoloader/tests/php/tests/test_Autoloader.php
index e24c48589b2e..ccaa306e8b76 100644
--- a/packages/autoloader/tests/php/tests/test_Autoloader.php
+++ b/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.
diff --git a/packages/autoloader/tests/php/tests/test_ManifestGenerator.php b/packages/autoloader/tests/php/tests/test_ManifestGenerator.php
index 9a0582de5041..7b698c5ee4b4 100644
--- a/packages/autoloader/tests/php/tests/test_ManifestGenerator.php
+++ b/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
diff --git a/packages/autoloader/tests/php/tests/test_version_loader.php b/packages/autoloader/tests/php/tests/test_version_loader.php
index 23ceb0d1351f..2861dadad05d 100644
--- a/packages/autoloader/tests/php/tests/test_version_loader.php
+++ b/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.
diff --git a/packages/blocks/src/class-blocks.php b/packages/blocks/src/class-blocks.php
index b853d7e60cd0..9353acd7ecb8 100644
--- a/packages/blocks/src/class-blocks.php
+++ b/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 );
 				}
 			);
diff --git a/packages/blocks/tests/php/test-blocks.php b/packages/blocks/tests/php/test-blocks.php
index 7dc196130936..37d229145dcd 100644
--- a/packages/blocks/tests/php/test-blocks.php
+++ b/packages/blocks/tests/php/test-blocks.php
@@ -9,7 +9,6 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Blocks;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php b/packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php
index 4f52821faf84..62f3bcd713ee 100644
--- a/packages/codesniffer/Jetpack/Sniffs/Constants/MasterUserConstantSniff.php
+++ b/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.
 	 *
diff --git a/packages/compat/legacy/class-jetpack-sync-settings.php b/packages/compat/legacy/class-jetpack-sync-settings.php
index 7f44ef4980e8..e31f79d9e540 100644
--- a/packages/compat/legacy/class-jetpack-sync-settings.php
+++ b/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.
 	 *
diff --git a/packages/config/src/class-config.php b/packages/config/src/class-config.php
index fa4fc40168cd..d618e5e77f71 100644
--- a/packages/config/src/class-config.php
+++ b/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;
 
 /**
diff --git a/packages/connection/legacy/class-jetpack-xmlrpc-server.php b/packages/connection/legacy/class-jetpack-xmlrpc-server.php
index b79135ae2201..eaf4909c4999 100644
--- a/packages/connection/legacy/class-jetpack-xmlrpc-server.php
+++ b/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;
 
diff --git a/packages/connection/src/class-error-handler.php b/packages/connection/src/class-error-handler.php
index cd253a54f6d4..8ceadb0aee94 100644
--- a/packages/connection/src/class-error-handler.php
+++ b/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 );
 			}
 		);
diff --git a/packages/connection/src/class-manager.php b/packages/connection/src/class-manager.php
index b25f2f88e000..bd70b436cbf0 100644
--- a/packages/connection/src/class-manager.php
+++ b/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.
 			 *
diff --git a/packages/connection/src/class-rest-connector.php b/packages/connection/src/class-rest-connector.php
index 4f26586845e4..e6216c6f0e01 100644
--- a/packages/connection/src/class-rest-connector.php
+++ b/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;
 			}
 		);
diff --git a/packages/connection/tests/php/test-rest-endpoints.php b/packages/connection/tests/php/test-rest-endpoints.php
index c04a5720bc6a..c334c1c15cd8 100644
--- a/packages/connection/tests/php/test-rest-endpoints.php
+++ b/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'] );
 			}
 		);
diff --git a/packages/connection/tests/php/test_Error_Handler.php b/packages/connection/tests/php/test_Error_Handler.php
index 97dec0476fdb..fbd9f7d63cf9 100644
--- a/packages/connection/tests/php/test_Error_Handler.php
+++ b/packages/connection/tests/php/test_Error_Handler.php
@@ -62,11 +62,11 @@ public function test_store_error() {
 
 		$stored_errors = $this->error_handler->get_stored_errors();
 
-		$this->assertEquals( 1, count( $stored_errors ) );
+		$this->assertSame( 1, count( $stored_errors ) );
 
 		$this->arrayHasKey( 'invalid_token', $stored_errors );
 
-		$this->assertEquals( 1, count( $stored_errors['invalid_token'] ) );
+		$this->assertSame( 1, count( $stored_errors['invalid_token'] ) );
 
 		$this->arrayHasKey( '1', $stored_errors['invalid_token'] );
 
@@ -99,8 +99,8 @@ public function test_store_multiple_error_codes() {
 
 		$this->arrayHasKey( 'invalid_token', $stored_errors );
 
-		$this->assertEquals( 1, count( $stored_errors['invalid_token'] ) );
-		$this->assertEquals( 1, count( $stored_errors['unknown_user'] ) );
+		$this->assertSame( 1, count( $stored_errors['invalid_token'] ) );
+		$this->assertSame( 1, count( $stored_errors['unknown_user'] ) );
 
 		$this->arrayHasKey( '1', $stored_errors['unknown_user'] );
 
@@ -135,7 +135,7 @@ public function test_store_multiple_error_codes_multiple_users() {
 
 		$this->arrayHasKey( 'invalid_token', $stored_errors );
 
-		$this->assertEquals( 1, count( $stored_errors['invalid_token'] ) );
+		$this->assertSame( 1, count( $stored_errors['invalid_token'] ) );
 		$this->assertEquals( 2, count( $stored_errors['unknown_user'] ) );
 
 		$this->arrayHasKey( '2', $stored_errors['unknown_user'] );
@@ -241,7 +241,6 @@ public function test_get_user_id_from_token( $token, $expected ) {
 		$this->assertEquals( $expected, $this->error_handler->get_user_id_from_token( $token ) );
 	}
 
-
 	/**
 	 * Test get_error_by_nonce
 	 */
@@ -310,7 +309,7 @@ public function test_garbage_collector() {
 		// Manipulate the timestamps directly in the database.
 		$saved_options = get_option( Error_Handler::STORED_ERRORS_OPTION );
 		$this->assertEquals( 3, count( $saved_options ) );
-		$this->assertEquals( 1, count( $saved_options['no_user_tokens'] ) );
+		$this->assertSame( 1, count( $saved_options['no_user_tokens'] ) );
 		$saved_options['invalid_token'][4]['timestamp']  = time() - DAY_IN_SECONDS * 4;
 		$saved_options['no_user_tokens'][6]['timestamp'] = time() - DAY_IN_SECONDS * 4;
 		update_option( Error_Handler::STORED_ERRORS_OPTION, $saved_options );
@@ -323,7 +322,7 @@ public function test_garbage_collector() {
 		$this->assertArrayHasKey( 'no_user_tokens', $errors );
 		$this->assertArrayNotHasKey( 'invalid_token', $errors );
 
-		$this->assertEquals( 1, count( $errors['no_user_tokens'] ) );
+		$this->assertSame( 1, count( $errors['no_user_tokens'] ) );
 
 	}
 }
diff --git a/packages/connection/tests/php/test_Manager.php b/packages/connection/tests/php/test_Manager.php
index eff9706cec54..205d907cbb26 100644
--- a/packages/connection/tests/php/test_Manager.php
+++ b/packages/connection/tests/php/test_Manager.php
@@ -48,7 +48,7 @@ public function setUp() {
 		$builder->setNamespace( __NAMESPACE__ )
 				->setName( 'apply_filters' )
 				->setFunction(
-					function( $filter_name, $return_value ) {
+					function ( $filter_name, $return_value ) {
 						return $return_value;
 					}
 				);
@@ -60,7 +60,7 @@ function( $filter_name, $return_value ) {
 		$builder->setNamespace( __NAMESPACE__ )
 				->setName( 'wp_redirect' )
 				->setFunction(
-					function( $url ) {
+					function ( $url ) {
 						$this->arguments_stack['wp_redirect'] [] = array( $url );
 						return true;
 					}
@@ -73,7 +73,7 @@ function( $url ) {
 		$builder->setNamespace( 'Automattic\Jetpack' )
 				->setName( 'apply_filters' )
 				->setFunction(
-					function( $filter_name, $value, $name ) {
+					function ( $filter_name, $value, $name ) {
 						return constant( __NAMESPACE__ . "\Utils::DEFAULT_$name" );
 					}
 				);
@@ -170,7 +170,7 @@ public function test_api_url_uses_constants_and_filters() {
 
 		$this->apply_filters->disable();
 
-		$overwrite_filter = function() {
+		$overwrite_filter = function () {
 			$this->arguments_stack['jetpack_api_url'][] = array_merge( array( 'jetpack_api_url' ), func_get_args() );
 			return 'completely overwrite';
 		};
@@ -233,7 +233,6 @@ public function test_is_user_connected_with_user_id_logged_out_not_connected() {
 		$this->assertFalse( $this->manager->is_user_connected( 1 ) );
 	}
 
-
 	/**
 	 * Test the `is_user_connected` functionality.
 	 *
@@ -340,7 +339,7 @@ public function test_jetpack_connection_custom_caps( $in_offline_mode, $custom_c
 		// Mock the apply_filters( 'jetpack_offline_mode', ) call in Status::is_offline_mode.
 		add_filter(
 			'jetpack_offline_mode',
-			function() use ( $in_offline_mode ) {
+			function () use ( $in_offline_mode ) {
 				return $in_offline_mode;
 			}
 		);
@@ -468,7 +467,7 @@ protected function mock_function( $function_name, $return_value = null, $namespa
 		$builder->setNamespace( $namespace )
 			->setName( $function_name )
 			->setFunction(
-				function() use ( &$return_value ) {
+				function () use ( &$return_value ) {
 					return $return_value;
 				}
 			);
diff --git a/packages/connection/tests/php/test_Utils.php b/packages/connection/tests/php/test_Utils.php
index 001a3db04c68..6c8a5d1fa8d1 100644
--- a/packages/connection/tests/php/test_Utils.php
+++ b/packages/connection/tests/php/test_Utils.php
@@ -22,7 +22,6 @@ public function tearDown() {
 		Constants::clear_constants();
 	}
 
-
 	/**
 	 * Tests the Utils::jetpack_api_constant_filter() method.
 	 *
diff --git a/packages/constants/tests/php/test-constants.php b/packages/constants/tests/php/test-constants.php
index 72422ea51c2d..a6c6dc5adb54 100644
--- a/packages/constants/tests/php/test-constants.php
+++ b/packages/constants/tests/php/test-constants.php
@@ -142,7 +142,6 @@ public function test_jetpack_constants_override_to_null_gets_null() {
 		$this->assertNull( Constants::get_constant( 'JETPACK__VERSION' ) );
 	}
 
-
 	/**
 	 * Tests that constant will use the filter value.
 	 *
@@ -156,7 +155,7 @@ public function test_jetpack_constants_get_constant_use_filter_value() {
 		$apply_filters_spy = new Spy(
 			'Automattic\Jetpack',
 			'apply_filters',
-			function ( $filter_name, $value, $name ) use ( $test_constant_value ) {
+			function ( $filter_name, $value, $name ) use ( $test_constant_value ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 				return $test_constant_value;
 			}
 		);
@@ -183,7 +182,7 @@ public function test_jetpack_constants_set_constants_adds_to_set_constants_array
 		$key = 'TEST';
 		Constants::set_constant( $key, '1' );
 		$this->assertArrayHasKey( $key, Constants::$set_constants );
-		$this->assertEquals( '1', Constants::$set_constants[ $key ] );
+		$this->assertSame( '1', Constants::$set_constants[ $key ] );
 	}
 
 	/**
diff --git a/packages/debug-helper/class-admin.php b/packages/debug-helper/class-admin.php
index a2a654489bc0..2fc91790f917 100644
--- a/packages/debug-helper/class-admin.php
+++ b/packages/debug-helper/class-admin.php
@@ -99,7 +99,7 @@ public function update_option() {
 
 add_action(
 	'plugins_loaded',
-	function() {
+	function () {
 		new Admin();
 	}
 );
diff --git a/packages/debug-helper/modules/class-broken-token.php b/packages/debug-helper/modules/class-broken-token.php
index ea1e9f16412b..6b43342a1856 100644
--- a/packages/debug-helper/modules/class-broken-token.php
+++ b/packages/debug-helper/modules/class-broken-token.php
@@ -486,7 +486,6 @@ public function render_admin_notice() {
 
 add_action( 'plugins_loaded', 'register_broken_token', 1000 );
 
-
 /**
  * Load the brokenness.
  */
diff --git a/packages/debug-helper/modules/class-mocker.php b/packages/debug-helper/modules/class-mocker.php
index 87a5eb74833c..2038baede57a 100644
--- a/packages/debug-helper/modules/class-mocker.php
+++ b/packages/debug-helper/modules/class-mocker.php
@@ -82,7 +82,7 @@ public function enqueue_scripts( $hook ) {
 
 			add_filter(
 				'script_loader_tag',
-				function( $tag, $handle ) {
+				function ( $tag, $handle ) {
 					if ( 'mocker_script' === $handle ) {
 						$tag = str_replace( '<script ', '<script type="module" ', $tag );
 					}
diff --git a/packages/debug-helper/modules/class-rest-api-tester.php b/packages/debug-helper/modules/class-rest-api-tester.php
index e8513547b985..0971c8715ea6 100644
--- a/packages/debug-helper/modules/class-rest-api-tester.php
+++ b/packages/debug-helper/modules/class-rest-api-tester.php
@@ -47,7 +47,7 @@ public function enqueue_scripts( $hook ) {
 
 			add_filter(
 				'script_loader_tag',
-				function( $tag, $handle ) {
+				function ( $tag, $handle ) {
 					if ( 'rest_api_tester_script' === $handle ) {
 						$tag = str_replace( '<script ', '<script type="module" ', $tag );
 					}
diff --git a/packages/device-detection/src/class-user-agent-info.php b/packages/device-detection/src/class-user-agent-info.php
index 51305ef10889..59956dc21f2b 100644
--- a/packages/device-detection/src/class-user-agent-info.php
+++ b/packages/device-detection/src/class-user-agent-info.php
@@ -126,7 +126,6 @@ class User_Agent_Info {
 		'googlebot-mobile',
 	);
 
-
 	/**
 	 * The constructor.
 	 *
@@ -446,7 +445,6 @@ public function is_iphoneOrIpod() {
 		}
 	}
 
-
 	/**
 	 *  Detects if the current UA is iPhone Mobile Safari or another iPhone or iPod Touch Browser.
 	 *
@@ -476,7 +474,6 @@ public static function is_iphone_or_ipod( $type = 'iphone-any' ) {
 		}
 	}
 
-
 	/**
 	 *  Detects if the current UA is Chrome for iOS
 	 *
@@ -501,7 +498,6 @@ public static function is_chrome_for_iOS() {
 		}
 	}
 
-
 	/**
 	 *  Detects if the current UA is Twitter for iPhone
 	 *
@@ -738,7 +734,6 @@ public static function is_opera_mobile() {
 		}
 	}
 
-
 	/**
 	 * Detects if the current browser is Opera Mini
 	 *
@@ -852,7 +847,6 @@ public static function is_windows_phone_8() {
 		}
 	}
 
-
 	/**
 	 * Detects if the current browser is on a Palm device running the new WebOS. This EXCLUDES TouchPad.
 	 *
@@ -900,7 +894,6 @@ public static function is_TouchPad() {
 		}
 	}
 
-
 	/**
 	 * Detects if the current browser is the Series 60 Open Source Browser.
 	 *
@@ -1013,7 +1006,6 @@ public static function is_J2ME_platform() {
 		return false;
 	}
 
-
 	/**
 	 * Detects if the current UA is on one of the Maemo-based Nokia Internet Tablets.
 	 */
@@ -1064,7 +1056,6 @@ public static function is_MeeGo() {
 		}
 	}
 
-
 	/**
 	 * The is_webkit() method can be used to check the User Agent for an webkit generic browser.
 	 */
@@ -1108,7 +1099,6 @@ public static function is_android() {
 		}
 	}
 
-
 	/**
 	 * Detects if the current browser is the Native Android Tablet browser.
 	 * Assumes 'Android' should be in the user agent, but not 'mobile'
@@ -1180,7 +1170,6 @@ public static function is_kindle_touch() {
 		}
 	}
 
-
 	/**
 	 * Detect if user agent is the WordPress.com Windows 8 app (used ONLY on the custom oauth stylesheet)
 	 */
diff --git a/packages/device-detection/tests/php/test_DeviceDetection.php b/packages/device-detection/tests/php/test_DeviceDetection.php
index c0c5d4495465..e8e98d02d12c 100644
--- a/packages/device-detection/tests/php/test_DeviceDetection.php
+++ b/packages/device-detection/tests/php/test_DeviceDetection.php
@@ -7,8 +7,8 @@
  * @phpcs:disable WordPress.Files.FileName
  */
 
-use PHPUnit\Framework\TestCase;
 use Automattic\Jetpack\Device_Detection;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for the Device_Detection class.
diff --git a/packages/heartbeat/src/class-heartbeat.php b/packages/heartbeat/src/class-heartbeat.php
index 2f1624f0d130..fb9f2c2a431a 100644
--- a/packages/heartbeat/src/class-heartbeat.php
+++ b/packages/heartbeat/src/class-heartbeat.php
@@ -7,9 +7,8 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\A8c_Mc_Stats;
-use WP_CLI;
 use Jetpack_Options;
+use WP_CLI;
 
 /**
  * Heartbeat sends a batch of stats to wp.com once a day
diff --git a/packages/jitm/src/class-jitm.php b/packages/jitm/src/class-jitm.php
index 5b46ac65c898..a3d8c3cc472c 100644
--- a/packages/jitm/src/class-jitm.php
+++ b/packages/jitm/src/class-jitm.php
@@ -10,9 +10,6 @@
 use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Assets\Logo as Jetpack_Logo;
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
-use Automattic\Jetpack\Partner;
-use Automattic\Jetpack\JITMS\Post_Connection_JITM;
-use Automattic\Jetpack\JITMS\Pre_Connection_JITM;
 use Automattic\Jetpack\Status;
 
 /**
diff --git a/packages/jitm/src/class-post-connection-jitm.php b/packages/jitm/src/class-post-connection-jitm.php
index 1480aefb3a2d..4d243296ed98 100644
--- a/packages/jitm/src/class-post-connection-jitm.php
+++ b/packages/jitm/src/class-post-connection-jitm.php
@@ -12,7 +12,6 @@
 use Automattic\Jetpack\Partner;
 use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Tracking;
-use Automattic\Jetpack\JITMS\JITM;
 
 /**
  * Jetpack just in time messaging through out the admin
@@ -228,7 +227,7 @@ public function delete_user_update_connection_owner_notice() {
 			echo "<label for='owner'>" . esc_html__( 'You can choose to transfer connection ownership to one of these already-connected admins:', 'jetpack' ) . ' </label>';
 
 			$connected_admin_ids = array_map(
-				function( $connected_admin ) {
+				function ( $connected_admin ) {
 						return $connected_admin->ID;
 				},
 				$connected_admins
diff --git a/packages/jitm/src/class-pre-connection-jitm.php b/packages/jitm/src/class-pre-connection-jitm.php
index 621594193a65..802ca31d45cf 100644
--- a/packages/jitm/src/class-pre-connection-jitm.php
+++ b/packages/jitm/src/class-pre-connection-jitm.php
@@ -7,8 +7,6 @@
 
 namespace Automattic\Jetpack\JITMS;
 
-use Automattic\Jetpack\JITMS\JITM;
-
 /**
  * Jetpack pre-connection just in time messaging through out the admin.
  */
diff --git a/packages/lazy-images/src/lazy-images.php b/packages/lazy-images/src/lazy-images.php
index 71e92fac5ef9..7b891cb9202e 100644
--- a/packages/lazy-images/src/lazy-images.php
+++ b/packages/lazy-images/src/lazy-images.php
@@ -23,9 +23,6 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Assets;
-use Automattic\Jetpack\Constants as Jetpack_Constants;
-
 /**
  * Class Automattic\Jetpack\Jetpack_Lazy_Images
  *
diff --git a/packages/lazy-images/tests/php/test_class.lazy-images.php b/packages/lazy-images/tests/php/test_class.lazy-images.php
index 16c8fe352af6..e4ee11cf2590 100644
--- a/packages/lazy-images/tests/php/test_class.lazy-images.php
+++ b/packages/lazy-images/tests/php/test_class.lazy-images.php
@@ -1,6 +1,6 @@
 <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
-require dirname( __FILE__ ) . '/../../src/lazy-images.php';
+require __DIR__ . '/../../src/lazy-images.php';
 
 use Automattic\Jetpack\Jetpack_Lazy_Images;
 use WorDBless\BaseTestCase;
@@ -218,7 +218,7 @@ public function create_upload_object( $file, $parent = 0 ) {
 	 */
 	public function test_wp_get_attachment_image_gets_lazy_treatment() {
 
-		$attachment_id = $this->create_upload_object( dirname( __FILE__ ) . '/wp-logo.jpg', 0 );
+		$attachment_id = $this->create_upload_object( __DIR__ . '/wp-logo.jpg', 0 );
 		add_filter( 'wp_get_attachment_image_attributes', array( 'Automattic\\Jetpack\\Jetpack_Lazy_Images', 'process_image_attributes' ), PHP_INT_MAX );
 		$image = wp_get_attachment_image( $attachment_id );
 		remove_filter( 'wp_get_attachment_image_attributes', array( 'Automattic\\Jetpack\\Jetpack_Lazy_Images', 'process_image_attributes' ), PHP_INT_MAX );
@@ -235,7 +235,7 @@ public function test_wp_get_attachment_image_gets_lazy_treatment() {
 	 * Test that the wp_get_attachment_image function output does not get the lazy treatment when lazy images feature is skipped.
 	 */
 	public function test_wp_get_attachment_image_does_not_get_lazy_treatment_when_skip_lazy_added() {
-		$attachment_id = $this->create_upload_object( dirname( __FILE__ ) . '/wp-logo.jpg', 0 );
+		$attachment_id = $this->create_upload_object( __DIR__ . '/wp-logo.jpg', 0 );
 		$instance      = Jetpack_Lazy_Images::instance();
 
 		$instance->setup_filters();
@@ -545,7 +545,7 @@ public function set_height_attribute( $attributes ) {
 	public function get_input_content() {
 		ob_start();
 
-		require_once dirname( __FILE__ ) . '/pre-image-placeholder-content.html';
+		require_once __DIR__ . '/pre-image-placeholder-content.html';
 
 		$contents = trim( ob_get_contents() );
 		ob_end_clean();
@@ -561,7 +561,7 @@ public function get_input_content() {
 	public function get_output_content() {
 		ob_start();
 
-		require_once dirname( __FILE__ ) . '/post-image-placeholder-content.html';
+		require_once __DIR__ . '/post-image-placeholder-content.html';
 
 		$contents = trim( ob_get_contents() );
 		ob_end_clean();
diff --git a/packages/licensing/src/class-licensing.php b/packages/licensing/src/class-licensing.php
index 78c40e061577..3e9f7eb4d474 100644
--- a/packages/licensing/src/class-licensing.php
+++ b/packages/licensing/src/class-licensing.php
@@ -8,7 +8,6 @@
 namespace Automattic\Jetpack;
 
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
-use Jetpack;
 use Jetpack_IXR_ClientMulticall;
 use Jetpack_Options;
 use WP_Error;
diff --git a/packages/licensing/tests/php/class-test-licensing.php b/packages/licensing/tests/php/class-test-licensing.php
index dfbd97b7ba3e..e6e1a37cc19c 100644
--- a/packages/licensing/tests/php/class-test-licensing.php
+++ b/packages/licensing/tests/php/class-test-licensing.php
@@ -8,13 +8,10 @@
 namespace Automattic\Jetpack;
 
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
-use Automattic\Jetpack\Licensing;
 use Jetpack_IXR_ClientMulticall;
-use Jetpack_Options;
 use stdClass;
 use WorDBless\BaseTestCase;
 use WP_Error;
-use WP_User;
 
 /**
  * Class Test_Licensing
diff --git a/packages/partner/tests/php/test-partner.php b/packages/partner/tests/php/test-partner.php
index 50d6674b28f7..c8d89601f718 100644
--- a/packages/partner/tests/php/test-partner.php
+++ b/packages/partner/tests/php/test-partner.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 /**
  * Tests the partner package.
  *
@@ -7,11 +7,10 @@
 
 namespace Automattic\Jetpack;
 
-use PHPUnit\Framework\TestCase;
-
 use Brain\Monkey;
-use Brain\Monkey\Functions;
 use Brain\Monkey\Filters;
+use Brain\Monkey\Functions;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class Partner_Test
diff --git a/packages/roles/tests/php/test-roles.php b/packages/roles/tests/php/test-roles.php
index a31380c7d56b..4890fc12a7de 100644
--- a/packages/roles/tests/php/test-roles.php
+++ b/packages/roles/tests/php/test-roles.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 /**
  * Tests the Roles package/
  *
@@ -7,10 +7,9 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Roles;
-use PHPUnit\Framework\TestCase;
 use phpmock\Mock;
 use phpmock\MockBuilder;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class Test_Roles
@@ -62,7 +61,7 @@ public function test_current_user_to_role_with_capability() {
 	public function test_current_user_to_role_with_no_match() {
 		$this->mock_function( 'current_user_can', false );
 
-		$this->assertEquals( false, $this->roles->translate_current_user_to_role() );
+		$this->assertFalse( $this->roles->translate_current_user_to_role() );
 	}
 
 	/**
@@ -98,7 +97,7 @@ public function test_user_to_role_with_no_match() {
 		$user_mock = $this->getMockBuilder( 'WP_User' )->getMock();
 		$this->mock_function( 'user_can', false );
 
-		$this->assertEquals( false, $this->roles->translate_user_to_role( $user_mock ) );
+		$this->assertFalse( $this->roles->translate_user_to_role( $user_mock ) );
 	}
 
 	/**
@@ -116,7 +115,7 @@ public function test_role_to_cap_existing_role() {
 	 * @covers Automattic\Jetpack\Roles::translate_role_to_cap
 	 */
 	public function test_role_to_cap_non_existing_role() {
-		$this->assertEquals( false, $this->roles->translate_role_to_cap( 'follower' ) );
+		$this->assertFalse( $this->roles->translate_role_to_cap( 'follower' ) );
 	}
 
 	/**
@@ -134,7 +133,7 @@ protected function mock_function( $function_name, $return_value = null, $arg_1_v
 		$builder->setNamespace( __NAMESPACE__ )
 			->setName( $function_name )
 			->setFunction(
-				function( $arg_1, $arg_2 = null ) use ( &$return_value, &$arg_1_value, &$arg_2_value ) {
+				function ( $arg_1, $arg_2 = null ) use ( &$return_value, &$arg_1_value, &$arg_2_value ) {
 					// Return the value if we don't care about arguments.
 					if ( is_null( $arg_1 ) && is_null( $arg_2 ) ) {
 						return $return_value;
diff --git a/packages/status/tests/php/test-status.php b/packages/status/tests/php/test-status.php
index 56b5502fefde..b0e00b1ba084 100644
--- a/packages/status/tests/php/test-status.php
+++ b/packages/status/tests/php/test-status.php
@@ -7,13 +7,12 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Status;
-use PHPUnit\Framework\TestCase;
-use phpmock\Mock;
-use phpmock\MockBuilder;
 use Brain\Monkey;
-use Brain\Monkey\Functions;
 use Brain\Monkey\Filters;
+use Brain\Monkey\Functions;
+use phpmock\Mock;
+use phpmock\MockBuilder;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Status test suite.
@@ -185,7 +184,7 @@ public function test_is_offline_mode_constant() {
 		$this->assertTrue( $this->status->is_offline_mode() );
 
 		array_map(
-			function( $mock ) {
+			function ( $mock ) {
 				$mock->disable();
 			},
 			$constants_mocks
@@ -275,7 +274,6 @@ public function test_is_single_user_site_with_multiple_users() {
 		$this->clean_mock_wpdb_get_var();
 	}
 
-
 	/**
 	 * Mock a global function with particular arguments and make it return a certain value.
 	 *
@@ -288,7 +286,7 @@ protected function mock_function_with_args( $function_name, $args = array() ) {
 		$builder->setNamespace( __NAMESPACE__ )
 			->setName( $function_name )
 			->setFunction(
-				function( ...$current_args ) use ( &$args ) {
+				function ( ...$current_args ) use ( &$args ) {
 					foreach ( $args as $arg ) {
 						if ( array_slice( $arg, 0, -1 ) === $current_args ) {
 							return array_pop( $arg );
@@ -310,7 +308,7 @@ function( ...$current_args ) use ( &$args ) {
 	 * @return phpmock\Mock The mock object.
 	 */
 	protected function mock_constants( $constants = array() ) {
-		$prepare_constant = function( $constant ) {
+		$prepare_constant = function ( $constant ) {
 			return array( $constant[0], true );
 		};
 
diff --git a/packages/sync/src/class-defaults.php b/packages/sync/src/class-defaults.php
index 307ce01d02e1..5788baa2e5f7 100644
--- a/packages/sync/src/class-defaults.php
+++ b/packages/sync/src/class-defaults.php
@@ -305,7 +305,6 @@ public static function get_constants_whitelist() {
 
 	);
 
-
 	/**
 	 * Array of post type attributes synced.
 	 *
diff --git a/packages/sync/src/class-json-deflate-array-codec.php b/packages/sync/src/class-json-deflate-array-codec.php
index f13e5dcbccc2..18ea88ab4c69 100644
--- a/packages/sync/src/class-json-deflate-array-codec.php
+++ b/packages/sync/src/class-json-deflate-array-codec.php
@@ -8,8 +8,6 @@
 
 namespace Automattic\Jetpack\Sync;
 
-use Automattic\Jetpack\Sync\Codec_Interface;
-
 /**
  * An implementation of Automattic\Jetpack\Sync\Codec_Interface that uses gzip's DEFLATE
  * algorithm to compress objects serialized using json_encode
diff --git a/packages/sync/src/class-main.php b/packages/sync/src/class-main.php
index b3b31ad62399..906bc54ea9c6 100644
--- a/packages/sync/src/class-main.php
+++ b/packages/sync/src/class-main.php
@@ -8,7 +8,6 @@
 namespace Automattic\Jetpack\Sync;
 
 use Automattic\Jetpack\Sync\Actions as Sync_Actions;
-use Automattic\Jetpack\Sync\Health;
 
 /**
  * Jetpack Sync main class.
@@ -84,5 +83,4 @@ public static function on_plugins_loaded_late() {
 		Health::init();
 	}
 
-
 }
diff --git a/packages/sync/src/class-queue.php b/packages/sync/src/class-queue.php
index 690b7df92c66..ff1096ca3ef8 100644
--- a/packages/sync/src/class-queue.php
+++ b/packages/sync/src/class-queue.php
@@ -247,7 +247,7 @@ public function checkout( $buffer_size ) {
 	 */
 	public function get_ids( $items ) {
 		return array_map(
-			function( $item ) {
+			function ( $item ) {
 				return $item->id;
 			},
 			$items
@@ -679,7 +679,7 @@ private function fetch_items_by_id( $items_ids ) {
 	private function unserialize_values( $items ) {
 		array_walk(
 			$items,
-			function( $item ) {
+			function ( $item ) {
 				$item->value = maybe_unserialize( $item->value );
 			}
 		);
diff --git a/packages/sync/src/class-replicastore.php b/packages/sync/src/class-replicastore.php
index 8be5b264f748..324256f35f9a 100644
--- a/packages/sync/src/class-replicastore.php
+++ b/packages/sync/src/class-replicastore.php
@@ -951,7 +951,7 @@ public function update_term( $term_object ) {
 			)
 		);
 		if ( ! $exists ) {
-			$term_object   = sanitize_term( clone( $term_object ), $taxonomy, 'db' );
+			$term_object   = sanitize_term( clone $term_object, $taxonomy, 'db' );
 			$term          = array(
 				'term_id'    => $term_object->term_id,
 				'name'       => $term_object->name,
diff --git a/packages/sync/src/class-settings.php b/packages/sync/src/class-settings.php
index b8453ffa5795..8a5e4d8eb4b7 100644
--- a/packages/sync/src/class-settings.php
+++ b/packages/sync/src/class-settings.php
@@ -204,7 +204,7 @@ public static function update_settings( $new_settings ) {
 			}
 
 			// If we set the disabled option to true, clear the queues.
-			if ( ( 'disable' === $setting || 'network_disable' === $setting ) && ! ! $value ) {
+			if ( ( 'disable' === $setting || 'network_disable' === $setting ) && (bool) $value ) {
 				$listener = Listener::get_instance();
 				$listener->get_sync_queue()->reset();
 				$listener->get_full_sync_queue()->reset();
diff --git a/packages/sync/src/class-users.php b/packages/sync/src/class-users.php
index 74decf084e2a..0477fcc3f868 100644
--- a/packages/sync/src/class-users.php
+++ b/packages/sync/src/class-users.php
@@ -8,8 +8,8 @@
 namespace Automattic\Jetpack\Sync;
 
 use Automattic\Jetpack\Connection\Manager as Jetpack_Connection;
-use Automattic\Jetpack\Roles;
 use Automattic\Jetpack\Connection\XMLRPC_Async_Call;
+use Automattic\Jetpack\Roles;
 
 /**
  * Class Users.
diff --git a/packages/sync/src/modules/class-callables.php b/packages/sync/src/modules/class-callables.php
index 787fd95753cf..e5f2f0133772 100644
--- a/packages/sync/src/modules/class-callables.php
+++ b/packages/sync/src/modules/class-callables.php
@@ -7,10 +7,10 @@
 
 namespace Automattic\Jetpack\Sync\Modules;
 
-use Automattic\Jetpack\Sync\Functions;
+use Automattic\Jetpack\Constants as Jetpack_Constants;
 use Automattic\Jetpack\Sync\Defaults;
+use Automattic\Jetpack\Sync\Functions;
 use Automattic\Jetpack\Sync\Settings;
-use Automattic\Jetpack\Constants as Jetpack_Constants;
 
 /**
  * Class to handle sync for callables.
diff --git a/packages/sync/src/modules/class-comments.php b/packages/sync/src/modules/class-comments.php
index 74c49057da97..8678f7456a5a 100644
--- a/packages/sync/src/modules/class-comments.php
+++ b/packages/sync/src/modules/class-comments.php
@@ -7,8 +7,8 @@
 
 namespace Automattic\Jetpack\Sync\Modules;
 
-use Automattic\Jetpack\Sync\Settings;
 use Automattic\Jetpack\Sync\Modules;
+use Automattic\Jetpack\Sync\Settings;
 
 /**
  * Class to handle sync for comments.
diff --git a/packages/sync/src/modules/class-full-sync-immediately.php b/packages/sync/src/modules/class-full-sync-immediately.php
index b74ce84797e1..487470806cee 100644
--- a/packages/sync/src/modules/class-full-sync-immediately.php
+++ b/packages/sync/src/modules/class-full-sync-immediately.php
@@ -123,7 +123,7 @@ public function start( $full_sync_config = null ) {
 	 * @return boolean
 	 */
 	public function is_started() {
-		return ! ! $this->get_status()['started'];
+		return (bool) $this->get_status()['started'];
 	}
 
 	/**
@@ -184,7 +184,7 @@ function ( $sum, $sync_item ) {
 	 * @return boolean
 	 */
 	public function is_finished() {
-		return ! ! $this->get_status()['finished'];
+		return (bool) $this->get_status()['finished'];
 	}
 
 	/**
diff --git a/packages/sync/src/modules/class-full-sync.php b/packages/sync/src/modules/class-full-sync.php
index f46230a9778c..732411c34d60 100644
--- a/packages/sync/src/modules/class-full-sync.php
+++ b/packages/sync/src/modules/class-full-sync.php
@@ -32,7 +32,6 @@ class Full_Sync extends Module {
 	 */
 	const STATUS_OPTION_PREFIX = 'jetpack_sync_full_';
 
-
 	/**
 	 * Enqueue Lock name.
 	 *
@@ -517,7 +516,7 @@ public function get_actions_totals( $actions ) {
 	 * @return boolean
 	 */
 	public function is_started() {
-		return ! ! $this->get_status_option( 'started' );
+		return (bool) $this->get_status_option( 'started' );
 	}
 
 	/**
@@ -528,7 +527,7 @@ public function is_started() {
 	 * @return boolean
 	 */
 	public function is_finished() {
-		return ! ! $this->get_status_option( 'finished' );
+		return (bool) $this->get_status_option( 'finished' );
 	}
 
 	/**
diff --git a/packages/sync/src/modules/class-module.php b/packages/sync/src/modules/class-module.php
index e7be27122a01..bedb95a3e545 100644
--- a/packages/sync/src/modules/class-module.php
+++ b/packages/sync/src/modules/class-module.php
@@ -360,7 +360,6 @@ public function send_full_sync_actions( $config, $status, $send_until ) {
 		return $status;
 	}
 
-
 	/**
 	 * Immediately sends a single item without firing or enqueuing it
 	 *
diff --git a/packages/sync/src/modules/class-themes.php b/packages/sync/src/modules/class-themes.php
index fcdf5cc195f2..458bbb6e836c 100644
--- a/packages/sync/src/modules/class-themes.php
+++ b/packages/sync/src/modules/class-themes.php
@@ -7,9 +7,6 @@
 
 namespace Automattic\Jetpack\Sync\Modules;
 
-use Automattic\Jetpack\Sync\Defaults;
-use Automattic\Jetpack\Sync\Functions;
-
 /**
  * Class to handle sync for themes.
  */
diff --git a/packages/terms-of-service/src/class-terms-of-service.php b/packages/terms-of-service/src/class-terms-of-service.php
index 97cd465b6c82..ec6d566e4344 100644
--- a/packages/terms-of-service/src/class-terms-of-service.php
+++ b/packages/terms-of-service/src/class-terms-of-service.php
@@ -7,8 +7,6 @@
 
 namespace Automattic\Jetpack;
 
-use Automattic\Jetpack\Status;
-
 /**
  * Class Terms_Of_Service
  *
diff --git a/packages/terms-of-service/tests/php/test-terms-of-service.php b/packages/terms-of-service/tests/php/test-terms-of-service.php
index 0e289594b1da..5e904192abab 100644
--- a/packages/terms-of-service/tests/php/test-terms-of-service.php
+++ b/packages/terms-of-service/tests/php/test-terms-of-service.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 /**
  * Tests the TOS package.
  *
@@ -7,9 +7,9 @@
 
 namespace Automattic\Jetpack;
 
-use PHPUnit\Framework\TestCase;
 use phpmock\Mock;
 use phpmock\MockBuilder;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class Test_Terms_Of_Service
@@ -95,7 +95,7 @@ protected function mock_function( $function_name, $return_value = null, $called_
 		$builder->setNamespace( __NAMESPACE__ )
 				->setName( $function_name )
 				->setFunction(
-					function( $value ) use ( &$return_value, $called_with ) {
+					function ( $value ) use ( &$return_value, $called_with ) {
 						if ( $called_with ) {
 							$this->assertEquals( $value, $called_with );
 						}