diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx
similarity index 68%
rename from assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx
rename to assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx
index a568863b6fd..0203efec0de 100644
--- a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx
+++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx
@@ -1,5 +1,5 @@
 /**
- * AnalyticsActivationErrorNotification component stories.
+ * InitialSetupErrorNotification component stories.
  *
  * Site Kit by Google, Copyright 2026 Google LLC
  *
@@ -20,16 +20,16 @@
  * Internal dependencies
  */
 import { Story } from '@/js/types/Story';
-import AnalyticsActivationErrorNotification from './AnalyticsActivationErrorNotification';
+import InitialSetupErrorNotification from './InitialSetupErrorNotification';
 
 function Template() {
-	return <AnalyticsActivationErrorNotification onRetry={ () => {} } />;
+	return <InitialSetupErrorNotification onRetry={ () => {} } />;
 }
 
 export const Default = Template.bind( {} ) as Story;
-Default.storyName = 'AnalyticsActivationErrorNotification';
+Default.storyName = 'InitialSetupErrorNotification';
 Default.scenario = {};
 
 export default {
-	title: 'Setup/Using Proxy With Sign-in/Components/AnalyticsActivationErrorNotification',
+	title: 'Setup/Using Proxy With Sign-in/Components/InitialSetupErrorNotification',
 };
diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx
similarity index 71%
rename from assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx
rename to assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx
index efb412ab105..e951e9d5033 100644
--- a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx
+++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx
@@ -1,5 +1,5 @@
 /**
- * SetupUsingProxyWithSignIn AnalyticsActivationErrorNotification component.
+ * SetupUsingProxyWithSignIn InitialSetupErrorNotification component.
  *
  * Site Kit by Google, Copyright 2026 Google LLC
  *
@@ -32,19 +32,19 @@ import { __ } from '@wordpress/i18n';
 import Notice from '@/js/components/Notice';
 import { NOTICE_TYPES } from '@/js/components/Notice/constants';
 
-interface AnalyticsActivationErrorNotificationProps {
+interface InitialSetupErrorNotificationProps {
 	onRetry?: () => void;
 }
 
-export const ANALYTICS_ACTIVATION_ERROR_NOTIFICATION =
-	'analytics-activation-error-notification';
+export const INITIAL_SETUP_ERROR_NOTIFICATION =
+	'initial-setup-error-notification';
 
-const AnalyticsActivationErrorNotification: FC<
-	AnalyticsActivationErrorNotificationProps
-> = ( { onRetry }: AnalyticsActivationErrorNotificationProps ) => {
+const InitialSetupErrorNotification: FC<
+	InitialSetupErrorNotificationProps
+> = ( { onRetry }: InitialSetupErrorNotificationProps ) => {
 	return (
 		<Notice
-			className="googlesitekit-setup__analytics-activation-error-notification"
+			className="googlesitekit-setup__initial-setup-error-notification"
 			title={ __( 'Connecting Site Kit failed', 'google-site-kit' ) }
 			description={ __(
 				'Something went wrong while connecting Site Kit to your site. Please try again.',
@@ -59,4 +59,4 @@ const AnalyticsActivationErrorNotification: FC<
 	);
 };
 
-export default AnalyticsActivationErrorNotification;
+export default InitialSetupErrorNotification;
diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/index-setupFlowRefresh.stories.js b/assets/js/components/setup/SetupUsingProxyWithSignIn/index-setupFlowRefresh.stories.js
index 09225ebc6d7..41d499ef3ab 100644
--- a/assets/js/components/setup/SetupUsingProxyWithSignIn/index-setupFlowRefresh.stories.js
+++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/index-setupFlowRefresh.stories.js
@@ -26,9 +26,9 @@ import { withQuery } from '@storybook/addon-queryparams';
  */
 import { Provider as ViewContextProvider } from '@/js/components/Root/ViewContextContext';
 import SetupUsingProxyWithSignIn from '@/js/components/setup/SetupUsingProxyWithSignIn';
-import AnalyticsActivationErrorNotification, {
-	ANALYTICS_ACTIVATION_ERROR_NOTIFICATION,
-} from '@/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification';
+import InitialSetupErrorNotification, {
+	INITIAL_SETUP_ERROR_NOTIFICATION,
+} from '@/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification';
 import { VIEW_CONTEXT_MAIN_DASHBOARD } from '@/js/googlesitekit/constants';
 import {
 	CORE_USER,
@@ -343,9 +343,9 @@ SecondaryAdminWithSharedServices.parameters = {
 };
 SecondaryAdminWithSharedServices.scenario = {};
 
-export const AnalyticsActivationError = Template.bind( {} );
-AnalyticsActivationError.storyName = 'Analytics activation error';
-AnalyticsActivationError.args = {
+export const InitialSetupError = Template.bind( {} );
+InitialSetupError.storyName = 'Initial setup error';
+InitialSetupError.args = {
 	setupRegistry: ( registry ) => {
 		provideSiteConnection( registry, {
 			hasConnectedAdmins: false,
@@ -362,11 +362,9 @@ AnalyticsActivationError.args = {
 
 		registry
 			.dispatch( CORE_NOTIFICATIONS )
-			.registerNotification( ANALYTICS_ACTIVATION_ERROR_NOTIFICATION, {
+			.registerNotification( INITIAL_SETUP_ERROR_NOTIFICATION, {
 				Component: () => (
-					<AnalyticsActivationErrorNotification
-						onRetry={ () => null }
-					/>
+					<InitialSetupErrorNotification onRetry={ () => null } />
 				),
 				priority: PRIORITY.ERROR_HIGH,
 				areaSlug: NOTIFICATION_AREAS.SPLASH_CONTENT,
@@ -377,11 +375,11 @@ AnalyticsActivationError.args = {
 	},
 };
 
-AnalyticsActivationError.parameters = {
+InitialSetupError.parameters = {
 	features: [ 'setupFlowRefresh', 'setupFlowRefreshPhase4' ],
 };
 
-AnalyticsActivationError.scenario = {};
+InitialSetupError.scenario = {};
 
 export default {
 	title: 'Setup / Using Proxy With Sign-in and setupFlowRefresh enabled',
diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js
index b2ff4c4a683..44396a21ea1 100644
--- a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js
+++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js
@@ -37,9 +37,9 @@ import {
 	ANALYTICS_NOTICE_CHECKBOX,
 	ANALYTICS_NOTICE_FORM_NAME,
 } from '@/js/components/setup/constants';
-import AnalyticsActivationErrorNotification, {
-	ANALYTICS_ACTIVATION_ERROR_NOTIFICATION,
-} from '@/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification';
+import InitialSetupErrorNotification, {
+	INITIAL_SETUP_ERROR_NOTIFICATION,
+} from '@/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification';
 import { setItem } from '@/js/googlesitekit/api/cache';
 import { CORE_LOCATION } from '@/js/googlesitekit/datastore/location/constants';
 import { CORE_SITE } from '@/js/googlesitekit/datastore/site/constants';
@@ -181,9 +181,9 @@ export default function SetupUsingProxyWithSignIn() {
 					return;
 				}
 
-				registerNotification( ANALYTICS_ACTIVATION_ERROR_NOTIFICATION, {
+				registerNotification( INITIAL_SETUP_ERROR_NOTIFICATION, {
 					Component: () => (
-						<AnalyticsActivationErrorNotification
+						<InitialSetupErrorNotification
 							onRetry={ onButtonClick }
 						/>
 					),
diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js
index 05148338d2a..b8b220c1971 100644
--- a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js
+++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js
@@ -936,7 +936,7 @@ describe( 'SetupUsingProxyWithSignIn', () => {
 			expect( console ).toHaveErrored();
 		} );
 
-		it( 'should retry plugin setup when the Analytics activation error notification CTA is clicked', async () => {
+		it( 'should retry plugin setup when the initial setup error notification CTA is clicked', async () => {
 			fetchMock.postOnce(
 				new RegExp(
 					'^/google-site-kit/v1/core/modules/data/activation'
diff --git a/bin/check-commit-msg.php b/bin/check-commit-msg.php
index 5150a4124d4..2342ee893bc 100644
--- a/bin/check-commit-msg.php
+++ b/bin/check-commit-msg.php
@@ -26,9 +26,9 @@ function has_color_support() {
 
 	if ( DIRECTORY_SEPARATOR === '\\' ) {
 		return ( function_exists( 'sapi_windows_vt100_support' ) && sapi_windows_vt100_support( STDERR ) ) // phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.sapi_windows_vt100_supportFound
-			|| false !== getenv( 'ANSICON' )
-			|| 'ON' === getenv( 'ConEmuANSI' )
-			|| 'xterm' === getenv( 'TERM' );
+		|| false !== getenv( 'ANSICON' )
+		|| 'ON' === getenv( 'ConEmuANSI' )
+		|| 'xterm' === getenv( 'TERM' );
 	}
 
 	if ( function_exists( 'stream_isatty' ) ) {
diff --git a/includes/Context.php b/includes/Context.php
index 8c99f864452..f0d07d6adeb 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -353,8 +353,8 @@ private function get_amp_mode_from_amp_plugin() {
 		}
 
 		$exposes_support_mode = defined( 'AMP_Theme_Support::STANDARD_MODE_SLUG' )
-			&& defined( 'AMP_Theme_Support::TRANSITIONAL_MODE_SLUG' )
-			&& defined( 'AMP_Theme_Support::READER_MODE_SLUG' );
+		&& defined( 'AMP_Theme_Support::TRANSITIONAL_MODE_SLUG' )
+		&& defined( 'AMP_Theme_Support::READER_MODE_SLUG' );
 
 		if ( defined( 'AMP__VERSION' ) ) {
 			$amp_plugin_version = AMP__VERSION;
@@ -369,12 +369,12 @@ private function get_amp_mode_from_amp_plugin() {
 
 		if ( $amp_plugin_version_2_or_higher ) {
 			$exposes_support_mode = class_exists( 'AMP_Options_Manager' )
-				&& method_exists( 'AMP_Options_Manager', 'get_option' )
-				&& $exposes_support_mode;
+			&& method_exists( 'AMP_Options_Manager', 'get_option' )
+			&& $exposes_support_mode;
 		} else {
 			$exposes_support_mode = class_exists( 'AMP_Theme_Support' )
-				&& method_exists( 'AMP_Theme_Support', 'get_support_mode' )
-				&& $exposes_support_mode;
+			&& method_exists( 'AMP_Theme_Support', 'get_support_mode' )
+			&& $exposes_support_mode;
 		}
 
 		if ( $exposes_support_mode ) {
@@ -419,7 +419,7 @@ public function is_network_active() {
 
 				// Consider MU plugins and network-activated plugins as network-active.
 				$this->network_active = strpos( wp_normalize_path( __FILE__ ), wp_normalize_path( WPMU_PLUGIN_DIR ) ) === 0
-					|| in_array( WP_PLUGIN_DIR . '/' . GOOGLESITEKIT_PLUGIN_BASENAME, $network_active_plugins, true );
+				|| in_array( WP_PLUGIN_DIR . '/' . GOOGLESITEKIT_PLUGIN_BASENAME, $network_active_plugins, true );
 			} else {
 				$this->network_active = false;
 			}
diff --git a/includes/Core/Admin/Available_Tools.php b/includes/Core/Admin/Available_Tools.php
index 76f2fa28577..32a2545c692 100644
--- a/includes/Core/Admin/Available_Tools.php
+++ b/includes/Core/Admin/Available_Tools.php
@@ -46,19 +46,19 @@ private function render_tool_box() {
 		<div class="card">
 			<h2 class="title"><?php esc_html_e( 'Reset Site Kit', 'google-site-kit' ); ?></h2>
 			<p>
-				<?php
-				esc_html_e(
-					'Resetting will disconnect all users and remove all Site Kit settings and data within WordPress. You and any other users who wish to use Site Kit will need to reconnect to restore access.',
-					'google-site-kit'
-				)
-				?>
+		<?php
+		esc_html_e(
+			'Resetting will disconnect all users and remove all Site Kit settings and data within WordPress. You and any other users who wish to use Site Kit will need to reconnect to restore access.',
+			'google-site-kit'
+		)
+		?>
 			</p>
 			<p>
 				<a
 					class="button button-primary"
 					href="<?php echo esc_url( Reset::url() ); ?>"
 				>
-					<?php esc_html_e( 'Reset Site Kit', 'google-site-kit' ); ?>
+		<?php esc_html_e( 'Reset Site Kit', 'google-site-kit' ); ?>
 				</a>
 			</p>
 		</div>
diff --git a/includes/Core/Admin/Dashboard.php b/includes/Core/Admin/Dashboard.php
index ff8999102c0..e3c5bef6796 100644
--- a/includes/Core/Admin/Dashboard.php
+++ b/includes/Core/Admin/Dashboard.php
@@ -176,30 +176,30 @@ private function render_googlesitekit_wp_dashboard() {
 		?>
 		<div id="js-googlesitekit-wp-dashboard" data-view-only="<?php echo esc_attr( $is_view_only ); ?>" class="googlesitekit-plugin <?php echo esc_attr( $class_names ); ?>">
 			<div class="googlesitekit-wp-dashboard googlesitekit-wp-dashboard-loading">
-			<?php
+		<?php
 
-				$this->render_loading_container( 'googlesitekit-wp-dashboard__cta' );
-			?>
+		$this->render_loading_container( 'googlesitekit-wp-dashboard__cta' );
+		?>
 
 				<div class="googlesitekit-wp-dashboard-stats">
-				<?php
-				if ( $display_analytics_data ) {
-					$this->render_loading_container( 'googlesitekit-wp-dashboard-loading__can_view_analytics' );
-				}
-
-				if ( $display_search_console_data ) {
-					$this->render_loading_container( 'googlesitekit-wp-dashboard-loading__search_console_active_and_connected' );
-				}
-
-				if ( $display_analytics_cta ) {
-					$this->render_loading_container( 'googlesitekit-wp-dashboard-stats__cta' );
-				}
-
-				if ( $display_analytics_data ) {
-					$this->render_loading_container( 'googlesitekit-unique-visitors-chart-widget' );
-					$this->render_loading_container( 'googlesitekit-search-console-widget' );
-				}
-				?>
+		<?php
+		if ( $display_analytics_data ) {
+			$this->render_loading_container( 'googlesitekit-wp-dashboard-loading__can_view_analytics' );
+		}
+
+		if ( $display_search_console_data ) {
+			$this->render_loading_container( 'googlesitekit-wp-dashboard-loading__search_console_active_and_connected' );
+		}
+
+		if ( $display_analytics_cta ) {
+			$this->render_loading_container( 'googlesitekit-wp-dashboard-stats__cta' );
+		}
+
+		if ( $display_analytics_data ) {
+			$this->render_loading_container( 'googlesitekit-unique-visitors-chart-widget' );
+			$this->render_loading_container( 'googlesitekit-search-console-widget' );
+		}
+		?>
 				</div>
 			</div>
 		</div>
diff --git a/includes/Core/Admin/Notice.php b/includes/Core/Admin/Notice.php
index afae85ab2df..3650cec23a9 100644
--- a/includes/Core/Admin/Notice.php
+++ b/includes/Core/Admin/Notice.php
@@ -125,7 +125,7 @@ public function render() {
 
 		?>
 		<div id="<?php echo esc_attr( 'googlesitekit-notice-' . $this->slug ); ?>" class="<?php echo esc_attr( $class ); ?>">
-			<?php echo $content; /* phpcs:ignore WordPress.Security.EscapeOutput */ ?>
+		<?php echo $content; /* phpcs:ignore WordPress.Security.EscapeOutput */ ?>
 		</div>
 		<?php
 	}
diff --git a/includes/Core/Admin/Screen.php b/includes/Core/Admin/Screen.php
index 34a011d2420..f97442dc5ed 100644
--- a/includes/Core/Admin/Screen.php
+++ b/includes/Core/Admin/Screen.php
@@ -230,10 +230,10 @@ public function enqueue_assets( Assets $assets ) {
 		$assets->enqueue_asset( 'googlesitekit-admin-css' );
 
 		$cb = is_callable( $this->args['enqueue_callback'] )
-			? $this->args['enqueue_callback']
-			: function ( Assets $assets ) {
-				$assets->enqueue_asset( $this->slug );
-			};
+		? $this->args['enqueue_callback']
+		: function ( Assets $assets ) {
+			$assets->enqueue_asset( $this->slug );
+		};
 
 		call_user_func( $cb, $assets );
 	}
@@ -247,14 +247,14 @@ public function enqueue_assets( Assets $assets ) {
 	 */
 	private function render( Context $context ) {
 		$cb = is_callable( $this->args['render_callback'] )
-			? $this->args['render_callback']
-			: function () {
-				printf( '<div id="js-%s" class="googlesitekit-page"></div>', esc_attr( $this->slug ) );
-			};
+		? $this->args['render_callback']
+		: function () {
+			printf( '<div id="js-%s" class="googlesitekit-page"></div>', esc_attr( $this->slug ) );
+		};
 
 		echo '<div class="googlesitekit-plugin">';
-			$this->render_noscript_html();
-			call_user_func( $cb, $context );
+		$this->render_noscript_html();
+		call_user_func( $cb, $context );
 		echo '</div>';
 	}
 }
diff --git a/includes/Core/Admin_Bar/Admin_Bar.php b/includes/Core/Admin_Bar/Admin_Bar.php
index f9334a615df..7bbe4a59dc1 100644
--- a/includes/Core/Admin_Bar/Admin_Bar.php
+++ b/includes/Core/Admin_Bar/Admin_Bar.php
@@ -292,29 +292,29 @@ private function menu_markup() {
 
 		?>
 		<div class="googlesitekit-plugin ab-sub-wrapper">
-			<?php $this->render_noscript_html(); ?>
+		<?php $this->render_noscript_html(); ?>
 
 			<div id="js-googlesitekit-adminbar" data-view-only="<?php echo esc_attr( $is_view_only ); ?>" class="googlesitekit-adminbar">
 
-				<?php
-				/**
-				 * Display server rendered content before JS-based adminbar modules.
-				 *
-				 * @since 1.0.0
-				 */
-				do_action( 'googlesitekit_adminbar_modules_before' );
-				?>
+		<?php
+		/**
+		 * Display server rendered content before JS-based adminbar modules.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action( 'googlesitekit_adminbar_modules_before' );
+		?>
 
 				<section id="js-googlesitekit-adminbar-modules" class="googlesitekit-adminbar-modules"></section>
 
-				<?php
-				/**
-				 * Display server rendered content after JS-based adminbar modules.
-				 *
-				 * @since 1.0.0
-				 */
-				do_action( 'googlesitekit_adminbar_modules_after' );
-				?>
+		<?php
+		/**
+		 * Display server rendered content after JS-based adminbar modules.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action( 'googlesitekit_adminbar_modules_after' );
+		?>
 			</div>
 		</div>
 		<?php
diff --git a/includes/Core/Authentication/Clients/OAuth_Client.php b/includes/Core/Authentication/Clients/OAuth_Client.php
index 5494d2dbfda..f7bea1f8848 100644
--- a/includes/Core/Authentication/Clients/OAuth_Client.php
+++ b/includes/Core/Authentication/Clients/OAuth_Client.php
@@ -611,8 +611,8 @@ private function get_authorize_user_redirect_url_for_error() {
 		}
 
 		return current_user_can( Permissions::VIEW_DASHBOARD )
-			? $this->context->admin_url( 'dashboard' )
-			: $this->context->admin_url( 'splash' );
+		? $this->context->admin_url( 'dashboard' )
+		: $this->context->admin_url( 'splash' );
 	}
 
 	/**
diff --git a/includes/Core/Authentication/Google_Proxy.php b/includes/Core/Authentication/Google_Proxy.php
index eb3c47bb201..616c03f83b4 100644
--- a/includes/Core/Authentication/Google_Proxy.php
+++ b/includes/Core/Authentication/Google_Proxy.php
@@ -356,8 +356,8 @@ private function request( $uri, $credentials, array $args = array() ) {
 	 */
 	public function get_site_fields() {
 		$return_uri             = Feature_Flags::enabled( 'setupFlowRefresh' )
-			? admin_url( 'index.php' )
-			: $this->context->admin_url( 'splash' );
+		? admin_url( 'index.php' )
+		: $this->context->admin_url( 'splash' );
 		$analytics_redirect_uri = add_query_arg( 'gatoscallback', 1, admin_url( 'index.php' ) );
 
 		if ( Feature_Flags::enabled( 'setupFlowRefresh' ) ) {
diff --git a/includes/Core/Authentication/Setup.php b/includes/Core/Authentication/Setup.php
index 5764d29b182..d3cd742d73d 100644
--- a/includes/Core/Authentication/Setup.php
+++ b/includes/Core/Authentication/Setup.php
@@ -165,8 +165,8 @@ public function handle_action_setup_start() {
 		$this->google_proxy->with_scopes( $required_scopes );
 
 		$oauth_setup_redirect = $this->credentials->has()
-			? $this->google_proxy->sync_site_fields( $this->credentials, 'sync' )
-			: $this->google_proxy->register_site( 'sync' );
+		? $this->google_proxy->sync_site_fields( $this->credentials, 'sync' )
+		: $this->google_proxy->register_site( 'sync' );
 
 		if ( is_wp_error( $oauth_setup_redirect ) ) {
 			$error_message = $oauth_setup_redirect->get_error_message();
diff --git a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php
index 15f17051cfc..894116d30fa 100644
--- a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php
+++ b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php
@@ -61,16 +61,16 @@ class REST_Consent_Mode_Controller {
 	 */
 	protected $options;
 
-		/**
-		 * Constructor.
-		 *
-		 * @since 1.122.0
-		 * @since 1.142.0 Introduces Modules as an argument.
-		 *
-		 * @param Modules               $modules               Modules instance.
-		 * @param Consent_Mode_Settings $consent_mode_settings Consent_Mode_Settings instance.
-		 * @param Options               $options               Optional. Option API instance. Default is a new instance.
-		 */
+	/**
+	 * Constructor.
+	 *
+	 * @since 1.122.0
+	 * @since 1.142.0 Introduces Modules as an argument.
+	 *
+	 * @param Modules               $modules               Modules instance.
+	 * @param Consent_Mode_Settings $consent_mode_settings Consent_Mode_Settings instance.
+	 * @param Options               $options               Optional. Option API instance. Default is a new instance.
+	 */
 	public function __construct(
 		Modules $modules,
 		Consent_Mode_Settings $consent_mode_settings,
diff --git a/includes/Core/Email_Reporting/Email_Notices.php b/includes/Core/Email_Reporting/Email_Notices.php
index adc106394ba..2e5a1088109 100644
--- a/includes/Core/Email_Reporting/Email_Notices.php
+++ b/includes/Core/Email_Reporting/Email_Notices.php
@@ -351,8 +351,8 @@ private function get_prompt_state( Email_Notice_Interface $notice, $user_id ) {
 		$dismissal_slug = $notice->get_dismissal_slug();
 
 		return ( isset( $prompts[ $dismissal_slug ] ) && is_array( $prompts[ $dismissal_slug ] ) )
-			? $prompts[ $dismissal_slug ]
-			: array();
+		? $prompts[ $dismissal_slug ]
+		: array();
 	}
 
 	/**
diff --git a/includes/Core/Email_Reporting/Email_Reporting_Scheduler.php b/includes/Core/Email_Reporting/Email_Reporting_Scheduler.php
index 93653605605..5c02c51eb9a 100644
--- a/includes/Core/Email_Reporting/Email_Reporting_Scheduler.php
+++ b/includes/Core/Email_Reporting/Email_Reporting_Scheduler.php
@@ -177,8 +177,8 @@ private function get_initiator_events_for_frequency( $frequency ) {
 
 			foreach ( $hooks[ self::ACTION_INITIATOR ] as $event ) {
 				$args = isset( $event['args'] ) && is_array( $event['args'] )
-					? $event['args']
-					: array();
+				? $event['args']
+				: array();
 
 				if ( isset( $args[0] ) && $frequency === $args[0] ) {
 					$events[] = array(
diff --git a/includes/Core/Email_Reporting/Email_Template_Formatter.php b/includes/Core/Email_Reporting/Email_Template_Formatter.php
index bb9808bf819..f208eb48260 100644
--- a/includes/Core/Email_Reporting/Email_Template_Formatter.php
+++ b/includes/Core/Email_Reporting/Email_Template_Formatter.php
@@ -193,8 +193,8 @@ private function prepare_sections_payload( $sections, $date_range ) {
 			$first_dimension_value = '';
 			if ( isset( $dimension_values[0] ) ) {
 				$first_dimension_value = is_array( $dimension_values[0] )
-					? ( $dimension_values[0]['label'] ?? '' )
-					: $dimension_values[0];
+				? ( $dimension_values[0]['label'] ?? '' )
+				: $dimension_values[0];
 			}
 
 			$section_key = $section->get_section_key();
diff --git a/includes/Core/Email_Reporting/Initiator_Task.php b/includes/Core/Email_Reporting/Initiator_Task.php
index abe6544530e..b5471718203 100644
--- a/includes/Core/Email_Reporting/Initiator_Task.php
+++ b/includes/Core/Email_Reporting/Initiator_Task.php
@@ -117,7 +117,7 @@ public static function build_reference_dates( $frequency, $timestamp ) {
 		$time_zone = BC_Functions::wp_timezone();
 		$date      = ( new DateTimeImmutable( '@' . $timestamp ) )
 			->setTimezone( $time_zone )
-			// Normalise the scheduled timestamp (e.g. 09:00:00) to midnight for date arithmetic.
+		// Normalise the scheduled timestamp (e.g. 09:00:00) to midnight for date arithmetic.
 			->setTime( 0, 0, 0 );
 
 		switch ( $frequency ) {
diff --git a/includes/Core/Email_Reporting/Max_Execution_Limiter.php b/includes/Core/Email_Reporting/Max_Execution_Limiter.php
index 3956e45853f..738371838f4 100644
--- a/includes/Core/Email_Reporting/Max_Execution_Limiter.php
+++ b/includes/Core/Email_Reporting/Max_Execution_Limiter.php
@@ -39,8 +39,8 @@ class Max_Execution_Limiter {
 	 */
 	public function __construct( $max_execution_time ) {
 		$this->max_execution_time = ( $max_execution_time && $max_execution_time > 0 )
-			? (int) $max_execution_time
-			: self::DEFAULT_LIMIT;
+		? (int) $max_execution_time
+		: self::DEFAULT_LIMIT;
 	}
 
 	/**
diff --git a/includes/Core/Email_Reporting/templates/email-report/parts/notice.php b/includes/Core/Email_Reporting/templates/email-report/parts/notice.php
index 5c0176f7815..a958c67f382 100644
--- a/includes/Core/Email_Reporting/templates/email-report/parts/notice.php
+++ b/includes/Core/Email_Reporting/templates/email-report/parts/notice.php
@@ -51,7 +51,7 @@
 						<a href="<?php echo esc_url( $cta_url ); ?>"
 							style="display:inline-block; background:#462083; color:#FFFFFF; font-size:14px; line-height:20px; font-weight:500; text-decoration:none; padding:6px 16px; border-radius:999px;"
 							rel="noopener" target="_blank">
-							<?php echo esc_html( $cta_label ); ?>
+				<?php echo esc_html( $cta_label ); ?>
 						</a>
 					</td>
 				</tr>
diff --git a/includes/Core/Email_Reporting/templates/email-report/parts/section-metrics.php b/includes/Core/Email_Reporting/templates/email-report/parts/section-metrics.php
index 996e73db5d0..67176de2281 100644
--- a/includes/Core/Email_Reporting/templates/email-report/parts/section-metrics.php
+++ b/includes/Core/Email_Reporting/templates/email-report/parts/section-metrics.php
@@ -68,22 +68,22 @@
 						style="vertical-align: top; border-bottom: <?php echo esc_attr( $border_style ); ?>; padding: 12px 0;">
 						<div class="text-secondary"
 							style="font-size:12px; line-height:16px; font-weight:500; color:#6C726E; margin-bottom:4px;">
-							<?php echo esc_html( $data['label'] ); ?>
+					<?php echo esc_html( $data['label'] ); ?>
 						</div>
 						<div class="text-primary" style="font-size:14px; line-height:20px; font-weight:500;">
-							<?php echo esc_html( $data['value'] ); ?>
+					<?php echo esc_html( $data['value'] ); ?>
 						</div>
 					</td>
 					<td class="border"
 						style="text-align: right; vertical-align: middle; border-bottom: <?php echo esc_attr( $border_style ); ?>; padding: 12px 0;">
-						<?php
-							$render_shared_part(
-								'change-badge',
-								array(
-									'value' => $data['change'],
-								)
-							);
-						?>
+					<?php
+					$render_shared_part(
+						'change-badge',
+						array(
+							'value' => $data['change'],
+						)
+					);
+					?>
 					</td>
 				</tr>
 					<?php
diff --git a/includes/Core/Email_Reporting/templates/email-report/parts/section-page-metrics.php b/includes/Core/Email_Reporting/templates/email-report/parts/section-page-metrics.php
index 4d28584d6a6..b957e74452a 100644
--- a/includes/Core/Email_Reporting/templates/email-report/parts/section-page-metrics.php
+++ b/includes/Core/Email_Reporting/templates/email-report/parts/section-page-metrics.php
@@ -58,12 +58,12 @@
 				<tr>
 					<td class="text-secondary" style="font-size:12px; line-height:16px; font-weight:500; color:#6C726E; padding-bottom:8px;">
 						<div style="width: 160px;">
-							<?php echo esc_html( $part_label ); ?>
+				<?php echo esc_html( $part_label ); ?>
 						</div>
 					</td>
 					<td class="text-secondary"
 						style="font-size:12px; line-height:16px; font-weight:500; color:#6C726E; text-align:right; padding-bottom:8px; text-align:right; width: 110px;">
-						<?php echo esc_html( $change_context ); ?>
+				<?php echo esc_html( $change_context ); ?>
 					</td>
 				</tr>
 				<?php
@@ -81,15 +81,15 @@
 				<tr>
 					<td class="border" colspan="2"
 						style="border-bottom: <?php echo esc_attr( $border_style ); ?>; padding: 5px 0; <?php echo $is_last && ! $is_last_section_part ? 'padding-bottom: 16px;' : ''; ?>">
-						<?php // Nested table required to ensure truncation works correctly for longer labels. ?>
+					<?php // Nested table required to ensure truncation works correctly for longer labels. ?>
 						<table role="presentation" width="100%">
 							<tr>
 								<td class="text-primary"
 									style="font-size:14px; line-height:20px; font-weight:500; max-width:150px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">
-									<?php if ( $has_url ) : ?>
+					<?php if ( $has_url ) : ?>
 									<a class="text-primary" href="<?php echo esc_url( $entity_url ); ?>"
 										style="color:#161B18; text-decoration:underline;">
-										<?php echo esc_html( $item['label'] ); ?>
+						<?php echo esc_html( $item['label'] ); ?>
 									</a>
 									<?php else : ?>
 										<?php echo esc_html( $item ); ?>
@@ -97,17 +97,17 @@
 								</td>
 								<td class="text-primary"
 									style="font-size:14px; line-height:20px; font-weight:500; text-align:right; width:80px;">
-									<?php echo esc_html( $data['values'][ $index ] ?? 0 ); ?>
+					<?php echo esc_html( $data['values'][ $index ] ?? 0 ); ?>
 								</td>
 								<td style="text-align:right; width:80px;">
-									<?php
-										$render_shared_part(
-											'change-badge',
-											array(
-												'value' => $data['changes'][ $index ] ?? 0,
-											)
-										);
-									?>
+					<?php
+					$render_shared_part(
+						'change-badge',
+						array(
+							'value' => $data['changes'][ $index ] ?? 0,
+						)
+					);
+					?>
 								</td>
 							</tr>
 						</table>
diff --git a/includes/Core/Email_Reporting/templates/parts/footer.php b/includes/Core/Email_Reporting/templates/parts/footer.php
index 319886892d3..c78ec7538c8 100644
--- a/includes/Core/Email_Reporting/templates/parts/footer.php
+++ b/includes/Core/Email_Reporting/templates/parts/footer.php
@@ -18,32 +18,32 @@
 		<td style="text-align:center;">
 			<?php if ( ! empty( $cta['url'] ) ) : ?>
 				<div style="margin-top: 8px; margin-bottom:52px;">
-					<?php
-					$render_shared_part(
-						'dashboard-link',
-						array(
-							'url'   => $cta['url'],
-							'label' => isset( $cta['label'] ) ? $cta['label'] : __( 'View dashboard', 'google-site-kit' ),
-						)
-					);
-					?>
+				<?php
+				$render_shared_part(
+					'dashboard-link',
+					array(
+						'url'   => $cta['url'],
+						'label' => isset( $cta['label'] ) ? $cta['label'] : __( 'View dashboard', 'google-site-kit' ),
+					)
+				);
+				?>
 				</div>
 			<?php endif; ?>
 			<?php if ( ! empty( $footer['copy'] ) ) : ?>
 				<p class="text-secondary" style="font-size:12px; line-height:16px; font-weight:500; color:#6C726E; margin-bottom: 30px; text-align: left;">
-					<?php
-					if ( ! empty( $footer['unsubscribe_url'] ) ) {
-						$unsubscribe_link = sprintf(
-							'<a class="link" href="%s" style="text-decoration:none;">%s</a>',
-							esc_url( $footer['unsubscribe_url'] ),
-							esc_html__( 'here', 'google-site-kit' )
-						);
+				<?php
+				if ( ! empty( $footer['unsubscribe_url'] ) ) {
+					$unsubscribe_link = sprintf(
+						'<a class="link" href="%s" style="text-decoration:none;">%s</a>',
+						esc_url( $footer['unsubscribe_url'] ),
+						esc_html__( 'here', 'google-site-kit' )
+					);
 						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Link is escaped above.
-						printf( '%s %s.', esc_html( $footer['copy'] ), $unsubscribe_link );
-					} else {
-						echo esc_html( $footer['copy'] );
-					}
-					?>
+					printf( '%s %s.', esc_html( $footer['copy'] ), $unsubscribe_link );
+				} else {
+					echo esc_html( $footer['copy'] );
+				}
+				?>
 				</p>
 			<?php endif; ?>
 			<?php
@@ -67,8 +67,8 @@
 			$footer_links_count = count( $footer_links );
 			$cell_width         = round( 100 / $footer_links_count, 2 ) . '%';
 			$alignments         = 3 === $footer_links_count
-				? array( 'left', 'center', 'right' )
-				: array_fill( 0, $footer_links_count, 'center' );
+			? array( 'left', 'center', 'right' )
+			: array_fill( 0, $footer_links_count, 'center' );
 			?>
 			<table role="presentation" width="100%" style="font-size:12px; line-height:18px;">
 				<tr>
@@ -78,7 +78,7 @@
 						?>
 						<td width="<?php echo esc_attr( $cell_width ); ?>" style="text-align:<?php echo esc_attr( $align ); ?>;">
 							<a class="text-secondary" href="<?php echo esc_url( $footer_link['url'] ); ?>" style="color:#6C726E; text-decoration:none; font-size:12px; line-height:16px; font-weight:500;" target="_blank" rel="noopener">
-								<?php echo esc_html( $footer_link['label'] ); ?>
+						<?php echo esc_html( $footer_link['label'] ); ?>
 							</a>
 						</td>
 					<?php endforeach; ?>
diff --git a/includes/Core/Email_Reporting/templates/simple-email/parts/content.php b/includes/Core/Email_Reporting/templates/simple-email/parts/content.php
index f160eea8d54..d326fc7c5f2 100644
--- a/includes/Core/Email_Reporting/templates/simple-email/parts/content.php
+++ b/includes/Core/Email_Reporting/templates/simple-email/parts/content.php
@@ -65,11 +65,11 @@
 
 			<?php
 			/*
-			 * Body paragraphs from Content_Map.
-			 * Uses wp_kses() for all templates to safely render inline HTML
-			 * (e.g. strong tags in subscription-confirmation, anchor tags in error-email).
-			 * Plain text body content passes through wp_kses() unchanged.
-			 */
+			* Body paragraphs from Content_Map.
+			* Uses wp_kses() for all templates to safely render inline HTML
+			* (e.g. strong tags in subscription-confirmation, anchor tags in error-email).
+			* Plain text body content passes through wp_kses() unchanged.
+			*/
 			?>
 			<?php foreach ( $body as $index => $paragraph ) : ?>
 			<p class="text-primary" style="font-size: 14px; line-height: 20px; font-weight: 400; color: #161B18; margin: 0 0 <?php echo $has_bottom_graphic && count( $body ) - 1 === $index ? '20px' : '16px'; ?> 0;">
@@ -102,15 +102,15 @@
 			<table role="presentation" cellpadding="0" cellspacing="0" border="0">
 				<tr>
 					<td style="padding: <?php echo esc_attr( $cta_padding_top ); ?> 0 <?php echo esc_attr( $cta_padding_bottom ); ?> 0;">
-						<?php
-						$render_shared_part(
-							'dashboard-link',
-							array(
-								'url'   => $cta['url'],
-								'label' => isset( $cta['label'] ) ? $cta['label'] : __( 'Get your report', 'google-site-kit' ),
-							)
-						);
-						?>
+				<?php
+				$render_shared_part(
+					'dashboard-link',
+					array(
+						'url'   => $cta['url'],
+						'label' => isset( $cta['label'] ) ? $cta['label'] : __( 'Get your report', 'google-site-kit' ),
+					)
+				);
+				?>
 					</td>
 				</tr>
 			</table>
diff --git a/includes/Core/Email_Reporting/templates/simple-email/template.php b/includes/Core/Email_Reporting/templates/simple-email/template.php
index bcbbac9b535..1c617bd0a4b 100644
--- a/includes/Core/Email_Reporting/templates/simple-email/template.php
+++ b/includes/Core/Email_Reporting/templates/simple-email/template.php
@@ -98,7 +98,7 @@
 									<tr>
 										<td style="text-align: left;">
 											<p class="text-secondary" style="font-size: 12px; line-height: 16px; font-weight: 500; color: #6C726E; margin: 0;">
-												<?php echo esc_html( $footer['copy'] ?? '' ); ?>
+								<?php echo esc_html( $footer['copy'] ?? '' ); ?>
 											</p>
 										</td>
 									</tr>
diff --git a/includes/Core/Feature_Tours/Dismissed_Tours.php b/includes/Core/Feature_Tours/Dismissed_Tours.php
index 8cd56b0455d..fced2b9924b 100644
--- a/includes/Core/Feature_Tours/Dismissed_Tours.php
+++ b/includes/Core/Feature_Tours/Dismissed_Tours.php
@@ -90,8 +90,8 @@ protected function get_default() {
 	protected function get_sanitize_callback() {
 		return function ( $value ) {
 			return is_array( $value )
-				? array_values( array_unique( $value ) )
-				: $this->get();
+			? array_values( array_unique( $value ) )
+			: $this->get();
 		};
 	}
 }
diff --git a/includes/Core/Nonces/Nonces.php b/includes/Core/Nonces/Nonces.php
index b1f9b453c64..142d623b793 100644
--- a/includes/Core/Nonces/Nonces.php
+++ b/includes/Core/Nonces/Nonces.php
@@ -28,10 +28,10 @@
  */
 final class Nonces {
 	/*
-	 * Nonce actions.
-	 *
-	 * @since 1.93.0
-	 */
+	* Nonce actions.
+	*
+	* @since 1.93.0
+	*/
 	const NONCE_UPDATES = 'updates';
 
 	/**
diff --git a/includes/Core/Permissions/Permissions.php b/includes/Core/Permissions/Permissions.php
index ddd6f981c0f..013d0168582 100644
--- a/includes/Core/Permissions/Permissions.php
+++ b/includes/Core/Permissions/Permissions.php
@@ -34,8 +34,8 @@
  */
 final class Permissions {
 	/*
-	 * Custom base capabilities.
-	 */
+	* Custom base capabilities.
+	*/
 	const AUTHENTICATE             = 'googlesitekit_authenticate';
 	const SETUP                    = 'googlesitekit_setup';
 	const VIEW_POSTS_INSIGHTS      = 'googlesitekit_view_posts_insights';
@@ -47,8 +47,8 @@ final class Permissions {
 
 
 	/*
-	 * Custom meta capabilities.
-	 */
+	* Custom meta capabilities.
+	*/
 	const VIEW_SPLASH                        = 'googlesitekit_view_splash';
 	const VIEW_SHARED_DASHBOARD              = 'googlesitekit_view_shared_dashboard';
 	const VIEW_AUTHENTICATED_DASHBOARD       = 'googlesitekit_view_authenticated_dashboard';
diff --git a/includes/Core/Site_Health/Debug_Data.php b/includes/Core/Site_Health/Debug_Data.php
index e273514df98..a14c1615ccd 100644
--- a/includes/Core/Site_Health/Debug_Data.php
+++ b/includes/Core/Site_Health/Debug_Data.php
@@ -672,13 +672,13 @@ private function get_key_metrics_fields() {
 		}
 
 		$key_metrics_status = isset( $key_metrics_settings['isWidgetHidden'] ) && $key_metrics_settings['isWidgetHidden'] ?
-			__( 'Setup and Disabled', 'google-site-kit' ) :
-			__( 'Setup and Enabled', 'google-site-kit' );
+		__( 'Setup and Disabled', 'google-site-kit' ) :
+		__( 'Setup and Enabled', 'google-site-kit' );
 
 		// A minimum of 2 key metrics need to be saved to prevent "default" tailored metrics to render.
 		$key_metrics_source = isset( $key_metrics_settings['widgetSlugs'] ) && count( $key_metrics_settings['widgetSlugs'] ) > 1 ?
-			__( 'Manual Selection', 'google-site-kit' ) :
-			__( 'Tailored Metrics', 'google-site-kit' );
+		__( 'Manual Selection', 'google-site-kit' ) :
+		__( 'Tailored Metrics', 'google-site-kit' );
 
 		return array(
 			'key_metrics_status' => array(
diff --git a/includes/Core/Storage/User_Transients.php b/includes/Core/Storage/User_Transients.php
index e66101ac5d5..09a0473fbfd 100644
--- a/includes/Core/Storage/User_Transients.php
+++ b/includes/Core/Storage/User_Transients.php
@@ -97,8 +97,8 @@ public function switch_user( $user_id ) {
 	 */
 	public function get( $transient ) {
 		return wp_using_ext_object_cache()
-			? $this->get_from_cache( $transient )
-			: $this->get_from_user_options( $transient );
+		? $this->get_from_cache( $transient )
+		: $this->get_from_user_options( $transient );
 	}
 
 	/**
@@ -113,8 +113,8 @@ public function get( $transient ) {
 	 */
 	public function set( $transient, $value, $expiration = 0 ) {
 		return wp_using_ext_object_cache()
-			? $this->set_in_cache( $transient, $value, $expiration )
-			: $this->set_in_user_options( $transient, $value, $expiration );
+		? $this->set_in_cache( $transient, $value, $expiration )
+		: $this->set_in_user_options( $transient, $value, $expiration );
 	}
 
 	/**
@@ -127,8 +127,8 @@ public function set( $transient, $value, $expiration = 0 ) {
 	 */
 	public function delete( $transient ) {
 		return wp_using_ext_object_cache()
-			? $this->delete_from_cache( $transient )
-			: $this->delete_from_user_options( $transient );
+		? $this->delete_from_cache( $transient )
+		: $this->delete_from_user_options( $transient );
 	}
 
 	/**
diff --git a/includes/Core/Tags/GTag.php b/includes/Core/Tags/GTag.php
index a6b29fc94a8..6aa37d05fca 100644
--- a/includes/Core/Tags/GTag.php
+++ b/includes/Core/Tags/GTag.php
@@ -218,8 +218,8 @@ protected function enqueue_gtag_script() {
 	 */
 	protected function get_gtag_call_for_tag( $tag ) {
 		return empty( $tag['config'] )
-			? sprintf( 'gtag("config", "%s");', esc_js( $tag['tag_id'] ) )
-			: sprintf( 'gtag("config", "%s", %s);', esc_js( $tag['tag_id'] ), wp_json_encode( $tag['config'] ) );
+		? sprintf( 'gtag("config", "%s");', esc_js( $tag['tag_id'] ) )
+		: sprintf( 'gtag("config", "%s", %s);', esc_js( $tag['tag_id'] ), wp_json_encode( $tag['config'] ) );
 	}
 
 	/**
diff --git a/includes/Core/User/Audience_Settings.php b/includes/Core/User/Audience_Settings.php
index 074c1aff58e..3f0ee82ace1 100644
--- a/includes/Core/User/Audience_Settings.php
+++ b/includes/Core/User/Audience_Settings.php
@@ -112,8 +112,8 @@ protected function get_sanitize_callback() {
 			// Allow setting `null` for `configuredAudiences`.
 			if ( array_key_exists( 'configuredAudiences', $settings ) ) {
 				$sanitized_settings['configuredAudiences'] = is_null( $settings['configuredAudiences'] )
-					? null
-					: Sanitize::sanitize_string_list( $settings['configuredAudiences'] );
+				? null
+				: Sanitize::sanitize_string_list( $settings['configuredAudiences'] );
 			}
 
 			if ( isset( $settings['isAudienceSegmentationWidgetHidden'] ) ) {
diff --git a/includes/Core/User_Surveys/REST_User_Surveys_Controller.php b/includes/Core/User_Surveys/REST_User_Surveys_Controller.php
index 3c67a695a91..784ed971b2a 100644
--- a/includes/Core/User_Surveys/REST_User_Surveys_Controller.php
+++ b/includes/Core/User_Surveys/REST_User_Surveys_Controller.php
@@ -103,7 +103,7 @@ function ( $paths ) {
 	protected function get_rest_routes() {
 		$can_authenticate = function () {
 			return $this->authentication->is_authenticated()
-				&& $this->authentication->credentials()->using_proxy();
+			&& $this->authentication->credentials()->using_proxy();
 		};
 
 		return array(
diff --git a/includes/Core/Util/Requires_Javascript_Trait.php b/includes/Core/Util/Requires_Javascript_Trait.php
index 3b34b5a4f47..c53905d5b87 100644
--- a/includes/Core/Util/Requires_Javascript_Trait.php
+++ b/includes/Core/Util/Requires_Javascript_Trait.php
@@ -32,9 +32,9 @@ protected function render_noscript_html() {
 						<div class="mdc-layout-grid__inner">
 							<div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
 								<p class="googlesitekit-noscript__text">
-									<?php
-										esc_html_e( 'The Site Kit by Google plugin requires JavaScript to be enabled in your browser.', 'google-site-kit' )
-									?>
+		<?php
+		esc_html_e( 'The Site Kit by Google plugin requires JavaScript to be enabled in your browser.', 'google-site-kit' )
+		?>
 								</p>
 							</div>
 						</div>
diff --git a/includes/Modules/AdSense/AMP_Tag.php b/includes/Modules/AdSense/AMP_Tag.php
index 58dc2582463..0d80986bf75 100644
--- a/includes/Modules/AdSense/AMP_Tag.php
+++ b/includes/Modules/AdSense/AMP_Tag.php
@@ -84,8 +84,8 @@ private function get_auto_ads_attributes( $type = '' ) {
 		}
 
 		$filtered_options = 'web-story' === $type
-			? apply_filters( 'googlesitekit_amp_story_auto_ads_attributes', $options, $this->tag_id, $this->story_ad_slot_id )
-			: apply_filters( 'googlesitekit_amp_auto_ads_attributes', $options, $this->tag_id, $this->story_ad_slot_id );
+		? apply_filters( 'googlesitekit_amp_story_auto_ads_attributes', $options, $this->tag_id, $this->story_ad_slot_id )
+		: apply_filters( 'googlesitekit_amp_auto_ads_attributes', $options, $this->tag_id, $this->story_ad_slot_id );
 
 		if ( is_array( $filtered_options ) && ! empty( $filtered_options ) ) {
 			$options              = $filtered_options;
diff --git a/includes/Modules/Ads.php b/includes/Modules/Ads.php
index 9a4280fe079..44421a6c87b 100644
--- a/includes/Modules/Ads.php
+++ b/includes/Modules/Ads.php
@@ -345,8 +345,8 @@ public function register_tag() {
 		}
 
 		$tag = $this->context->is_amp()
-			? new AMP_Tag( $ads_conversion_id, self::MODULE_SLUG )
-			: new Web_Tag( $ads_conversion_id, self::MODULE_SLUG );
+		? new AMP_Tag( $ads_conversion_id, self::MODULE_SLUG )
+		: new Web_Tag( $ads_conversion_id, self::MODULE_SLUG );
 
 		if ( $tag->is_tag_blocked() ) {
 			return;
diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php
index a06eb8bb622..92ec4ac81d9 100644
--- a/includes/Modules/Analytics_4.php
+++ b/includes/Modules/Analytics_4.php
@@ -1192,8 +1192,8 @@ private function print_tracking_opt_out() {
 <?php else : ?>
 <!-- <?php esc_html_e( 'Google Analytics opt-out snippet added by Site Kit', 'google-site-kit' ); ?> -->
 	<?php
-			// Opt-out should always use the measurement ID, even when using a GT tag.
-			$tag_id = $this->get_measurement_id();
+	// Opt-out should always use the measurement ID, even when using a GT tag.
+	$tag_id = $this->get_measurement_id();
 	if ( ! empty( $tag_id ) ) {
 		BC_Functions::wp_print_inline_script_tag( sprintf( 'window["ga-disable-%s"] = true;', esc_attr( $tag_id ) ) );
 	}
@@ -1626,8 +1626,8 @@ private function get_provisioning_redirect_uri() {
 	 */
 	public function register_tag() {
 		$tag = $this->context->is_amp()
-			? new AMP_Tag( $this->get_measurement_id(), self::MODULE_SLUG ) // AMP currently only works with the measurement ID.
-			: new Web_Tag( $this->get_tag_id(), self::MODULE_SLUG );
+		? new AMP_Tag( $this->get_measurement_id(), self::MODULE_SLUG ) // AMP currently only works with the measurement ID.
+		: new Web_Tag( $this->get_tag_id(), self::MODULE_SLUG );
 
 		if ( $tag->is_tag_blocked() ) {
 			return;
diff --git a/includes/Modules/Analytics_4/Datapoints/Get_Advanced_Data_Breakdowns_Settings.php b/includes/Modules/Analytics_4/Datapoints/Get_Advanced_Data_Breakdowns_Settings.php
index c3d1f04f7d7..4367dc97b97 100644
--- a/includes/Modules/Analytics_4/Datapoints/Get_Advanced_Data_Breakdowns_Settings.php
+++ b/includes/Modules/Analytics_4/Datapoints/Get_Advanced_Data_Breakdowns_Settings.php
@@ -63,8 +63,8 @@ public function create_request( Data_Request $data_request ): callable {
 			$settings = $advanced_data_breakdowns_settings->get();
 
 			return current_user_can( Permissions::MANAGE_OPTIONS )
-				? $settings
-				: array_intersect_key( $settings, array_flip( $advanced_data_breakdowns_settings->get_view_only_keys() ) );
+			? $settings
+			: array_intersect_key( $settings, array_flip( $advanced_data_breakdowns_settings->get_view_only_keys() ) );
 		};
 	}
 
diff --git a/includes/Modules/Analytics_4/Email_Reporting/Report_Data_Processor.php b/includes/Modules/Analytics_4/Email_Reporting/Report_Data_Processor.php
index debe122f86d..552cd00ac17 100644
--- a/includes/Modules/Analytics_4/Email_Reporting/Report_Data_Processor.php
+++ b/includes/Modules/Analytics_4/Email_Reporting/Report_Data_Processor.php
@@ -94,11 +94,11 @@ public function aggregate_dimension_metrics( $dimensions, $rows, $metric_names )
 			}
 
 			$dimension_values[ $dimension_value ] = isset( $dimensions[1], $row['dimensions'][ $dimensions[1] ] )
-				? array(
-					'label' => $dimension_value,
-					'url'   => $row['dimensions'][ $dimensions[1] ],
-				)
-				: $dimension_value;
+			? array(
+				'label' => $dimension_value,
+				'url'   => $row['dimensions'][ $dimensions[1] ],
+			)
+			: $dimension_value;
 
 			foreach ( $metric_names as $metric_name ) {
 				if ( ! isset( $row['metrics'][ $metric_name ] ) ) {
diff --git a/includes/Modules/Analytics_4/Report/Filters/String_Filter.php b/includes/Modules/Analytics_4/Report/Filters/String_Filter.php
index 9c0074b6eb0..37e0e0b819a 100644
--- a/includes/Modules/Analytics_4/Report/Filters/String_Filter.php
+++ b/includes/Modules/Analytics_4/Report/Filters/String_Filter.php
@@ -36,12 +36,12 @@ class String_Filter implements Filter {
 	 */
 	public function parse_filter_expression( $name, $value ) {
 		$match_type = isset( $value['matchType'] )
-			? $value['matchType']
-			: 'EXACT';
+		? $value['matchType']
+		: 'EXACT';
 
 		$filter_value = isset( $value['value'] )
-			? $value['value']
-			: $value;
+		? $value['value']
+		: $value;
 
 		// If there are many values for this filter, then it means that we want to find
 		// rows where values are included in the list of provided values. In this case,
diff --git a/includes/Modules/Reader_Revenue_Manager/Admin_Post_List.php b/includes/Modules/Reader_Revenue_Manager/Admin_Post_List.php
index 582e731f3ec..590b42386f2 100644
--- a/includes/Modules/Reader_Revenue_Manager/Admin_Post_List.php
+++ b/includes/Modules/Reader_Revenue_Manager/Admin_Post_List.php
@@ -159,18 +159,18 @@ public function bulk_edit_field() {
 				<label style="align-items: center; display: flex; gap: 16px; line-height: 1;">
 					<span><?php esc_html_e( 'Reader Revenue CTA', 'google-site-kit' ); ?></span>
 					<select name="rrm_product_id">
-						<?php foreach ( $default_options as $value => $label ) : ?>
+		<?php foreach ( $default_options as $value => $label ) : ?>
 							<option value="<?php echo esc_attr( $value ); ?>">
-								<?php echo esc_html( $label ); ?>
+			<?php echo esc_html( $label ); ?>
 							</option>
 						<?php endforeach; ?>
 
-						<?php foreach ( $product_ids as $product_id ) : ?>
-							<?php list( , $label ) = explode( ':', $product_id, 2 ); ?>
+		<?php foreach ( $product_ids as $product_id ) : ?>
+			<?php list( , $label ) = explode( ':', $product_id, 2 ); ?>
 							<option value="<?php echo esc_attr( $product_id ); ?>">
-								<?php
-									echo esc_html( $label );
-								?>
+			<?php
+			echo esc_html( $label );
+			?>
 							</option>
 						<?php endforeach; ?>
 					</select>
diff --git a/includes/Modules/Reader_Revenue_Manager/Settings.php b/includes/Modules/Reader_Revenue_Manager/Settings.php
index 26c7e775aff..511fb8ba85e 100644
--- a/includes/Modules/Reader_Revenue_Manager/Settings.php
+++ b/includes/Modules/Reader_Revenue_Manager/Settings.php
@@ -174,8 +174,8 @@ protected function get_sanitize_callback() {
 						)
 					);
 					$option['postTypes'] = ! empty( $filtered_post_types )
-						? $filtered_post_types
-						: array( 'post' );
+					? $filtered_post_types
+					: array( 'post' );
 				}
 			}
 
diff --git a/includes/Modules/Search_Console/Email_Reporting/Report_Request_Assembler.php b/includes/Modules/Search_Console/Email_Reporting/Report_Request_Assembler.php
index 506b4f4304f..ec24da996c8 100644
--- a/includes/Modules/Search_Console/Email_Reporting/Report_Request_Assembler.php
+++ b/includes/Modules/Search_Console/Email_Reporting/Report_Request_Assembler.php
@@ -185,11 +185,11 @@ public function map_responses( $responses, $request_map ) {
 
 		foreach ( $request_map as $identifier => $metadata ) {
 			$result = isset( $responses[ $identifier ] )
-				? $responses[ $identifier ]
-				: new WP_Error(
-					'email_report_search_console_missing_result',
-					__( 'Search Console data could not be retrieved.', 'google-site-kit' )
-				);
+			? $responses[ $identifier ]
+			: new WP_Error(
+				'email_report_search_console_missing_result',
+				__( 'Search Console data could not be retrieved.', 'google-site-kit' )
+			);
 			$result = $this->normalize_response_result( $result, $identifier );
 
 			if ( 'compare' === $metadata['context'] || 'current' === $metadata['context'] ) {
diff --git a/includes/Modules/Sign_In_With_Google.php b/includes/Modules/Sign_In_With_Google.php
index 23d8fc9b3e0..e0dbbab2e1b 100644
--- a/includes/Modules/Sign_In_With_Google.php
+++ b/includes/Modules/Sign_In_With_Google.php
@@ -927,8 +927,8 @@ public function get_content_url() {
 	public function has_placed_tag_in_content( $content ) {
 		$search_string              = 'Sign in with Google button added by Site Kit';
 		$search_translatable_string =
-			/* translators: %s: Sign in with Google service name */
-			sprintf( __( '%s button added by Site Kit', 'google-site-kit' ), _x( 'Sign in with Google', 'Service name', 'google-site-kit' ) );
+		/* translators: %s: Sign in with Google service name */
+		sprintf( __( '%s button added by Site Kit', 'google-site-kit' ), _x( 'Sign in with Google', 'Service name', 'google-site-kit' ) );
 
 		if ( strpos( $content, $search_string ) !== false || strpos( $content, $search_translatable_string ) !== false ) {
 			return Module_Tag_Matchers::TAG_EXISTS_WITH_COMMENTS;
diff --git a/includes/Modules/Tag_Manager.php b/includes/Modules/Tag_Manager.php
index a310c4f878d..aa7a310ef34 100644
--- a/includes/Modules/Tag_Manager.php
+++ b/includes/Modules/Tag_Manager.php
@@ -597,8 +597,8 @@ public function register_tag() {
 		$settings        = $module_settings->get();
 
 		$tag = $is_amp
-			? new AMP_Tag( $settings['ampContainerID'], self::MODULE_SLUG )
-			: new Web_Tag( $settings['containerID'], self::MODULE_SLUG );
+		? new AMP_Tag( $settings['ampContainerID'], self::MODULE_SLUG )
+		: new Web_Tag( $settings['containerID'], self::MODULE_SLUG );
 
 		if ( ! $is_amp ) {
 			$tag->set_is_google_tag_gateway_active( $this->is_google_tag_gateway_active() );
diff --git a/phpcs.xml b/phpcs.xml
index 1422663676c..04b5fd9e769 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -63,6 +63,13 @@
 	<rule ref="SiteKit.PHPUnit.RequireAssertionMessage"/>
 	<rule ref="SiteKit.Commenting.RequireDocTagDescription"/>
 
+	<!-- Enforce exact scope indentation (flag over- and under-indented lines) -->
+	<rule ref="Generic.WhiteSpace.ScopeIndent">
+		<properties>
+			<property name="exact" value="true"/>
+		</properties>
+	</rule>
+
 	<!-- Show details about violated sniffs -->
 	<arg value="s"/>
 
diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_0_small.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_0_small.png
rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_0_small.png
diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_1_medium.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_1_medium.png
rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_1_medium.png
diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_2_large.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_2_large.png
rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_2_large.png
diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_0_small.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_0_small.png
rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_0_small.png
diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_1_medium.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_1_medium.png
rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_1_medium.png
diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_2_large.png
similarity index 100%
rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_2_large.png
rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_2_large.png
diff --git a/tests/phpunit/integration/Core/Conversion_Tracking/Conversion_TrackingTest.php b/tests/phpunit/integration/Core/Conversion_Tracking/Conversion_TrackingTest.php
index 95fbcbf6dae..b3106454d0a 100644
--- a/tests/phpunit/integration/Core/Conversion_Tracking/Conversion_TrackingTest.php
+++ b/tests/phpunit/integration/Core/Conversion_Tracking/Conversion_TrackingTest.php
@@ -119,17 +119,17 @@ public function data_modules() {
 	public function test_get_active_conversion_event_providers() {
 		$active_providers = $this->conversion_tracking->get_active_providers();
 
-			$this->assertArrayHasKey(
-				FakeConversionEventProvider_Active::CONVERSION_EVENT_PROVIDER_SLUG,
-				$active_providers,
-				'Active providers should include the active fake provider.'
-			);
-
-			$this->assertArrayNotHasKey(
-				FakeConversionEventProvider::CONVERSION_EVENT_PROVIDER_SLUG,
-				$active_providers,
-				'Active providers should not include the inactive fake provider.'
-			);
+		$this->assertArrayHasKey(
+			FakeConversionEventProvider_Active::CONVERSION_EVENT_PROVIDER_SLUG,
+			$active_providers,
+			'Active providers should include the active fake provider.'
+		);
+
+		$this->assertArrayNotHasKey(
+			FakeConversionEventProvider::CONVERSION_EVENT_PROVIDER_SLUG,
+			$active_providers,
+			'Active providers should not include the inactive fake provider.'
+		);
 	}
 
 	/**
@@ -147,7 +147,7 @@ public function test_get_active_conversion_event_providers__classnames_exception
 			if ( ! $expected_exception ) {
 				$this->fail( 'No exception expected but a ' . get_class( $exception ) . ' was thrown' );
 			}
-				$this->assertEquals( $expected_exception, $exception->getMessage(), 'Provider exception message should match expected message.' );
+			$this->assertEquals( $expected_exception, $exception->getMessage(), 'Provider exception message should match expected message.' );
 		}
 	}
 
diff --git a/tests/phpunit/integration/Core/Modules/ModuleTest.php b/tests/phpunit/integration/Core/Modules/ModuleTest.php
index 329eb60db80..e03441b14d1 100644
--- a/tests/phpunit/integration/Core/Modules/ModuleTest.php
+++ b/tests/phpunit/integration/Core/Modules/ModuleTest.php
@@ -355,8 +355,8 @@ public function test_parse_string_list() {
 		$empty_values = array( array(), '', 5 );
 		foreach ( $empty_values as $empty_value ) {
 			$result = $reflected_parse_string_list_method->invoke( $module, $empty_value );
-				$this->assertTrue( is_array( $result ), 'Parser should always return an array for empty values.' );
-				$this->assertEmpty( $result, 'Parser should return empty list for empty values.' );
+			$this->assertTrue( is_array( $result ), 'Parser should always return an array for empty values.' );
+			$this->assertEmpty( $result, 'Parser should return empty list for empty values.' );
 		}
 
 		$result = $reflected_parse_string_list_method->invoke( $module, 'one,two,, , three' );
diff --git a/tests/phpunit/integration/Core/Modules/Module_RegistryTest.php b/tests/phpunit/integration/Core/Modules/Module_RegistryTest.php
index 12d302b6630..f39ed61831f 100644
--- a/tests/phpunit/integration/Core/Modules/Module_RegistryTest.php
+++ b/tests/phpunit/integration/Core/Modules/Module_RegistryTest.php
@@ -32,7 +32,7 @@ public function test_register( $classname, $expected_exception ) {
 			if ( ! $expected_exception ) {
 				$this->fail( 'No exception expected but a ' . get_class( $exception ) . ' was thrown' );
 			}
-				$this->assertEquals( $expected_exception, $exception->getMessage(), 'Invalid module registration should throw expected message.' );
+			$this->assertEquals( $expected_exception, $exception->getMessage(), 'Invalid module registration should throw expected message.' );
 		}
 	}
 
diff --git a/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php b/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php
index a69f2df352e..67a225c7097 100644
--- a/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php
+++ b/tests/phpunit/integration/Core/Modules/Module_Sharing_SettingsTest.php
@@ -88,7 +88,7 @@ public function test_get_sanitize_callback() {
 		);
 		$this->settings->set( $test_sharing_settings );
 		// Use get_option() instead of $settings->get() to test sanitization and set() in isolation.
-			$this->assertEquals( $expected, get_option( $this->get_option_name() ), 'Sharing settings sanitizer should remove invalid roles.' );
+		$this->assertEquals( $expected, get_option( $this->get_option_name() ), 'Sharing settings sanitizer should remove invalid roles.' );
 	}
 
 	public function test_get() {
@@ -333,8 +333,8 @@ public function test_merge() {
 			),
 		);
 
-			$this->assertTrue( $this->settings->merge( $test_sharing_settings ), 'Merge should accept valid partial module settings.' );
-			$this->assertEquals( $expected, $this->settings->get(), 'Merge should preserve omitted module setting fields.' );
+		$this->assertTrue( $this->settings->merge( $test_sharing_settings ), 'Merge should accept valid partial module settings.' );
+		$this->assertEquals( $expected, $this->settings->get(), 'Merge should preserve omitted module setting fields.' );
 
 		// Keeps the valid parts of partial and discards the invalid parts.
 		$test_sharing_settings = array(
@@ -363,7 +363,7 @@ public function test_merge() {
 			),
 		);
 
-			$this->assertTrue( $this->settings->merge( $test_sharing_settings ), 'Merge should accept partially valid module settings.' );
-			$this->assertEquals( $expected, $this->settings->get(), 'Merge should discard invalid fields and keep valid fields.' );
+		$this->assertTrue( $this->settings->merge( $test_sharing_settings ), 'Merge should accept partially valid module settings.' );
+		$this->assertEquals( $expected, $this->settings->get(), 'Merge should discard invalid fields and keep valid fields.' );
 	}
 }
diff --git a/tests/phpunit/integration/Core/Modules/ModulesTest.php b/tests/phpunit/integration/Core/Modules/ModulesTest.php
index 44e3b81475e..1a0f54f69b0 100644
--- a/tests/phpunit/integration/Core/Modules/ModulesTest.php
+++ b/tests/phpunit/integration/Core/Modules/ModulesTest.php
@@ -1157,10 +1157,10 @@ public function test_is_module_shareable() {
 	}
 
 	public function test_list_shared_modules__no_shared_roles() {
-			$modules = new Modules( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
+		$modules = new Modules( new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE ) );
 
-			// By default, no modules have shared roles, so list_shared_modules should return an empty array.
-			$this->assertEquals( array(), $modules->list_shared_modules(), 'Shared module list should be empty when no roles are shared.' );
+		// By default, no modules have shared roles, so list_shared_modules should return an empty array.
+		$this->assertEquals( array(), $modules->list_shared_modules(), 'Shared module list should be empty when no roles are shared.' );
 	}
 
 	public function test_list_shared_modules__single_module_has_shared_roles() {
diff --git a/tests/phpunit/integration/Core/Modules/REST_Dashboard_Sharing_ControllerTest.php b/tests/phpunit/integration/Core/Modules/REST_Dashboard_Sharing_ControllerTest.php
index 40107edd67c..ff636904c21 100644
--- a/tests/phpunit/integration/Core/Modules/REST_Dashboard_Sharing_ControllerTest.php
+++ b/tests/phpunit/integration/Core/Modules/REST_Dashboard_Sharing_ControllerTest.php
@@ -102,7 +102,7 @@ public function test_sharing_settings__requires_authenticated_admin() {
 		$response = rest_get_server()->dispatch( $request );
 		// This admin hasn't authenticated with the Site Kit proxy service yet,
 		// so they aren't allowed to modify Dashboard Sharing settings.
-			$this->assertEquals( 'rest_forbidden', $response->get_data()['code'], 'Unauthenticated admin should be forbidden from sharing settings.' );
+		$this->assertEquals( 'rest_forbidden', $response->get_data()['code'], 'Unauthenticated admin should be forbidden from sharing settings.' );
 	}
 
 	public function test_sharing_settings__create_new_settings() {
diff --git a/tests/phpunit/integration/Core/Tags/Guards/Tag_Environment_Type_GuardTest.php b/tests/phpunit/integration/Core/Tags/Guards/Tag_Environment_Type_GuardTest.php
index a0b1c5d3ba5..213fefeca04 100644
--- a/tests/phpunit/integration/Core/Tags/Guards/Tag_Environment_Type_GuardTest.php
+++ b/tests/phpunit/integration/Core/Tags/Guards/Tag_Environment_Type_GuardTest.php
@@ -10,8 +10,8 @@
 
 namespace Google\Site_Kit\Tests\Core\Tags\Guards;
 
-	use Google\Site_Kit\Core\Tags\Guards\Tag_Environment_Type_Guard;
-	use Google\Site_Kit\Tests\TestCase;
+use Google\Site_Kit\Core\Tags\Guards\Tag_Environment_Type_Guard;
+use Google\Site_Kit\Tests\TestCase;
 
 class Tag_Environment_Type_GuardTest extends TestCase {
 
diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php
index 09a074fc15c..0cd075d6215 100644
--- a/tests/phpunit/integration/Modules/Analytics_4Test.php
+++ b/tests/phpunit/integration/Modules/Analytics_4Test.php
@@ -3634,8 +3634,8 @@ public function test_tracking_opt_out_snippet( $settings, $logged_in, $is_tracki
 		// Set the current user (can be 0 for no user)
 		$role = $is_content_creator ? 'administrator' : 'subscriber';
 		$user = $logged_in ?
-			$this->factory()->user->create( array( 'role' => $role ) )
-			: 0;
+		$this->factory()->user->create( array( 'role' => $role ) )
+		: 0;
 		wp_set_current_user( $user );
 
 		$this->analytics->get_settings()->set( $settings );
@@ -4757,7 +4757,7 @@ public function test_site_kit_audiences_returned_in_debug_fields( $access_token
 			$this->assertEquals( 'New visitors, Returning visitors', $audience_field['value'], 'Audience field value should show available audiences when authenticated.' );
 			$this->assertEquals( 'New visitors, Returning visitors', $audience_field['debug'], 'Audience field debug should show available audiences when authenticated.' );
 		} else {
-					$this->assertEquals( 'None', $audience_field['value'], 'Audience field value should be None when no audiences exist.' );
+			$this->assertEquals( 'None', $audience_field['value'], 'Audience field value should be None when no audiences exist.' );
 			$this->assertEquals( 'none', $audience_field['debug'], 'Audience field debug should be none when no audiences exist.' );
 		}
 	}
diff --git a/tests/phpunit/wp-tests-config.php b/tests/phpunit/wp-tests-config.php
index 0923af83cb8..043874db361 100644
--- a/tests/phpunit/wp-tests-config.php
+++ b/tests/phpunit/wp-tests-config.php
@@ -15,13 +15,13 @@
 define( 'ABSPATH', dirname( dirname( __DIR__ ) ) . '/vendor/roots/wordpress/' );
 
 /*
- * This configuration file will be used by the copy of WordPress being tested.
- * wordpress/wp-config.php will be ignored.
- *
- * WARNING WARNING WARNING!
- * These tests will DROP ALL TABLES in the database with the prefix named below.
- * DO NOT use a production database or one that is shared with something else.
- */
+* This configuration file will be used by the copy of WordPress being tested.
+* wordpress/wp-config.php will be ignored.
+*
+* WARNING WARNING WARNING!
+* These tests will DROP ALL TABLES in the database with the prefix named below.
+* DO NOT use a production database or one that is shared with something else.
+*/
 
 /**
  * Returns an environment variable value if it exists, otherwise the default value.
@@ -42,10 +42,10 @@
 };
 
 /*
- * These database credentials refer to the `mysql` service in the Site Kit local
- * environment docker configuration. Run `npm run env:start` before running the
- * PHPUnit tests using this file.
- */
+* These database credentials refer to the `mysql` service in the Site Kit local
+* environment docker configuration. Run `npm run env:start` before running the
+* PHPUnit tests using this file.
+*/
 define( 'DB_NAME', 'wordpress_test' );
 define( 'DB_USER', $get_env( 'WORDPRESS_DB_USER', 'root' ) );
 define( 'DB_PASSWORD', $get_env( 'WORDPRESS_DB_PASSWORD', 'example' ) );
diff --git a/tests/playwright/docker/wordpress/mu-plugins/e2e-module-activation.php b/tests/playwright/docker/wordpress/mu-plugins/e2e-module-activation.php
index c3b92e81d08..391b5368c5b 100644
--- a/tests/playwright/docker/wordpress/mu-plugins/e2e-module-activation.php
+++ b/tests/playwright/docker/wordpress/mu-plugins/e2e-module-activation.php
@@ -45,8 +45,8 @@ function e2e_get_connected_modules_config() {
 
 		$slug            = sanitize_key( $entry['slug'] );
 		$config[ $slug ] = isset( $entry['settings'] ) && is_array( $entry['settings'] )
-			? $entry['settings']
-			: array();
+		? $entry['settings']
+		: array();
 	}
 
 	return $config;