diff --git a/amp.php b/amp.php
index b7fac8ea565..b7a14c3d63b 100644
--- a/amp.php
+++ b/amp.php
@@ -14,7 +14,7 @@
  */
 
 define( 'AMP__FILE__', __FILE__ );
-define( 'AMP__DIR__', dirname( __FILE__ ) );
+define( 'AMP__DIR__', __DIR__ );
 define( 'AMP__VERSION', '2.4.3-alpha' );
 
 /**
diff --git a/back-compat/templates-v0-3/style.php b/back-compat/templates-v0-3/style.php
index 4df8a87a9ee..48f716f46ba 100644
--- a/back-compat/templates-v0-3/style.php
+++ b/back-compat/templates-v0-3/style.php
@@ -75,7 +75,7 @@
 .amp-wp-content, .amp-wp-title-bar div {
 	<?php $content_max_width = absint( $this->get( 'content_max_width' ) ); ?>
 	<?php if ( $content_max_width > 0 ) : ?>
-	max-width: <?php echo sprintf( '%dpx', $content_max_width ); ?>;
+	max-width: <?php printf( '%dpx', $content_max_width ); ?>;
 	margin: 0 auto;
 	<?php endif; ?>
 }
diff --git a/bin/add-test-widgets-to-sidebar.php b/bin/add-test-widgets-to-sidebar.php
index 68580abc2ca..53c2e4c4ddc 100644
--- a/bin/add-test-widgets-to-sidebar.php
+++ b/bin/add-test-widgets-to-sidebar.php
@@ -391,7 +391,7 @@ function amp_create_widget( $widget ) {
 		$number = max( array_keys( $widgets ) );
 		$number = max( 1, $number );
 	}
-	$number++;
+	++$number;
 	$widgets[ $number ] = $settings;
 	update_option( $option_key, $widgets );
 }
diff --git a/bin/verify-version-consistency.php b/bin/verify-version-consistency.php
index 0b9a0dc0bad..de4c75dd02c 100755
--- a/bin/verify-version-consistency.php
+++ b/bin/verify-version-consistency.php
@@ -14,14 +14,14 @@
 
 $versions = [];
 
-$readme_md = file_get_contents( dirname( __FILE__ ) . '/../README.md' );
+$readme_md = file_get_contents( __DIR__ . '/../README.md' );
 if ( ! preg_match( '/\*\*Stable tag:\*\*\s+(?P<version>\S+)/i', $readme_md, $matches ) ) {
 	echo "Could not find stable tag in readme\n";
 	exit( 1 );
 }
 $versions['README.md#stable-tag'] = $matches['version'];
 
-$plugin_file = file_get_contents( dirname( __FILE__ ) . '/../amp.php' );
+$plugin_file = file_get_contents( __DIR__ . '/../amp.php' );
 if ( ! preg_match( '/\*\s*Version:\s*(?P<version>\d+\.\d+(?:.\d+)?(-\w+)?)/', $plugin_file, $matches ) ) {
 	echo "Could not find version in readme metadata\n";
 	exit( 1 );
diff --git a/docs/src/Cli/GenerateCommand.php b/docs/src/Cli/GenerateCommand.php
index ffcc26c625d..db04d868a29 100644
--- a/docs/src/Cli/GenerateCommand.php
+++ b/docs/src/Cli/GenerateCommand.php
@@ -98,7 +98,7 @@ public function __invoke( $args, $assoc_args ) {
 			foreach ( $iterator as $file ) {
 				if ( unlink( $file ) ) {
 					WP_CLI::line( "Cleaned: $file" );
-					$cleaned_count++;
+					++$cleaned_count;
 				} else {
 					WP_CLI::warning( "Failed to clean: $file" );
 				}
diff --git a/includes/admin/class-amp-admin-pointer.php b/includes/admin/class-amp-admin-pointer.php
index 6e50bcd1632..d1f29f10380 100644
--- a/includes/admin/class-amp-admin-pointer.php
+++ b/includes/admin/class-amp-admin-pointer.php
@@ -150,7 +150,7 @@ public function enqueue() {
 
 		add_action(
 			'admin_print_footer_scripts',
-			function() {
+			function () {
 				$this->print_js();
 			}
 		);
diff --git a/includes/admin/class-amp-admin-pointers.php b/includes/admin/class-amp-admin-pointers.php
index 875421dea16..fb0565dad28 100644
--- a/includes/admin/class-amp-admin-pointers.php
+++ b/includes/admin/class-amp-admin-pointers.php
@@ -69,7 +69,7 @@ private function get_pointers() {
 					'position'        => [
 						'align' => 'middle',
 					],
-					'active_callback' => static function() {
+					'active_callback' => static function () {
 						return version_compare( strtok( AMP__VERSION, '-' ), '1.1', '<' );
 					},
 				]
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 1844bb0bf06..738658d572b 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -180,7 +180,7 @@ static function () use ( $old_version ) {
 
 	add_action(
 		'rest_api_init',
-		static function() {
+		static function () {
 			$reader_themes = new ReaderThemes();
 
 			$reader_theme_controller = new AMP_Reader_Theme_REST_Controller( $reader_themes );
diff --git a/includes/class-amp-comment-walker.php b/includes/class-amp-comment-walker.php
index 0d3eb2eee39..89f6243b5e3 100644
--- a/includes/class-amp-comment-walker.php
+++ b/includes/class-amp-comment-walker.php
@@ -69,7 +69,6 @@ public function start_el( &$output, $comment, $depth = 0, $args = [], $id = 0 )
 		}
 
 		$output .= $new_tag . substr( ltrim( $new_out ), strlen( $tag ) );
-
 	}
 
 	/**
diff --git a/includes/class-amp-service-worker.php b/includes/class-amp-service-worker.php
index 624e097c1bb..6e8a8bdaa61 100644
--- a/includes/class-amp-service-worker.php
+++ b/includes/class-amp-service-worker.php
@@ -114,7 +114,7 @@ public static function add_cdn_script_caching( $service_workers ) {
 		// Add AMP scripts to runtime cache which will then get stale-while-revalidate strategy.
 		$service_workers->register(
 			'amp-cdn-runtime-caching',
-			static function() {
+			static function () {
 				$urls = AMP_Service_Worker::get_precached_script_cdn_urls();
 				if ( empty( $urls ) ) {
 					return '';
@@ -356,8 +356,8 @@ public static function handle_service_worker_iframe_install() {
 		// Die in a way that can be unit tested.
 		add_filter(
 			'wp_die_handler',
-			static function() {
-				return static function() {
+			static function () {
+				return static function () {
 					die();
 				};
 			},
diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 08fa48d5e71..3f4fe170fa4 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -335,7 +335,7 @@ public static function finish_init() {
 
 			add_filter(
 				'template_include',
-				static function() {
+				static function () {
 					return AMP__DIR__ . '/includes/templates/reader-template-loader.php';
 				},
 				PHP_INT_MAX
@@ -859,13 +859,13 @@ public static function add_hooks() {
 		// Prevent MediaElement.js scripts/styles from being enqueued.
 		add_filter(
 			'wp_video_shortcode_library',
-			static function() {
+			static function () {
 				return 'amp';
 			}
 		);
 		add_filter(
 			'wp_audio_shortcode_library',
-			static function() {
+			static function () {
 				return 'amp';
 			}
 		);
@@ -873,7 +873,7 @@ static function() {
 		// Don't show loading indicator on custom logo since it makes most sense for larger images.
 		add_filter(
 			'get_custom_logo',
-			static function( $html ) {
+			static function ( $html ) {
 				return preg_replace( '/(?<=<img\s)/', ' data-amp-noloading="" ', $html );
 			},
 			1
@@ -900,7 +900,7 @@ static function( $html ) {
 		add_filter( 'get_header_image_tag', [ __CLASS__, 'amend_header_image_with_video_header' ], PHP_INT_MAX );
 		add_action(
 			'wp_print_footer_scripts',
-			static function() {
+			static function () {
 				wp_dequeue_script( 'wp-custom-header' );
 			},
 			0
@@ -1243,14 +1243,14 @@ public static function init_admin_bar() {
 		// Emulate customize support script in PHP, to assume Customizer.
 		add_action(
 			'admin_bar_menu',
-			static function() {
+			static function () {
 				remove_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 			},
 			41
 		);
 		add_filter(
 			'body_class',
-			static function( $body_classes ) {
+			static function ( $body_classes ) {
 				return array_merge(
 					array_diff(
 						$body_classes,
@@ -1570,7 +1570,7 @@ public static function ensure_required_markup( Document $dom, $script_handles =
 							$extension_specs[ $extension_name ]['bento']['version']
 						)
 					);
-					$bento_extension_count++;
+					++$bento_extension_count;
 				}
 			}
 
@@ -2132,7 +2132,7 @@ public static function prepare_response( $response, $args = [] ) {
 
 			if ( count( $errors ) > 0 ) {
 				$error_messages = array_map(
-					static function( Optimizer\Error $error ) {
+					static function ( Optimizer\Error $error ) {
 						return ' - ' . $error->getCode() . ': ' . $error->getMessage();
 					},
 					iterator_to_array( $errors )
diff --git a/includes/embeds/class-amp-core-block-handler.php b/includes/embeds/class-amp-core-block-handler.php
index 6abfd2c821e..1622cfc12c1 100644
--- a/includes/embeds/class-amp-core-block-handler.php
+++ b/includes/embeds/class-amp-core-block-handler.php
@@ -149,7 +149,7 @@ public function filter_rendered_block( $block_content, $block ) {
 	 */
 	public function ampify_categories_block( $block_content ) {
 		static $block_id = 0;
-		$block_id++;
+		++$block_id;
 
 		$form_id = "wp-block-categories-dropdown-{$block_id}-form";
 
@@ -186,7 +186,7 @@ public function ampify_archives_block( $block_content ) {
 
 		// Eliminate use of uniqid(). Core should be using wp_unique_id() here.
 		static $block_id = 0;
-		$block_id++;
+		++$block_id;
 		$block_content = preg_replace( '/(?<="wp-block-archives-)\w+(?=")/', $block_id, $block_content );
 
 		// Replace onchange with on attribute.
@@ -339,7 +339,7 @@ public function ampify_navigation_block( $block_content, $block ) {
 			add_action( 'wp_print_footer_scripts', [ $this, 'dequeue_block_navigation_view_script' ], 0 );
 		}
 
-		$this->navigation_block_count++;
+		++$this->navigation_block_count;
 		$modal_state_property = "modal_{$this->navigation_block_count}_expanded";
 
 		// Set `aria-expanded` value of submenus whenever AMP state changes.
@@ -487,7 +487,7 @@ private function process_categories_widgets( Document $dom ) {
 				continue; // @codeCoverageIgnore
 			}
 
-			$this->category_widget_count++;
+			++$this->category_widget_count;
 			$id = sprintf( 'amp-wp-widget-categories-%d', $this->category_widget_count );
 
 			$form->setAttribute( 'id', $id );
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index d2982c3b357..01301d5d19d 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -80,4 +80,3 @@ public function filter_embed_oembed_html( $return, $url, $attr ) {
 		return $return;
 	}
 }
-
diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index 8feb238bf2a..f17fa7ae86d 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -64,4 +64,3 @@ public function filter_embed_oembed_html( $return, $url, $attr ) {
 		return $return;
 	}
 }
-
diff --git a/includes/embeds/class-amp-meetup-embed-handler.php b/includes/embeds/class-amp-meetup-embed-handler.php
index 094fb0aff11..00e989bc125 100644
--- a/includes/embeds/class-amp-meetup-embed-handler.php
+++ b/includes/embeds/class-amp-meetup-embed-handler.php
@@ -44,4 +44,3 @@ public function filter_embed_oembed_html( $cache, $url ) {
 		return $cache;
 	}
 }
-
diff --git a/includes/embeds/class-amp-playlist-embed-handler.php b/includes/embeds/class-amp-playlist-embed-handler.php
index 3bc9fc14120..4c01be5d20b 100644
--- a/includes/embeds/class-amp-playlist-embed-handler.php
+++ b/includes/embeds/class-amp-playlist-embed-handler.php
@@ -152,7 +152,7 @@ public function audio_playlist( $data ) {
 		if ( ! isset( $data['tracks'] ) ) {
 			return '';
 		}
-		self::$playlist_id++;
+		++self::$playlist_id;
 		$container_id = 'wpPlaylist' . self::$playlist_id . 'Carousel';
 		$state_id     = 'wpPlaylist' . self::$playlist_id;
 		$amp_state    = [
@@ -207,7 +207,7 @@ public function video_playlist( $data ) {
 		if ( ! isset( $data['tracks'][0]['src'] ) ) {
 			return '';
 		}
-		self::$playlist_id++;
+		++self::$playlist_id;
 		$state_id  = 'wpPlaylist' . self::$playlist_id;
 		$amp_state = [
 			'selectedIndex' => 0,
diff --git a/includes/embeds/class-amp-reddit-embed-handler.php b/includes/embeds/class-amp-reddit-embed-handler.php
index 922dd158c65..35026d72159 100644
--- a/includes/embeds/class-amp-reddit-embed-handler.php
+++ b/includes/embeds/class-amp-reddit-embed-handler.php
@@ -74,4 +74,3 @@ public function render( $args ) {
 		);
 	}
 }
-
diff --git a/includes/sanitizers/class-amp-bento-sanitizer.php b/includes/sanitizers/class-amp-bento-sanitizer.php
index b1fec7a2810..01e020731e5 100644
--- a/includes/sanitizers/class-amp-bento-sanitizer.php
+++ b/includes/sanitizers/class-amp-bento-sanitizer.php
@@ -176,7 +176,7 @@ public function sanitize() {
 				$script->parentNode->removeChild( $script );
 			} else {
 				ValidationExemption::mark_node_as_px_verified( $script );
-				$non_amp_scripts_retained++;
+				++$non_amp_scripts_retained;
 			}
 		}
 
diff --git a/includes/sanitizers/class-amp-block-uniqid-sanitizer.php b/includes/sanitizers/class-amp-block-uniqid-sanitizer.php
index 9ce4692fbff..2b14fc2231f 100644
--- a/includes/sanitizers/class-amp-block-uniqid-sanitizer.php
+++ b/includes/sanitizers/class-amp-block-uniqid-sanitizer.php
@@ -88,7 +88,7 @@ static function ( $class_name_prefix ) {
 		$replaced_count = 0;
 		foreach ( $elements as $element ) {
 			if ( $this->transform_element_with_class_attribute( $element ) ) {
-				$replaced_count++;
+				++$replaced_count;
 			}
 		}
 
diff --git a/includes/sanitizers/class-amp-core-theme-sanitizer.php b/includes/sanitizers/class-amp-core-theme-sanitizer.php
index 38164056d5f..8a3341bd142 100644
--- a/includes/sanitizers/class-amp-core-theme-sanitizer.php
+++ b/includes/sanitizers/class-amp-core-theme-sanitizer.php
@@ -585,7 +585,7 @@ public static function add_twentyseventeen_attachment_image_attributes( $args =
 		 */
 		add_filter(
 			'get_custom_logo',
-			static function( $html ) {
+			static function ( $html ) {
 				$src = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' );
 				if ( ! $src ) {
 					return $html;
@@ -659,7 +659,7 @@ public function prevent_sanitize_in_customizer_preview( $xpaths = [] ) {
 	public static function dequeue_scripts( $handles = [] ) {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() use ( $handles ) {
+			static function () use ( $handles ) {
 				foreach ( $handles as $handle ) {
 					wp_dequeue_script( $handle );
 				}
@@ -798,7 +798,7 @@ public static function add_has_header_video_body_class( $args = [] ) {
 
 		add_filter(
 			'body_class',
-			static function( $body_classes ) use ( $args ) {
+			static function ( $body_classes ) use ( $args ) {
 				if ( has_header_video() ) {
 					$body_classes[] = $args['class_name'];
 				}
@@ -832,7 +832,7 @@ public static function add_twentytwenty_masthead_styles( $args = [] ) {
 		// @todo This was introduced in <https://github.com/ampproject/amp-wp/commit/e1c7462> but it doesn't seem to have any effect.
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				ob_start();
 				?>
 				<style>
@@ -868,7 +868,7 @@ public static function add_twentytwenty_custom_logo_fix( $args = [] ) {
 		$method = __METHOD__;
 		add_filter(
 			'get_custom_logo',
-			static function( $html ) use ( $method ) {
+			static function ( $html ) use ( $method ) {
 				// Pattern sourced from AMP_Base_Embed_Handler::match_element_attributes().
 				$pattern = sprintf(
 					'/<img%s/',
@@ -936,7 +936,7 @@ public static function add_img_display_block_fix( $args = [] ) {
 		// that any subsequent style rules for images will continue to override.
 		add_action(
 			'wp_print_styles',
-			static function() use ( $method ) {
+			static function () use ( $method ) {
 				printf(
 					'<style data-src="%s">%s</style>',
 					esc_attr( $method ),
@@ -957,7 +957,7 @@ static function() use ( $method ) {
 	public static function add_twentyseventeen_masthead_styles() {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				$is_front_page_layout = ( is_front_page() && 'posts' !== get_option( 'show_on_front' ) ) || ( is_home() && is_front_page() );
 				ob_start();
 				?>
@@ -1124,7 +1124,7 @@ public function add_twentyseventeen_sticky_nav_menu() {
 	public static function add_nav_menu_styles( $args = [] ) {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() use ( $args ) {
+			static function () use ( $args ) {
 				ob_start();
 				?>
 				<style>
@@ -1441,7 +1441,7 @@ public static function adjust_twentynineteen_images() {
 		// Make sure the featured image gets responsive layout.
 		add_filter(
 			'wp_get_attachment_image_attributes',
-			static function( $attributes ) {
+			static function ( $attributes ) {
 				if ( preg_match( '/(^|\s)(attachment-post-thumbnail)(\s|$)/', $attributes['class'] ) ) {
 					$attributes['data-amp-layout'] = 'responsive';
 				}
@@ -1458,7 +1458,7 @@ static function( $attributes ) {
 	public static function add_twentyfourteen_masthead_styles() {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				ob_start();
 				?>
 				<style>
@@ -1841,7 +1841,7 @@ public function wrap_modal_in_lightbox( $args = [] ) {
 
 			$modal_content_node = $modal_content_node->removeChild( $children[0] );
 
-			$strip_wrapper_levels--;
+			--$strip_wrapper_levels;
 		}
 
 		$amp_lightbox->appendChild( $modal_content_node );
@@ -2030,7 +2030,7 @@ public function add_twentytwenty_toggles() {
 	public static function amend_twentytwentyone_dark_mode_styles() {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				$theme_style_handle     = 'twenty-twenty-one-style';
 				$dark_mode_style_handle = 'tt1-dark-mode';
 
@@ -2070,7 +2070,7 @@ static function() {
 	public static function amend_twentytwentyone_styles() {
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				$style_handle = 'twenty-twenty-one-style';
 
 				// Bail if the stylesheet is not enqueued.
diff --git a/includes/sanitizers/class-amp-nav-menu-dropdown-sanitizer.php b/includes/sanitizers/class-amp-nav-menu-dropdown-sanitizer.php
index ba4b6264c91..8f811fad09e 100644
--- a/includes/sanitizers/class-amp-nav-menu-dropdown-sanitizer.php
+++ b/includes/sanitizers/class-amp-nav-menu-dropdown-sanitizer.php
@@ -69,7 +69,7 @@ public static function add_buffering_hooks( $args = [] ) {
 		 */
 		add_filter(
 			'walker_nav_menu_start_el',
-			static function( $item_output, $item, $depth, $nav_menu_args ) use ( $args ) {
+			static function ( $item_output, $item, $depth, $nav_menu_args ) use ( $args ) {
 				// Skip adding buttons to nav menu widgets for now.
 				if ( empty( $nav_menu_args->theme_location ) ) {
 					return $item_output;
diff --git a/includes/sanitizers/class-amp-o2-player-sanitizer.php b/includes/sanitizers/class-amp-o2-player-sanitizer.php
index 8ec0c4a8a34..ed1c17dc3ba 100644
--- a/includes/sanitizers/class-amp-o2-player-sanitizer.php
+++ b/includes/sanitizers/class-amp-o2-player-sanitizer.php
@@ -81,7 +81,6 @@ public function sanitize() {
 				$this->create_amp_o2_player( $this->dom, $node );
 			}
 		}
-
 	}
 
 	/**
diff --git a/includes/sanitizers/class-amp-playbuzz-sanitizer.php b/includes/sanitizers/class-amp-playbuzz-sanitizer.php
index 72d0202f808..6b32c6dc553 100644
--- a/includes/sanitizers/class-amp-playbuzz-sanitizer.php
+++ b/includes/sanitizers/class-amp-playbuzz-sanitizer.php
@@ -95,7 +95,6 @@ public function sanitize() {
 			$this->did_convert_elements = true;
 
 		}
-
 	}
 
 	/**
diff --git a/includes/sanitizers/class-amp-script-sanitizer.php b/includes/sanitizers/class-amp-script-sanitizer.php
index b153129930f..bf342c61071 100644
--- a/includes/sanitizers/class-amp-script-sanitizer.php
+++ b/includes/sanitizers/class-amp-script-sanitizer.php
@@ -243,7 +243,7 @@ protected function sanitize_js_script_elements() {
 			}
 
 			if ( ValidationExemption::is_px_verified_for_node( $script ) ) {
-				$this->px_verified_kept_node_count++;
+				++$this->px_verified_kept_node_count;
 				// @todo Consider forcing any PX-verified script to have async/defer if not module. For inline scripts, hack via data: URL?
 				continue;
 			}
@@ -265,7 +265,7 @@ protected function sanitize_js_script_elements() {
 					[ 'code' => self::CUSTOM_EXTERNAL_SCRIPT ]
 				);
 				if ( ! $removed ) {
-					$this->kept_script_count++;
+					++$this->kept_script_count;
 				}
 			} else {
 				// Skip inline scripts used by AMP.
@@ -292,7 +292,7 @@ protected function sanitize_js_script_elements() {
 					[ 'code' => self::CUSTOM_INLINE_SCRIPT ]
 				);
 				if ( ! $removed ) {
-					$this->kept_script_count++;
+					++$this->kept_script_count;
 				}
 			}
 		}
@@ -330,7 +330,7 @@ protected function sanitize_js_script_elements() {
 
 			// Since the attribute has been PX-verified, move along.
 			if ( ValidationExemption::is_px_verified_for_node( $event_handler_attribute ) ) {
-				$this->px_verified_kept_node_count++;
+				++$this->px_verified_kept_node_count;
 				continue;
 			}
 
@@ -340,7 +340,7 @@ protected function sanitize_js_script_elements() {
 				[ 'code' => self::CUSTOM_EVENT_HANDLER_ATTR ]
 			);
 			if ( ! $removed ) {
-				$this->kept_script_count++;
+				++$this->kept_script_count;
 			}
 		}
 
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 2f5f0850cab..e5585ae0ef0 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -489,7 +489,7 @@ public function get_stylesheets() {
 		return wp_list_pluck(
 			array_filter(
 				$this->pending_stylesheets,
-				static function( $pending_stylesheet ) {
+				static function ( $pending_stylesheet ) {
 					return $pending_stylesheet['included'] && self::STYLE_AMP_CUSTOM_GROUP_INDEX === $pending_stylesheet['group'];
 				}
 			),
@@ -1088,7 +1088,7 @@ private function get_stylesheet_priority( DOMNode $node ) {
 		$print_priority_base = 100;
 		$admin_bar_priority  = 200;
 
-		$remove_url_scheme = static function( $url ) {
+		$remove_url_scheme = static function ( $url ) {
 			return preg_replace( '/^https?:/', '', $url );
 		};
 
@@ -1313,7 +1313,7 @@ public function get_validated_url_file_path( $url, $allowed_extensions = [] ) {
 		}
 		$parsed_url['path'] = $path;
 
-		$remove_url_scheme = static function( $schemed_url ) {
+		$remove_url_scheme = static function ( $schemed_url ) {
 			return preg_replace( '#^\w+:(?=//)#', '', $schemed_url );
 		};
 
@@ -1732,7 +1732,7 @@ private function get_parsed_stylesheet( $stylesheet, $options = [] ) {
 		$parsed['kept_error_count'] = 0;
 		foreach ( $parsed['validation_results'] as $validation_result ) {
 			if ( ! $validation_result['sanitized'] ) {
-				$parsed['kept_error_count']++;
+				++$parsed['kept_error_count'];
 			}
 		}
 
@@ -2075,7 +2075,7 @@ private function parse_stylesheet( $stylesheet_string, $options = [] ) {
 				$dynamic_selector_pattern = implode(
 					'|',
 					array_map(
-						static function( $selector ) {
+						static function ( $selector ) {
 							return preg_quote( $selector, '#' );
 						},
 						$this->args['dynamic_element_selectors']
@@ -2131,7 +2131,7 @@ static function( $selector ) {
 						 */
 						$reduced_selector = preg_replace_callback(
 							'/\[([A-Za-z0-9_:-]+)(\W?=[^\]]+)?\]/',
-							static function( $matches ) use ( $selector, &$selectors_parsed ) {
+							static function ( $matches ) use ( $selector, &$selectors_parsed ) {
 								$selectors_parsed[ $selector ][ self::SELECTOR_EXTRACTED_ATTRIBUTES ][] = $matches[1];
 								return '';
 							},
@@ -2141,7 +2141,7 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) {
 						// Extract class names.
 						$reduced_selector = preg_replace_callback(
 							'/\.((?:[a-zA-Z0-9_-]+|\\\\.)+)/', // The `\\\\.` will allow any char via escaping, like the colon in `.lg\:w-full`.
-							static function( $matches ) use ( $selector, &$selectors_parsed ) {
+							static function ( $matches ) use ( $selector, &$selectors_parsed ) {
 								$selectors_parsed[ $selector ][ self::SELECTOR_EXTRACTED_CLASSES ][] = stripslashes( $matches[1] );
 								return '';
 							},
@@ -2151,7 +2151,7 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) {
 						// Extract IDs.
 						$reduced_selector = preg_replace_callback(
 							'/#([a-zA-Z0-9_-]+)/',
-							static function( $matches ) use ( $selector, &$selectors_parsed ) {
+							static function ( $matches ) use ( $selector, &$selectors_parsed ) {
 								$selectors_parsed[ $selector ][ self::SELECTOR_EXTRACTED_IDS ][] = $matches[1];
 								return '';
 							},
@@ -2161,7 +2161,7 @@ static function( $matches ) use ( $selector, &$selectors_parsed ) {
 						// Extract tag names.
 						$reduced_selector = preg_replace_callback(
 							'/[a-zA-Z0-9_-]+/',
-							static function( $matches ) use ( $selector, &$selectors_parsed ) {
+							static function ( $matches ) use ( $selector, &$selectors_parsed ) {
 								$selectors_parsed[ $selector ][ self::SELECTOR_EXTRACTED_TAGS ][] = $matches[0];
 								return '';
 							},
@@ -2254,7 +2254,7 @@ private function remove_spaces_from_url_values( $css ) {
 		return preg_replace_callback(
 			// Match CSS url() values that don't have quoted string values.
 			'/\burl\(\s*(?=\w)(?P<url>[^}]*?\s*)\)/',
-			static function( $matches ) {
+			static function ( $matches ) {
 				return preg_replace( '/\s+/', '', $matches[0] );
 			},
 			$css
@@ -2884,7 +2884,7 @@ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_
 				continue;
 			}
 			if ( ! $this->args['transform_important_qualifiers'] ) {
-				$important_count++;
+				++$important_count;
 			} elseif ( $allow_transformation ) {
 				$importants[] = $property;
 				$property->setIsImportant( false );
@@ -2901,7 +2901,7 @@ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_
 				if ( $sanitized ) {
 					$property->setIsImportant( false );
 				} else {
-					$important_count++;
+					++$important_count;
 				}
 				$validation_results[] = compact( 'error', 'sanitized' );
 			}
@@ -2926,7 +2926,7 @@ private function transform_important_qualifiers( RuleSet $ruleset, CSSList $css_
 				 * @param Selector $old_selector Original selector.
 				 * @return Selector The new more-specific selector.
 				 */
-				static function( Selector $old_selector ) {
+				static function ( Selector $old_selector ) {
 					// Calculate the specificity multiplier for the placeholder.
 					$specificity_multiplier = AMP_Style_Sanitizer::INLINE_SPECIFICITY_MULTIPLIER + 1 + floor( $old_selector->getSpecificity() / 100 );
 					if ( $old_selector->getSpecificity() % 100 > 0 ) {
@@ -3167,7 +3167,7 @@ private function finalize_styles() {
 				wp_list_pluck(
 					array_filter(
 						$this->pending_stylesheets,
-						static function( $pending_stylesheet ) {
+						static function ( $pending_stylesheet ) {
 							return $pending_stylesheet['included'] && self::STYLE_AMP_KEYFRAMES_GROUP_INDEX === $pending_stylesheet['group'];
 						}
 					),
@@ -3619,7 +3619,7 @@ private function finalize_stylesheet_group( $group, $group_config ) {
 							0 === count(
 								array_filter(
 									$parsed_selector[ self::SELECTOR_EXTRACTED_IDS ],
-									function( $id ) {
+									function ( $id ) {
 										return ! $this->dom->getElementById( $id );
 									}
 								)
@@ -3642,7 +3642,7 @@ function( $id ) {
 					);
 					$selectors[ $selector ] = $should_include;
 					if ( $should_include ) {
-						$used_selector_count++;
+						++$used_selector_count;
 					}
 				}
 				$shaken_tokens[] = [
@@ -3689,9 +3689,9 @@ function( $id ) {
 						}
 
 						if ( $is_at_rule && '{' === substr( $shaken_tokens[ $j ][1], -1 ) ) {
-							$open_braces++;
+							++$open_braces;
 						} elseif ( '}' === $shaken_tokens[ $j ][1] ) {
-							$open_braces--;
+							--$open_braces;
 						} else {
 							break;
 						}
@@ -3731,7 +3731,7 @@ static function ( $shaken_token ) {
 					// Include the stylesheet parts that were not marked for exclusion during tree shaking.
 					array_filter(
 						$pending_stylesheet['shaken_tokens'],
-						static function( $shaken_token ) {
+						static function ( $shaken_token ) {
 							return false !== $shaken_token[0];
 						}
 					)
@@ -3802,7 +3802,7 @@ function ( $a, $b ) {
 
 			if ( ! isset( $this->pending_stylesheets[ $i ]['included'] ) ) {
 				$this->pending_stylesheets[ $i ]['included'] = true;
-				$included_count++;
+				++$included_count;
 				$concatenated_size += $this->pending_stylesheets[ $i ]['final_size'];
 				$preload_font_urls  = array_merge( $preload_font_urls, $this->pending_stylesheets[ $i ]['preload_font_urls'] );
 
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
index aac823f191a..0468d4eb41d 100644
--- a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
+++ b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -290,7 +290,7 @@ private function sanitize_element( DOMElement $element ) {
 		if ( ! isset( $this->open_elements[ $element->nodeName ] ) ) {
 			$this->open_elements[ $element->nodeName ] = 0;
 		}
-		$this->open_elements[ $element->nodeName ]++;
+		++$this->open_elements[ $element->nodeName ];
 
 		$script_components = [];
 
@@ -333,7 +333,7 @@ private function sanitize_element( DOMElement $element ) {
 			}
 		}
 
-		$this->open_elements[ $element->nodeName ]--;
+		--$this->open_elements[ $element->nodeName ];
 
 		if ( $was_removed ) {
 			return null;
@@ -1144,7 +1144,7 @@ private function validate_attr_spec_list_for_node( DOMElement $node, $attr_spec_
 
 			// If a mandatory attribute is required, and attribute exists, pass.
 			if ( isset( $attr_spec_rule[ AMP_Rule_Spec::MANDATORY ] ) ) {
-				$mandatory_count++;
+				++$mandatory_count;
 
 				$result = $this->check_attr_spec_rule_mandatory( $node, $attr_name, $attr_spec_rule );
 				if ( AMP_Rule_Spec::PASS === $result ) {
@@ -2667,7 +2667,6 @@ private function replace_node_with_children( DOMElement $node ) {
 
 		$node->parentNode->replaceChild( $fragment, $node );
 		return true;
-
 	}
 
 	/**
diff --git a/includes/utils/class-amp-dom-utils.php b/includes/utils/class-amp-dom-utils.php
index 49f9dc0bdf9..020d755ec3a 100644
--- a/includes/utils/class-amp-dom-utils.php
+++ b/includes/utils/class-amp-dom-utils.php
@@ -266,11 +266,10 @@ public static function recursive_force_closing_tags( $dom, $node = null ) {
 		}
 
 		$num_children = $node->childNodes->length;
-		for ( $i = $num_children - 1; $i >= 0; $i -- ) {
+		for ( $i = $num_children - 1; $i >= 0; $i-- ) {
 			$child = $node->childNodes->item( $i );
 			self::recursive_force_closing_tags( $dom, $child );
 		}
-
 	}
 
 	/**
diff --git a/includes/validation/class-amp-validated-url-post-type.php b/includes/validation/class-amp-validated-url-post-type.php
index bfb87fedd06..70b6fa90d40 100644
--- a/includes/validation/class-amp-validated-url-post-type.php
+++ b/includes/validation/class-amp-validated-url-post-type.php
@@ -280,19 +280,19 @@ public static function add_admin_hooks() {
 		// Post list screen hooks.
 		add_filter(
 			'view_mode_post_types',
-			static function( $post_types ) {
+			static function ( $post_types ) {
 				return array_diff( $post_types, [ AMP_Validated_URL_Post_Type::POST_TYPE_SLUG ] );
 			}
 		);
 		add_action(
 			'load-edit.php',
-			static function() {
+			static function () {
 				if ( 'edit-' . AMP_Validated_URL_Post_Type::POST_TYPE_SLUG !== get_current_screen()->id ) {
 					return;
 				}
 				add_action(
 					'admin_head-edit.php',
-					static function() {
+					static function () {
 						global $mode;
 						$mode = 'list'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 					}
@@ -904,7 +904,7 @@ public static function store_validation_errors( $validation_errors, $url, $args
 		$placeholder  = 'amp_validated_url_content_placeholder' . wp_rand();
 
 		// Guard against Kses from corrupting content by adding post_content after content_save_pre filter applies.
-		$insert_post_content = static function( $post_data ) use ( $placeholder, $post_content ) {
+		$insert_post_content = static function ( $post_data ) use ( $placeholder, $post_content ) {
 			$should_supply_post_content = (
 				isset( $post_data['post_content'], $post_data['post_type'] )
 				&&
@@ -996,7 +996,7 @@ public static function delete_stylesheets_postmeta_batch( $count, $before ) {
 		);
 		foreach ( $query->get_posts() as $post_id ) {
 			if ( delete_post_meta( $post_id, self::STYLESHEETS_POST_META_KEY ) ) {
-				$deleted++;
+				++$deleted;
 			}
 		}
 		return $deleted;
@@ -1043,7 +1043,7 @@ public static function garbage_collect_validated_urls( $count = 100, $before = '
 			}
 
 			if ( wp_delete_post( $post->ID ) ) {
-				$deleted++;
+				++$deleted;
 			}
 		}
 
@@ -1448,7 +1448,7 @@ public static function output_custom_column( $column_name, $post_id ) {
 				}
 				if ( ! empty( $items ) ) {
 					$imploded_items = implode( ',</div><div>', $items );
-					echo sprintf( '<div>%s</div>', $imploded_items ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					printf( '<div>%s</div>', $imploded_items ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 				} else {
 					esc_html_e( '--', 'amp' );
 				}
@@ -1691,7 +1691,7 @@ public static function handle_bulk_action( $redirect, $action, $items ) {
 			$unaccepted_error_count = count(
 				array_filter(
 					$validation_errors,
-					static function( $error ) {
+					static function ( $error ) {
 						return ! AMP_Validation_Error_Taxonomy::is_validation_error_sanitized( $error );
 					}
 				)
@@ -2084,7 +2084,7 @@ public static function handle_validation_error_status_update() {
 				: $term_group & ~ AMP_Validation_Error_Taxonomy::ACKNOWLEDGED_VALIDATION_ERROR_BIT_MASK;
 
 			if ( $term_group !== $term->term_group ) {
-				$updated_count++;
+				++$updated_count;
 				wp_update_term( $term->term_id, AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG, compact( 'term_group' ) );
 			}
 		}
@@ -2104,7 +2104,7 @@ public static function handle_validation_error_status_update() {
 				$args[ self::REMAINING_ERRORS ] = count(
 					array_filter(
 						$validation_results,
-						static function( $result ) {
+						static function ( $result ) {
 							return ! $result['sanitized'];
 						}
 					)
@@ -2494,7 +2494,7 @@ static function ( $a, $b ) use ( $stylesheets ) {
 			} else {
 				$excluded_final_size    += $stylesheets[ $i ]['final_size'];
 				$excluded_original_size += $stylesheets[ $i ]['original_size'];
-				$excluded_stylesheets++;
+				++$excluded_stylesheets;
 				$stylesheets[ $i ]['status'] = $excluded_status;
 			}
 		}
@@ -2775,9 +2775,9 @@ static function ( $a, $b ) use ( $stylesheets ) {
 								$del_count   = 0;
 								foreach ( $stylesheet['shaken_tokens'] as $shaken_token ) {
 									if ( $shaken_token[0] ) {
-										$ins_count++;
+										++$ins_count;
 									} else {
-										$del_count++;
+										++$del_count;
 									}
 
 									if ( is_array( $shaken_token[1] ) ) {
@@ -2880,7 +2880,7 @@ static function ( $a, $b ) use ( $stylesheets ) {
 						</dl>
 					</td>
 				</tr>
-				<?php $row++; ?>
+				<?php ++$row; ?>
 			<?php endforeach; ?>
 			</tbody>
 		</table>
@@ -2919,7 +2919,7 @@ public static function render_single_url_list_table( $post ) {
 		 *
 		 * @return WP_Term[]
 		 */
-		$override_terms_in_occurrence_order = static function() use ( $post ) {
+		$override_terms_in_occurrence_order = static function () use ( $post ) {
 			return wp_list_pluck( AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $post ), 'term' );
 		};
 
@@ -3302,16 +3302,16 @@ protected static function count_invalid_url_validation_errors( $validation_error
 		foreach ( $validation_errors as $error ) {
 			switch ( $error['term']->term_group ) {
 				case AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_REJECTED_STATUS:
-					$counts['new_rejected']++;
+					++$counts['new_rejected'];
 					break;
 				case AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_NEW_ACCEPTED_STATUS:
-					$counts['new_accepted']++;
+					++$counts['new_accepted'];
 					break;
 				case AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_ACCEPTED_STATUS:
-					$counts['ack_accepted']++;
+					++$counts['ack_accepted'];
 					break;
 				case AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_REJECTED_STATUS:
-					$counts['ack_rejected']++;
+					++$counts['ack_rejected'];
 					break;
 			}
 		}
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index f4fa98adfcf..955256590bc 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -346,7 +346,7 @@ public static function delete_empty_terms() {
 		$deleted_count = 0;
 		foreach ( $empty_term_ids as $term_id ) {
 			if ( true === self::delete_empty_term( $term_id ) ) {
-				$deleted_count++;
+				++$deleted_count;
 			}
 		}
 		return $deleted_count;
@@ -548,7 +548,7 @@ public static function accept_validation_errors( $acceptable_errors ) {
 		}
 		add_filter(
 			'amp_validation_error_sanitized',
-			static function( $sanitized, $error ) use ( $acceptable_errors ) {
+			static function ( $sanitized, $error ) use ( $acceptable_errors ) {
 				if ( true === $acceptable_errors ) {
 					return true;
 				}
@@ -627,7 +627,7 @@ public static function get_validation_error_count( $args = [] ) {
 			$groups = self::sanitize_term_status( $args['group'], [ 'multiple' => true ] );
 		}
 
-		$filter = static function( $clauses ) use ( $groups ) {
+		$filter = static function ( $clauses ) use ( $groups ) {
 			$clauses['where'] .= ' AND t.term_group ' . AMP_Validation_Error_Taxonomy::prepare_term_group_in_sql( $groups );
 			return $clauses;
 		};
@@ -832,7 +832,7 @@ public static function add_admin_hooks() {
 		// Prevent query vars from persisting after redirect.
 		add_filter(
 			'removable_query_args',
-			static function( $query_vars ) {
+			static function ( $query_vars ) {
 				$query_vars[] = 'amp_actioned';
 				$query_vars[] = 'amp_actioned_count';
 				$query_vars[] = 'amp_validation_errors_not_deleted';
@@ -844,7 +844,7 @@ static function( $query_vars ) {
 		// Add recognition of amp_validation_error_status and type query vars (which will only apply in admin since post type is not publicly_queryable).
 		add_filter(
 			'query_vars',
-			static function( $query_vars ) {
+			static function ( $query_vars ) {
 				$query_vars[] = AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_STATUS_QUERY_VAR;
 				$query_vars[] = AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_TYPE_QUERY_VAR;
 				return $query_vars;
@@ -854,7 +854,7 @@ static function( $query_vars ) {
 		// Default ordering terms by ID descending so that new terms appear at the top.
 		add_filter(
 			'get_terms_defaults',
-			static function( $args, $taxonomies ) {
+			static function ( $args, $taxonomies ) {
 				if ( [ AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG ] === $taxonomies ) {
 					$args['orderby'] = 'term_id';
 					$args['order']   = 'DESC';
@@ -871,7 +871,7 @@ static function( $args, $taxonomies ) {
 		// Override the columns displayed for the validation error terms.
 		add_filter(
 			'manage_edit-' . self::TAXONOMY_SLUG . '_columns',
-			static function() {
+			static function () {
 				return [
 					'error_code'       => esc_html__( 'Error', 'amp' ),
 					'status'           => sprintf(
@@ -906,7 +906,7 @@ static function() {
 		// Let the created date column sort by term ID.
 		add_filter(
 			'manage_edit-' . self::TAXONOMY_SLUG . '_sortable_columns',
-			static function( $sortable_columns ) {
+			static function ( $sortable_columns ) {
 				$sortable_columns['created_date_gmt'] = 'term_id';
 				$sortable_columns['error_type']       = AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_TYPE_QUERY_VAR;
 				$sortable_columns['error_code']       = AMP_Validation_Error_Taxonomy::VALIDATION_DETAILS_ERROR_CODE_QUERY_VAR;
@@ -917,7 +917,7 @@ static function( $sortable_columns ) {
 		// Hide empty term addition form.
 		add_action(
 			'admin_enqueue_scripts',
-			static function() {
+			static function () {
 				$current_screen = get_current_screen();
 				if ( ! $current_screen ) {
 					return;
@@ -1023,7 +1023,7 @@ static function ( $parent_file ) {
 		// Replace the primary column to be error instead of the removed name column..
 		add_filter(
 			'list_table_primary_column',
-			static function( $primary_column ) {
+			static function ( $primary_column ) {
 				if ( get_current_screen() && AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG === get_current_screen()->taxonomy ) {
 					$primary_column = 'error_code';
 				}
@@ -1139,7 +1139,7 @@ public static function add_group_terms_clauses_filter() {
 		}
 		add_filter(
 			'terms_clauses',
-			static function( $clauses, $taxonomies ) use ( $groups ) {
+			static function ( $clauses, $taxonomies ) use ( $groups ) {
 				if ( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG === $taxonomies[0] && AMP_Validation_Error_Taxonomy::$should_filter_terms_clauses_for_error_validation_status ) {
 					$clauses['where'] .= ' AND t.term_group ' . AMP_Validation_Error_Taxonomy::prepare_term_group_in_sql( $groups );
 				}
@@ -1170,7 +1170,7 @@ public static function add_error_type_clauses_filter() {
 
 		add_filter(
 			'terms_clauses',
-			static function( $clauses, $taxonomies ) use ( $type ) {
+			static function ( $clauses, $taxonomies ) use ( $type ) {
 				global $wpdb;
 				if ( AMP_Validation_Error_Taxonomy::TAXONOMY_SLUG === $taxonomies[0] ) {
 					$clauses['where'] .= $wpdb->prepare( ' AND tt.description LIKE %s', '%"type":"' . $wpdb->esc_like( $type ) . '"%' );
@@ -1204,7 +1204,7 @@ public static function add_order_clauses_from_description_json() {
 
 		add_filter(
 			'terms_clauses',
-			static function( $clauses ) {
+			static function ( $clauses ) {
 				global $wpdb;
 
 				if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
@@ -1732,7 +1732,7 @@ public static function filter_tag_row_actions( $actions, WP_Term $tag ) {
 
 		$actions = wp_array_slice_assoc( $actions, [ 'details', 'delete', 'copy' ] );
 
-		self::$current_validation_error_row_index++;
+		++self::$current_validation_error_row_index;
 
 		return $actions;
 	}
@@ -2038,7 +2038,7 @@ public static function filter_manage_custom_columns( $content, $column_name, $te
 				$validation_errors = AMP_Validated_URL_Post_Type::get_invalid_url_validation_errors( $url_post_id );
 				$validation_errors = array_filter(
 					$validation_errors,
-					static function( $error ) use ( $term ) {
+					static function ( $error ) use ( $term ) {
 						return $error['term']->term_id === $term->term_id;
 					}
 				);
@@ -2919,7 +2919,7 @@ public static function handle_validation_error_update( $redirect_to, $action, $t
 		$updated_count = 0;
 		foreach ( $term_ids as $term_id ) {
 			if ( self::delete_empty_term( $term_id ) ) {
-				$updated_count++;
+				++$updated_count;
 			}
 		}
 
diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
index f0c61aeef85..cdab256b119 100644
--- a/includes/validation/class-amp-validation-manager.php
+++ b/includes/validation/class-amp-validation-manager.php
@@ -1288,7 +1288,7 @@ protected static function handle_block_source_comment_replacement( $matches ) {
 
 		if ( empty( $matches['closing'] ) ) {
 			$source['block_content_index'] = self::$block_content_index;
-			self::$block_content_index++;
+			++self::$block_content_index;
 		}
 
 		// Make implicit core namespace explicit.
@@ -2006,12 +2006,12 @@ public static function finalize_validation( Document $dom ) {
 		foreach ( self::$validation_results as $validation_result ) {
 			$sanitization = AMP_Validation_Error_Taxonomy::get_validation_error_sanitization( $validation_result['error'] );
 			if ( ! ( (int) $sanitization['status'] & AMP_Validation_Error_Taxonomy::ACCEPTED_VALIDATION_ERROR_BIT_MASK ) ) {
-				$kept_count++;
+				++$kept_count;
 			}
 			if ( ! ( (int) $sanitization['status'] & AMP_Validation_Error_Taxonomy::ACKNOWLEDGED_VALIDATION_ERROR_BIT_MASK ) ) {
-				$unreviewed_count++;
+				++$unreviewed_count;
 			}
-			$total_count++;
+			++$total_count;
 		}
 
 		/*
diff --git a/src/Admin/ReaderThemes.php b/src/Admin/ReaderThemes.php
index a2c08ba54dd..1751dc1e100 100644
--- a/src/Admin/ReaderThemes.php
+++ b/src/Admin/ReaderThemes.php
@@ -144,7 +144,7 @@ public function get_themes() {
 
 		$themes = array_filter(
 			$themes,
-			static function( $theme ) {
+			static function ( $theme ) {
 				return is_array( $theme ) && ! empty( $theme['slug'] );
 			}
 		);
diff --git a/src/Admin/ReenableCssTransientCachingAjaxAction.php b/src/Admin/ReenableCssTransientCachingAjaxAction.php
index da79bb4bddf..27a66193046 100644
--- a/src/Admin/ReenableCssTransientCachingAjaxAction.php
+++ b/src/Admin/ReenableCssTransientCachingAjaxAction.php
@@ -46,7 +46,7 @@ final class ReenableCssTransientCachingAjaxAction implements Service, Registerab
 	 * Register the AJAX action with the WordPress system.
 	 */
 	public function register() {
-		add_action( static::BACKEND_ENQUEUE_ACTION, [ $this, 'register_ajax_script' ] );
+		add_action( self::BACKEND_ENQUEUE_ACTION, [ $this, 'register_ajax_script' ] );
 		add_action( 'wp_ajax_' . self::AJAX_ACTION, [ $this, 'reenable_css_transient_caching' ] );
 	}
 
diff --git a/src/Admin/SiteHealth.php b/src/Admin/SiteHealth.php
index 61104970569..7469a6297af 100644
--- a/src/Admin/SiteHealth.php
+++ b/src/Admin/SiteHealth.php
@@ -165,7 +165,7 @@ public function register_async_test_endpoints() {
 				[
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => [ $this, 'page_cache' ],
-					'permission_callback' => static function() {
+					'permission_callback' => static function () {
 						return current_user_can( 'view_site_health_checks' );
 					},
 				],
@@ -760,7 +760,7 @@ public function curl_multi_functions() {
 				'curl_multi_exec',
 				'curl_multi_init',
 			],
-			static function( $function_name ) {
+			static function ( $function_name ) {
 				return ! function_exists( $function_name );
 			}
 		);
@@ -811,7 +811,7 @@ static function( $function_name ) {
 							implode(
 								', ',
 								array_map(
-									static function( $function_name ) {
+									static function ( $function_name ) {
 										return sprintf( '<code>%s()</code>', $function_name );
 									},
 									$undefined_curl_functions
@@ -1104,7 +1104,7 @@ private function get_supported_templates() {
 				array_keys(
 					array_filter(
 						AMP_Theme_Support::get_supportable_templates(),
-						static function( $option ) {
+						static function ( $option ) {
 							return ! empty( $option['supported'] );
 						}
 					)
diff --git a/src/Admin/SupportScreen.php b/src/Admin/SupportScreen.php
index 9899283bfec..e3dffd0c53a 100644
--- a/src/Admin/SupportScreen.php
+++ b/src/Admin/SupportScreen.php
@@ -86,7 +86,6 @@ public function __construct( Injector $injector, OptionsMenu $options_menu, Goog
 		$this->parent_menu_slug = $options_menu->get_menu_slug();
 
 		$this->google_fonts = $google_fonts;
-
 	}
 
 	/**
@@ -173,7 +172,6 @@ public function add_menu_items() {
 			[ $this, 'render_screen' ],
 			10
 		);
-
 	}
 
 	/**
diff --git a/src/Exception/FailedToMakeInstance.php b/src/Exception/FailedToMakeInstance.php
index bc328204059..23d4d78c7b6 100644
--- a/src/Exception/FailedToMakeInstance.php
+++ b/src/Exception/FailedToMakeInstance.php
@@ -17,9 +17,7 @@
  * @since 2.0
  * @internal
  */
-final class FailedToMakeInstance
-	extends RuntimeException
-	implements AmpWpException {
+final class FailedToMakeInstance extends RuntimeException implements AmpWpException {
 
 	// These constants are public so you can use them to find out what exactly
 	// happened when you catch a "FailedToMakeInstance" exception.
diff --git a/src/Exception/InvalidEventProperties.php b/src/Exception/InvalidEventProperties.php
index 8c3ca579c40..9178c041c93 100644
--- a/src/Exception/InvalidEventProperties.php
+++ b/src/Exception/InvalidEventProperties.php
@@ -15,9 +15,7 @@
  * @since 2.0
  * @internal
  */
-final class InvalidEventProperties
-	extends InvalidArgumentException
-	implements AmpWpException {
+final class InvalidEventProperties extends InvalidArgumentException implements AmpWpException {
 
 	/**
 	 * Create a new instance of the exception for a properties value that has
diff --git a/src/Exception/InvalidService.php b/src/Exception/InvalidService.php
index d87597cc512..8ff9e27662d 100644
--- a/src/Exception/InvalidService.php
+++ b/src/Exception/InvalidService.php
@@ -15,9 +15,7 @@
  * @since 2.0
  * @internal
  */
-final class InvalidService
-	extends InvalidArgumentException
-	implements AmpWpException {
+final class InvalidService extends InvalidArgumentException implements AmpWpException {
 
 	/**
 	 * Create a new instance of the exception for a service class name that is
diff --git a/src/Exception/InvalidStopwatchEvent.php b/src/Exception/InvalidStopwatchEvent.php
index 396adf96900..39020202416 100644
--- a/src/Exception/InvalidStopwatchEvent.php
+++ b/src/Exception/InvalidStopwatchEvent.php
@@ -15,9 +15,7 @@
  * @since 2.0
  * @internal
  */
-final class InvalidStopwatchEvent
-	extends InvalidArgumentException
-	implements AmpWpException {
+final class InvalidStopwatchEvent extends InvalidArgumentException implements AmpWpException {
 
 	/**
 	 * Create a new instance of the exception for a stopwatch event name that is
diff --git a/src/Infrastructure/ServiceContainer/SimpleServiceContainer.php b/src/Infrastructure/ServiceContainer/SimpleServiceContainer.php
index 2bc5424a513..d4336f8f4d7 100644
--- a/src/Infrastructure/ServiceContainer/SimpleServiceContainer.php
+++ b/src/Infrastructure/ServiceContainer/SimpleServiceContainer.php
@@ -21,9 +21,7 @@
  * @since 2.0
  * @internal
  */
-final class SimpleServiceContainer
-	extends ArrayObject
-	implements ServiceContainer {
+final class SimpleServiceContainer extends ArrayObject implements ServiceContainer {
 
 	/**
 	 * Find a service of the container by its identifier and return it.
diff --git a/src/OptionsRESTController.php b/src/OptionsRESTController.php
index 47557a7903c..5cb658b8907 100644
--- a/src/OptionsRESTController.php
+++ b/src/OptionsRESTController.php
@@ -176,7 +176,7 @@ public function get_items( $request ) { // phpcs:ignore VariableAnalysis.CodeAna
 
 		$options[ self::SUPPRESSIBLE_PLUGINS ]   = $this->plugin_suppression->get_suppressible_plugins_with_details();
 		$options[ self::SUPPORTABLE_POST_TYPES ] = array_map(
-			static function( $slug ) {
+			static function ( $slug ) {
 				$post_type                 = (array) get_post_type_object( $slug );
 				$post_type['supports_amp'] = post_type_supports( $post_type['name'], AMP_Post_Type_Support::SLUG );
 				return $post_type;
diff --git a/src/PairedRouting.php b/src/PairedRouting.php
index 2fd8b1691d3..f071a001cbf 100644
--- a/src/PairedRouting.php
+++ b/src/PairedRouting.php
@@ -578,7 +578,7 @@ public function extract_endpoint_from_environment_before_parse_request( $do_pars
 
 		// Increase the nesting level so we can prevent calling ourselves for any recursive calls
 		// to `WP::parse_request()` during the `request` filter.
-		$this->current_request_nesting_level++;
+		++$this->current_request_nesting_level;
 
 		return $do_parse_request;
 	}
@@ -607,7 +607,7 @@ public function restore_path_endpoint_in_environment( WP $wp ) {
 		// Since the request has finished the parsing which was detected above in the
 		// `PairedRouting::extract_endpoint_from_environment_before_parse_request()`
 		// method, now decrement the level.
-		$this->current_request_nesting_level--;
+		--$this->current_request_nesting_level;
 
 		// Only run for the outermost/root request when an AMP endpoint was requested.
 		if (
@@ -665,7 +665,7 @@ public function filter_unique_post_slug( $slug, $post_id, /** @noinspection PhpU
 					$post_id
 				)
 			);
-			$suffix++;
+			++$suffix;
 		} while ( $slug_check );
 		$slug = $alt_slug;
 
diff --git a/src/PluginSuppression.php b/src/PluginSuppression.php
index 2aba3e71969..bee253c28c0 100644
--- a/src/PluginSuppression.php
+++ b/src/PluginSuppression.php
@@ -266,7 +266,7 @@ static function ( $a, $b ) {
 
 		// Because this data will be accessed via REST, add additional fields that are not easily rendered in JS.
 		$validation_errors = array_map(
-			static function( $validation_error ) {
+			static function ( $validation_error ) {
 				$term = $validation_error['term'];
 
 				$validation_error['edit_url'] = admin_url(
diff --git a/src/ReaderThemeLoader.php b/src/ReaderThemeLoader.php
index 6d4d5090e68..e22d1f61184 100644
--- a/src/ReaderThemeLoader.php
+++ b/src/ReaderThemeLoader.php
@@ -281,7 +281,6 @@ function ( match, startDiv ) {
 			);
 		</script>
 		<?php
-
 	}
 
 	/**
@@ -390,7 +389,7 @@ public function disable_widgets() {
 		add_filter( 'sidebars_widgets', '__return_empty_array', PHP_INT_MAX );
 		add_filter(
 			'customize_loaded_components',
-			static function( $components ) {
+			static function ( $components ) {
 				return array_diff( $components, [ 'widgets' ] );
 			}
 		);
diff --git a/src/ReaderThemeSupportFeatures.php b/src/ReaderThemeSupportFeatures.php
index 3266978d479..97b7625bd1e 100644
--- a/src/ReaderThemeSupportFeatures.php
+++ b/src/ReaderThemeSupportFeatures.php
@@ -505,10 +505,8 @@ private function print_spacing_sizes_custom_properties() {
 			if ( isset( $spacing_sizes[ self::KEY_THEME ] ) ) {
 				$custom_properties = array_merge( $custom_properties, $spacing_sizes[ self::KEY_THEME ] );
 			}
-		} else {
-			if ( isset( $spacing_sizes[ self::KEY_DEFAULT ] ) ) {
+		} elseif ( isset( $spacing_sizes[ self::KEY_DEFAULT ] ) ) {
 				$custom_properties = array_merge( $custom_properties, $spacing_sizes[ self::KEY_DEFAULT ] );
-			}
 		}
 
 		if ( empty( $custom_properties ) ) {
diff --git a/src/Support/SupportData.php b/src/Support/SupportData.php
index 2f6205c4fea..fef5ed6e159 100644
--- a/src/Support/SupportData.php
+++ b/src/Support/SupportData.php
@@ -146,7 +146,6 @@ static function ( $url ) {
 			$this->urls
 		);
 		$this->urls = array_values( array_unique( array_filter( $this->urls ) ) );
-
 	}
 
 	/**
@@ -336,7 +335,7 @@ static function ( WP_Theme $theme ) {
 		);
 
 		$response = array_map(
-			static function( WP_Theme $theme ) {
+			static function ( WP_Theme $theme ) {
 				return self::normalize_theme_info( $theme );
 			},
 			$themes
@@ -389,7 +388,7 @@ public function get_error_log() {
 					$current_line = $char . $current_line;
 				}
 
-				$position--;
+				--$position;
 			}
 
 			$lines[] = $current_line;
@@ -452,7 +451,6 @@ public static function normalize_plugin_info( $plugin_file ) {
 			'is_network_active' => is_plugin_active_for_network( $plugin_file ),
 			'is_suppressed'     => in_array( $slug, $suppressed_plugin_list, true ) ? $suppressed_plugins[ $slug ]['last_version'] : '',
 		];
-
 	}
 
 	/**
@@ -737,7 +735,6 @@ public function get_amp_urls() {
 			'error_sources' => $error_sources,
 			'urls'          => $amp_invalid_urls,
 		];
-
 	}
 
 	/**
@@ -883,7 +880,6 @@ protected function process_raw_post_errors( WP_Post $amp_validated_post ) {
 			'error_sources' => $error_source_list,
 			'url'           => $amp_invalid_url,
 		];
-
 	}
 
 	/**
@@ -954,7 +950,7 @@ static function ( $a, $b ) use ( $stylesheets ) {
 			} else {
 				$excluded_final_size    += $stylesheets[ $i ]['final_size'];
 				$excluded_original_size += $stylesheets[ $i ]['original_size'];
-				$excluded_stylesheets ++;
+				++$excluded_stylesheets;
 				$stylesheets[ $i ]['status'] = $excluded_status;
 			}
 		}
@@ -968,7 +964,6 @@ static function ( $a, $b ) use ( $stylesheets ) {
 		];
 
 		return $response;
-
 	}
 
 	/**
diff --git a/src/Validation/URLValidationProvider.php b/src/Validation/URLValidationProvider.php
index 949723a83eb..13407f69e22 100644
--- a/src/Validation/URLValidationProvider.php
+++ b/src/Validation/URLValidationProvider.php
@@ -124,7 +124,7 @@ private function update_state_from_validity( $validity, $type ) {
 		$unaccepted_error_count = count(
 			array_filter(
 				$validation_errors,
-				static function( $error ) {
+				static function ( $error ) {
 					$validation_status = AMP_Validation_Error_Taxonomy::get_validation_error_sanitization( $error );
 					return (
 						AMP_Validation_Error_Taxonomy::VALIDATION_ERROR_ACK_ACCEPTED_STATUS !== $validation_status['term_status']
@@ -136,13 +136,13 @@ static function( $error ) {
 		);
 
 		if ( count( $validation_errors ) > 0 ) {
-			$this->total_errors++;
+			++$this->total_errors;
 		}
 		if ( $unaccepted_error_count > 0 ) {
-			$this->unaccepted_errors++;
+			++$this->unaccepted_errors;
 		}
 
-		$this->number_validated++;
+		++$this->number_validated;
 
 		if ( ! isset( $this->validity_by_type[ $type ] ) ) {
 			$this->validity_by_type[ $type ] = [
@@ -150,9 +150,9 @@ static function( $error ) {
 				'total' => 0,
 			];
 		}
-		$this->validity_by_type[ $type ]['total']++;
+		++$this->validity_by_type[ $type ]['total'];
 		if ( 0 === $unaccepted_error_count ) {
-			$this->validity_by_type[ $type ]['valid']++;
+			++$this->validity_by_type[ $type ]['valid'];
 		}
 	}
 }
diff --git a/templates/style.php b/templates/style.php
index abfb293eea8..92dcaff9d6d 100644
--- a/templates/style.php
+++ b/templates/style.php
@@ -72,12 +72,12 @@
 	}
 }
 
-@media (min-width: <?php echo sprintf( '%dpx', $alignwide_max ); ?>) {
+@media (min-width: <?php printf( '%dpx', $alignwide_max ); ?>) {
 	.alignwide {
-		width: calc(<?php echo sprintf( '%dpx', $alignwide_max ); ?> - 48px);
-		max-width: calc(<?php echo sprintf( '%dpx', $alignwide_max ); ?> - 48px);
-		margin-left: calc(calc(50% - <?php echo sprintf( '%dpx', $alignwide_max ); ?> / 2) + 24px);
-		margin-right: calc(calc(50% - <?php echo sprintf( '%dpx', $alignwide_max ); ?> / 2) + 24px);
+		width: calc(<?php printf( '%dpx', $alignwide_max ); ?> - 48px);
+		max-width: calc(<?php printf( '%dpx', $alignwide_max ); ?> - 48px);
+		margin-left: calc(calc(50% - <?php printf( '%dpx', $alignwide_max ); ?> / 2) + 24px);
+		margin-right: calc(calc(50% - <?php printf( '%dpx', $alignwide_max ); ?> / 2) + 24px);
 	}
 }
 
@@ -112,7 +112,7 @@
 .amp-wp-title-bar div {
 	<?php if ( $content_max_width > 0 ) : ?>
 	margin: 0 auto;
-	max-width: <?php echo sprintf( '%dpx', $content_max_width ); ?>;
+	max-width: <?php printf( '%dpx', $content_max_width ); ?>;
 	<?php endif; ?>
 }
 
diff --git a/tests/php/data/plugins/bad-shortcode.php b/tests/php/data/plugins/bad-shortcode.php
index ee6a55bf731..3a909b41f8c 100644
--- a/tests/php/data/plugins/bad-shortcode.php
+++ b/tests/php/data/plugins/bad-shortcode.php
@@ -14,7 +14,7 @@ function () {
 
 add_shortcode(
 	'bad',
-	function() {
+	function () {
 		wp_enqueue_script( 'bad-shortcode' );
 		return '<script>document.write("Bad shortcode!!!");</script><noscript>Bad shortcode fallback!</noscript>';
 	}
diff --git a/tests/php/maybe-generate-wp-cli-coverage.php b/tests/php/maybe-generate-wp-cli-coverage.php
index f2567f6b64a..f744f703c0a 100644
--- a/tests/php/maybe-generate-wp-cli-coverage.php
+++ b/tests/php/maybe-generate-wp-cli-coverage.php
@@ -40,6 +40,3 @@ static function () use ( $coverage, $feature, $scenario, $name ) {
 		( new Clover() )->process( $coverage, $destination, $name );
 	}
 );
-
-
-
diff --git a/tests/php/src/Admin/AfterActivationSiteScanTest.php b/tests/php/src/Admin/AfterActivationSiteScanTest.php
index 6f5b85ab6c3..367413a94da 100644
--- a/tests/php/src/Admin/AfterActivationSiteScanTest.php
+++ b/tests/php/src/Admin/AfterActivationSiteScanTest.php
@@ -30,7 +30,8 @@
  */
 class AfterActivationSiteScanTest extends DependencyInjectedTestCase {
 
-	use PrivateAccess, MockAdminUser;
+	use PrivateAccess;
+	use MockAdminUser;
 
 	/**
 	 * Test instance.
diff --git a/tests/php/src/Admin/AmpThemesTest.php b/tests/php/src/Admin/AmpThemesTest.php
index 98ee5cc4fdb..81628897465 100644
--- a/tests/php/src/Admin/AmpThemesTest.php
+++ b/tests/php/src/Admin/AmpThemesTest.php
@@ -237,6 +237,5 @@ public function test_filter_theme_row_meta() {
 			],
 			$this->instance->filter_theme_row_meta( [], 'astra' )
 		);
-
 	}
 }
diff --git a/tests/php/src/Admin/OnboardingWizardSubmenuTest.php b/tests/php/src/Admin/OnboardingWizardSubmenuTest.php
index bb6706d1781..a0bdfb3cc7f 100644
--- a/tests/php/src/Admin/OnboardingWizardSubmenuTest.php
+++ b/tests/php/src/Admin/OnboardingWizardSubmenuTest.php
@@ -22,7 +22,7 @@
  *
  * @coversDefaultClass \AmpProject\AmpWP\Admin\OnboardingWizardSubmenu
  */
-class OnboardingWizardSubmenuTest  extends TestCase {
+class OnboardingWizardSubmenuTest extends TestCase {
 
 	/**
 	 * Test instance.
diff --git a/tests/php/src/Admin/PluginRowMetaTest.php b/tests/php/src/Admin/PluginRowMetaTest.php
index 33f566bf619..96d0c7fe51c 100644
--- a/tests/php/src/Admin/PluginRowMetaTest.php
+++ b/tests/php/src/Admin/PluginRowMetaTest.php
@@ -86,6 +86,5 @@ public function test_get_plugin_row_meta() {
 		);
 
 		$this->assertEquals( $expected_meta, $this->instance->get_plugin_row_meta( $initial_meta, 'amp/amp.php' ) );
-
 	}
 }
diff --git a/tests/php/src/Admin/ReaderThemesTest.php b/tests/php/src/Admin/ReaderThemesTest.php
index b8e8d4ef2e5..31ac8bff449 100644
--- a/tests/php/src/Admin/ReaderThemesTest.php
+++ b/tests/php/src/Admin/ReaderThemesTest.php
@@ -29,7 +29,9 @@
  */
 class ReaderThemesTest extends TestCase {
 
-	use ThemesApiRequestMocking, LoadsCoreThemes, MockAdminUser;
+	use ThemesApiRequestMocking;
+	use LoadsCoreThemes;
+	use MockAdminUser;
 
 	/**
 	 * Test instance.
@@ -146,7 +148,7 @@ public function test_themes_api_failure() {
 	 * @covers ::get_default_reader_themes
 	 */
 	public function test_themes_api_empty_array() {
-		$filter_cb = static function() {
+		$filter_cb = static function () {
 			return (object) [ 'themes' => [] ];
 		};
 		add_filter( 'themes_api_result', $filter_cb );
@@ -168,7 +170,7 @@ public function test_themes_api_empty_array() {
 	 * @covers ::get_default_reader_themes
 	 */
 	public function test_themes_api_wp_error() {
-		$filter_cb = static function() {
+		$filter_cb = static function () {
 			return new WP_Error(
 				'amp_test_error',
 				'Test message'
diff --git a/tests/php/src/Admin/SupportLinkTest.php b/tests/php/src/Admin/SupportLinkTest.php
index 32ef491f078..3e89c5e47ba 100644
--- a/tests/php/src/Admin/SupportLinkTest.php
+++ b/tests/php/src/Admin/SupportLinkTest.php
@@ -218,6 +218,5 @@ public function test_plugin_row_meta() {
 		);
 
 		$this->assertContains( $should_have, $output );
-
 	}
 }
diff --git a/tests/php/src/Admin/SupportScreenTest.php b/tests/php/src/Admin/SupportScreenTest.php
index ec28a045214..9e501b92ef7 100644
--- a/tests/php/src/Admin/SupportScreenTest.php
+++ b/tests/php/src/Admin/SupportScreenTest.php
@@ -26,7 +26,8 @@
  */
 class SupportScreenTest extends DependencyInjectedTestCase {
 
-	use HomeUrlLoopbackRequestMocking, MockAdminUser;
+	use HomeUrlLoopbackRequestMocking;
+	use MockAdminUser;
 
 	/**
 	 * Instance of SupportMenu
@@ -157,7 +158,6 @@ public function test_register() {
 
 		$this->assertEquals( 10, has_action( 'admin_enqueue_scripts', [ $this->instance, 'enqueue_assets' ] ) );
 		$this->assertEquals( 9, has_action( 'admin_menu', [ $this->instance, 'add_menu_items' ] ) );
-
 	}
 
 	/**
@@ -206,7 +206,6 @@ public function test_add_menu_items() {
 			],
 			$submenu['amp-options']
 		);
-
 	}
 
 	/**
@@ -226,7 +225,6 @@ public function test_enqueue_assets() {
 
 		$this->assertArrayHasKey( SupportScreen::ASSET_HANDLE, $wp_scripts->registered );
 		$this->assertArrayHasKey( SupportScreen::ASSET_HANDLE, $wp_styles->registered );
-
 	}
 
 	/**
diff --git a/tests/php/src/Cli/Import/ImportWidgets.php b/tests/php/src/Cli/Import/ImportWidgets.php
index fe35c3f33c4..1ddb0c949ba 100644
--- a/tests/php/src/Cli/Import/ImportWidgets.php
+++ b/tests/php/src/Cli/Import/ImportWidgets.php
@@ -162,7 +162,7 @@ public function process() {
 							"Widget %G'{$id_base}'%n imported into sidebar '%G{$use_sidebar_id}%n'."
 						)
 					);
-					$count++;
+					++$count;
 				}
 			}
 		}
diff --git a/tests/php/src/Cli/ReferenceSiteCommandNamespace.php b/tests/php/src/Cli/ReferenceSiteCommandNamespace.php
index 403d6420f59..2109eac387c 100644
--- a/tests/php/src/Cli/ReferenceSiteCommandNamespace.php
+++ b/tests/php/src/Cli/ReferenceSiteCommandNamespace.php
@@ -22,5 +22,4 @@ final class ReferenceSiteCommandNamespace extends CommandNamespace {
 	 * @var string
 	 */
 	const REFERENCE_SITES_ROOT = AMP__DIR__ . '/tests/reference-sites/';
-
 }
diff --git a/tests/php/src/DevTools/CallbackReflectionTest.php b/tests/php/src/DevTools/CallbackReflectionTest.php
index c88ab786af8..634cafde814 100644
--- a/tests/php/src/DevTools/CallbackReflectionTest.php
+++ b/tests/php/src/DevTools/CallbackReflectionTest.php
@@ -66,7 +66,7 @@ public function test_get_unwrapped_callback() {
 			return $number + 1;
 		};
 		$original_by_ref_callback   = function ( &$number ) {
-			$number++;
+			++$number;
 		};
 
 		$this->assertSame(
diff --git a/tests/php/src/Helpers/ErrorComparison.php b/tests/php/src/Helpers/ErrorComparison.php
index 89333fd7709..bceb7c4499a 100644
--- a/tests/php/src/Helpers/ErrorComparison.php
+++ b/tests/php/src/Helpers/ErrorComparison.php
@@ -35,7 +35,7 @@ protected function assertSameErrors( $expected_errors, $actual_errors ) { // php
 		}
 
 		$expected_count = count( $expected_errors );
-		for ( $index = 0; $index < $expected_count; $index ++ ) {
+		for ( $index = 0; $index < $expected_count; $index++ ) {
 			$expected_error = $expected_errors[ $index ];
 			$actual_error   = $actual_errors[ $index ];
 
diff --git a/tests/php/src/Helpers/HomeUrlLoopbackRequestMocking.php b/tests/php/src/Helpers/HomeUrlLoopbackRequestMocking.php
index ee8e92de43e..60f1be0ff57 100644
--- a/tests/php/src/Helpers/HomeUrlLoopbackRequestMocking.php
+++ b/tests/php/src/Helpers/HomeUrlLoopbackRequestMocking.php
@@ -36,6 +36,5 @@ static function ( $pre, $args, $url ) {
 			10,
 			3
 		);
-
 	}
 }
diff --git a/tests/php/src/Helpers/ValidationRequestMocking.php b/tests/php/src/Helpers/ValidationRequestMocking.php
index b89386fb0c2..e1c8601e31e 100644
--- a/tests/php/src/Helpers/ValidationRequestMocking.php
+++ b/tests/php/src/Helpers/ValidationRequestMocking.php
@@ -27,7 +27,7 @@ public function get_validated_urls() {
 		);
 
 		return array_map(
-			static function( $post ) {
+			static function ( $post ) {
 				return remove_query_arg( 'amp', AMP_Validated_URL_Post_Type::get_url_from_post( $post ) );
 			},
 			$query->posts
diff --git a/tests/php/src/Helpers/WithoutBlockPreRendering.php b/tests/php/src/Helpers/WithoutBlockPreRendering.php
index cf4e63708b7..c5d666db71c 100644
--- a/tests/php/src/Helpers/WithoutBlockPreRendering.php
+++ b/tests/php/src/Helpers/WithoutBlockPreRendering.php
@@ -22,7 +22,7 @@ public function set_up() { //phpcs:ignore WordPress.NamingConventions.ValidFunct
 
 		add_filter(
 			'render_block_data',
-			static function( $parsed_block ) {
+			static function ( $parsed_block ) {
 				global $post;
 
 				if (
@@ -42,7 +42,7 @@ static function( $parsed_block ) {
 
 		add_filter(
 			'render_block_context',
-			static function( $context, $parsed_block ) {
+			static function ( $context, $parsed_block ) {
 				global $post;
 
 				// Remove the dummy post from the global scope and unset post related data from the context.
diff --git a/tests/php/src/ObsoleteBlockAttributeRemoverTest.php b/tests/php/src/ObsoleteBlockAttributeRemoverTest.php
index 56457432c7d..58624267d4d 100644
--- a/tests/php/src/ObsoleteBlockAttributeRemoverTest.php
+++ b/tests/php/src/ObsoleteBlockAttributeRemoverTest.php
@@ -134,7 +134,7 @@ public function test_filter_rest_prepare_post_raw( $block_content, $expected_pro
 			if ( isset( $parsed_block['attrs'][ $prop ] ) ) {
 				$this->assertStringContainsString( "$attribute=", $response->data['content']['raw'] );
 				$this->assertStringNotContainsString( "$attribute=", $filtered_response->data['content']['raw'] );
-				$present_count++;
+				++$present_count;
 			}
 		}
 
diff --git a/tests/php/src/Optimizer/OptimizerServiceTest.php b/tests/php/src/Optimizer/OptimizerServiceTest.php
index 11dc6df75a6..44329561fe2 100644
--- a/tests/php/src/Optimizer/OptimizerServiceTest.php
+++ b/tests/php/src/Optimizer/OptimizerServiceTest.php
@@ -8,7 +8,7 @@
 use AmpProject\Dom\Document;
 use AmpProject\Optimizer\ErrorCollection;
 use AmpProject\Optimizer\TransformationEngine;
-use \AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
+use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
 use AmpProject\RemoteGetRequest;
 use AmpProject\RemoteRequest\FallbackRemoteGetRequest;
 use AmpProject\AmpWP\Tests\TestCase;
diff --git a/tests/php/src/PluginSuppressionTest.php b/tests/php/src/PluginSuppressionTest.php
index aea5b0e6ff4..a16e3a11ee9 100644
--- a/tests/php/src/PluginSuppressionTest.php
+++ b/tests/php/src/PluginSuppressionTest.php
@@ -542,7 +542,7 @@ private function assert_plugin_suppressed_state( $suppressed, $plugin_slugs ) {
 			} else {
 				$this->assertStringContainsString( 'Bad shortcode!', $content );
 			}
-			$checked++;
+			++$checked;
 		}
 
 		// Check bad-widget.
@@ -570,7 +570,7 @@ private function assert_plugin_suppressed_state( $suppressed, $plugin_slugs ) {
 				$this->assertStringContainsString( 'Bad Multi Widget', $rendered_sidebar );
 				$this->assertStringContainsString( 'Bad Single Widget', $rendered_sidebar );
 			}
-			$checked++;
+			++$checked;
 		}
 
 		// Check bad-hooks.
@@ -595,7 +595,7 @@ private function assert_plugin_suppressed_state( $suppressed, $plugin_slugs ) {
 				$this->assertStringContainsString( 'Bad action!', $footer );
 			}
 
-			$checked++;
+			++$checked;
 		}
 
 		// Check bad-block.
@@ -607,7 +607,7 @@ private function assert_plugin_suppressed_state( $suppressed, $plugin_slugs ) {
 			} else {
 				$this->assertStringContainsString( 'Bad dynamic block!', $blocks );
 			}
-			$checked++;
+			++$checked;
 		}
 
 		if ( 0 === $checked ) {
diff --git a/tests/php/src/ReaderThemeLoaderTest.php b/tests/php/src/ReaderThemeLoaderTest.php
index c58700aef9c..3a958639fde 100644
--- a/tests/php/src/ReaderThemeLoaderTest.php
+++ b/tests/php/src/ReaderThemeLoaderTest.php
@@ -18,7 +18,8 @@
 /** @coversDefaultClass \AmpProject\AmpWP\ReaderThemeLoader */
 final class ReaderThemeLoaderTest extends DependencyInjectedTestCase {
 
-	use LoadsCoreThemes, MockAdminUser;
+	use LoadsCoreThemes;
+	use MockAdminUser;
 
 	/** @var ReaderThemeLoader */
 	private $instance;
@@ -268,7 +269,6 @@ public function test_override_theme() {
 
 		$this->assertEquals( 10, has_filter( 'customize_previewable_devices', [ $this->instance, 'customize_previewable_devices' ] ) );
 		$this->assertEquals( 11, has_action( 'customize_register', [ $this->instance, 'remove_customizer_themes_panel' ] ) );
-
 	}
 
 	/** @covers ::disable_widgets() */
diff --git a/tests/php/src/ReaderThemeSupportFeaturesTest.php b/tests/php/src/ReaderThemeSupportFeaturesTest.php
index b467cb4cc28..f27ee8a0f84 100644
--- a/tests/php/src/ReaderThemeSupportFeaturesTest.php
+++ b/tests/php/src/ReaderThemeSupportFeaturesTest.php
@@ -17,7 +17,8 @@
 /** @coversDefaultClass \AmpProject\AmpWP\ReaderThemeSupportFeatures */
 final class ReaderThemeSupportFeaturesTest extends DependencyInjectedTestCase {
 
-	use LoadsCoreThemes, PrivateAccess;
+	use LoadsCoreThemes;
+	use PrivateAccess;
 
 	const TEST_GRADIENT_PRESETS = [
 		[
diff --git a/tests/php/src/Support/SupportDataTest.php b/tests/php/src/Support/SupportDataTest.php
index 9232cf19809..a9c45994dc6 100644
--- a/tests/php/src/Support/SupportDataTest.php
+++ b/tests/php/src/Support/SupportDataTest.php
@@ -23,7 +23,8 @@
  */
 class SupportDataTest extends DependencyInjectedTestCase {
 
-	use PrivateAccess, HomeUrlLoopbackRequestMocking;
+	use PrivateAccess;
+	use HomeUrlLoopbackRequestMocking;
 
 	/**
 	 * Instance of OptionsMenu
@@ -109,7 +110,6 @@ static function ( $url ) {
 		$instance = new SupportData( $input );
 
 		$this->assertEquals( $expected, $instance->urls );
-
 	}
 
 	/**
@@ -338,11 +338,11 @@ public function test_get_error_log() {
 		$input_content    = '';
 		$expected_content = '';
 
-		for ( $i = 1; $i <= 300; $i ++ ) {
+		for ( $i = 1; $i <= 300; $i++ ) {
 			$input_content .= "Line: $i\n";
 		}
 
-		for ( $i = 101; $i <= 300; $i ++ ) {
+		for ( $i = 101; $i <= 300; $i++ ) {
 			$expected_content .= "Line: $i\n";
 		}
 		$expected_content = trim( $expected_content, "\n" );
@@ -471,7 +471,6 @@ public function test_get_theme_info() {
 			$this->assertArrayHasKey( $key, $theme_info[0] );
 			$this->assertEquals( $active_theme[ $key ], $theme_info[0][ $key ] );
 		}
-
 	}
 
 	/**
diff --git a/tests/php/src/Validation/ScannableURLProviderTest.php b/tests/php/src/Validation/ScannableURLProviderTest.php
index 94f3183068e..351451e2e04 100644
--- a/tests/php/src/Validation/ScannableURLProviderTest.php
+++ b/tests/php/src/Validation/ScannableURLProviderTest.php
@@ -15,7 +15,8 @@
 
 /** @coversDefaultClass \AmpProject\AmpWP\Validation\ScannableURLProvider */
 final class ScannableURLProviderTest extends TestCase {
-	use PrivateAccess, ValidationRequestMocking;
+	use PrivateAccess;
+	use ValidationRequestMocking;
 
 	/**
 	 * Validation URL provider instance to use.
diff --git a/tests/php/src/Validation/URLValidationCronTest.php b/tests/php/src/Validation/URLValidationCronTest.php
index 0a70abecc2c..19f861738fb 100644
--- a/tests/php/src/Validation/URLValidationCronTest.php
+++ b/tests/php/src/Validation/URLValidationCronTest.php
@@ -16,7 +16,8 @@
 
 /** @coversDefaultClass \AmpProject\AmpWP\Validation\URLValidationCron */
 final class URLValidationCronTest extends DependencyInjectedTestCase {
-	use ValidationRequestMocking, PrivateAccess;
+	use ValidationRequestMocking;
+	use PrivateAccess;
 
 	/**
 	 * Test instance
diff --git a/tests/php/test-amp-analytics-options.php b/tests/php/test-amp-analytics-options.php
index 2d138c9c57e..683e988e586 100644
--- a/tests/php/test-amp-analytics-options.php
+++ b/tests/php/test-amp-analytics-options.php
@@ -220,7 +220,7 @@ public function test_amp_get_analytics() {
 		AMP_Options_Manager::update_option( Option::THEME_SUPPORT, AMP_Theme_Support::STANDARD_MODE_SLUG );
 		add_filter(
 			'amp_analytics_entries',
-			static function( $analytics ) use ( $key ) {
+			static function ( $analytics ) use ( $key ) {
 				$analytics[ $key ]['type']                                = 'test';
 				$analytics[ $key ]['attributes']['data-include']          = '_till_responded';
 				$analytics[ $key ]['attributes']['data-block-on-consent'] = 'credentials';
@@ -252,7 +252,7 @@ public function test_amp_print_analytics() {
 
 		$entries_test = function ( $entries ) use ( $analytics, &$trigger_count ) {
 			$this->assertEquals( $analytics, $entries );
-			$trigger_count++;
+			++$trigger_count;
 		};
 
 		add_action(
@@ -274,7 +274,7 @@ public function test_amp_print_analytics() {
 
 		add_filter(
 			'amp_analytics_entries',
-			static function( $analytics ) use ( $key ) {
+			static function ( $analytics ) use ( $key ) {
 				$analytics[ $key ]['attributes']['data-include'] = '_till_responded';
 				return $analytics;
 			}
diff --git a/tests/php/test-amp-form-sanitizer.php b/tests/php/test-amp-form-sanitizer.php
index e7420d925ee..7557634880e 100644
--- a/tests/php/test-amp-form-sanitizer.php
+++ b/tests/php/test-amp-form-sanitizer.php
@@ -279,7 +279,7 @@ public function test_converter( $source, $expected = null, $args = [], $expected
 		}
 
 		$actual_errors                     = [];
-		$args['validation_error_callback'] = static function( $error ) use ( &$actual_errors ) {
+		$args['validation_error_callback'] = static function ( $error ) use ( &$actual_errors ) {
 			$actual_errors[] = $error;
 			return true;
 		};
diff --git a/tests/php/test-amp-gallery-embed-handler.php b/tests/php/test-amp-gallery-embed-handler.php
index 526a2efdec9..3aef6575bad 100644
--- a/tests/php/test-amp-gallery-embed-handler.php
+++ b/tests/php/test-amp-gallery-embed-handler.php
@@ -16,7 +16,8 @@
  */
 class AMP_Gallery_Embed_Handler_Test extends TestCase {
 
-	use WithoutBlockPreRendering, LoadsCoreThemes;
+	use WithoutBlockPreRendering;
+	use LoadsCoreThemes;
 
 	private static $original_amp_options;
 
diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 5e8e2a56f53..25e273da908 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -543,7 +543,7 @@ static function ( $assertion ) {
 	private function set_home_url_with_filter( $home_url ) {
 		add_filter(
 			'home_url',
-			static function() use ( $home_url ) {
+			static function () use ( $home_url ) {
 				return $home_url;
 			}
 		);
@@ -689,7 +689,7 @@ public function test_amp_get_permalink_with_pretty_permalinks_and_legacy_reader_
 		$wp_rewrite->flush_rules();
 
 		// @todo This should also add a query param to see how it behaves.
-		$add_anchor_fragment = static function( $url ) {
+		$add_anchor_fragment = static function ( $url ) {
 			return $url . '#anchor';
 		};
 
@@ -809,7 +809,7 @@ public function get_reader_mode_amphtml_urls() {
 					false,
 				];
 			},
-			'is_post'         => function() {
+			'is_post'         => function () {
 				$post_id = self::factory()->post->create();
 				return [
 					get_permalink( $post_id ),
@@ -817,7 +817,7 @@ public function get_reader_mode_amphtml_urls() {
 					true,
 				];
 			},
-			'is_skipped_post' => function() {
+			'is_skipped_post' => function () {
 				$skipped_post_id = self::factory()->post->create();
 				add_filter(
 					'amp_skip_post',
@@ -838,7 +838,7 @@ static function ( $skip, $current_post ) use ( $skipped_post_id ) {
 			},
 		];
 		return array_map(
-			function( $provider ) {
+			function ( $provider ) {
 				return [ $provider ];
 			},
 			$providers
@@ -858,11 +858,11 @@ public function test_amp_add_amphtml_link_reader_mode( $data_provider ) {
 		list( $canonical_url, $amphtml_url, $available ) = $data_provider();
 		$this->assertFalse( current_theme_supports( AMP_Theme_Support::SLUG ) );
 		$this->assertFalse( amp_is_canonical() );
-		$get_amp_html_link = static function() {
+		$get_amp_html_link = static function () {
 			return get_echo( 'amp_add_amphtml_link' );
 		};
 
-		$assert_amphtml_link_present = function() use ( $amphtml_url, $get_amp_html_link, $available ) {
+		$assert_amphtml_link_present = function () use ( $amphtml_url, $get_amp_html_link, $available ) {
 			if ( $available ) {
 				$this->assertEquals(
 					sprintf( '<link rel="amphtml" href="%s">', esc_url( $amphtml_url ) ),
@@ -908,7 +908,7 @@ public function get_transitional_mode_amphtml_urls() {
 					true,
 				];
 			},
-			'is_post'         => function() {
+			'is_post'         => function () {
 				$post_id = self::factory()->post->create();
 				return [
 					get_permalink( $post_id ),
@@ -916,7 +916,7 @@ public function get_transitional_mode_amphtml_urls() {
 					true,
 				];
 			},
-			'is_skipped_post' => function() {
+			'is_skipped_post' => function () {
 				$skipped_post_id = self::factory()->post->create();
 				add_filter(
 					'amp_skip_post',
@@ -937,7 +937,7 @@ static function ( $skip, $current_post ) use ( $skipped_post_id ) {
 			},
 		];
 		return array_map(
-			function( $provider ) {
+			function ( $provider ) {
 				return [ $provider ];
 			},
 			$providers
@@ -960,11 +960,11 @@ public function test_amp_add_amphtml_link_transitional_mode( $data_provider ) {
 		AMP_Theme_Support::init();
 		$this->assertFalse( amp_is_canonical() );
 
-		$get_amp_html_link = static function() {
+		$get_amp_html_link = static function () {
 			return get_echo( 'amp_add_amphtml_link' );
 		};
 
-		$assert_amphtml_link_present = function() use ( $amphtml_url, $get_amp_html_link, $available ) {
+		$assert_amphtml_link_present = function () use ( $amphtml_url, $get_amp_html_link, $available ) {
 			if ( $available ) {
 				$this->assertTrue( amp_is_available() );
 				$this->assertEquals(
@@ -1017,7 +1017,7 @@ public function test_amp_add_amphtml_link_transitional_mode( $data_provider ) {
 	public function get_sandboxing_mode_amphtml_urls() {
 		return [
 			'is_sandboxing_disabled'              => [
-				static function() {
+				static function () {
 					return [
 						home_url( '/' ),
 						amp_add_paired_endpoint( home_url( '/' ) ),
@@ -1026,7 +1026,7 @@ static function() {
 				},
 			],
 			'is_set_to_strict_sandboxing_level'   => [
-				static function() {
+				static function () {
 					return [
 						home_url( '/' ),
 						amp_add_paired_endpoint( home_url( '/' ) ),
@@ -1035,7 +1035,7 @@ static function() {
 				},
 			],
 			'is_set_to_moderate_sandboxing_level' => [
-				static function() {
+				static function () {
 					return [
 						home_url( '/' ),
 						amp_add_paired_endpoint( home_url( '/' ) ),
@@ -1044,7 +1044,7 @@ static function() {
 				},
 			],
 			'is_set_to_loose_sandboxing_level'    => [
-				static function() {
+				static function () {
 					return [
 						home_url( '/' ),
 						amp_add_paired_endpoint( home_url( '/' ) ),
@@ -1076,11 +1076,11 @@ public function test_amp_add_amphtml_link_sandboxing_mode( $data_provider ) {
 		AMP_Theme_Support::init();
 		$this->assertFalse( amp_is_canonical() );
 
-		$get_amp_html_link = static function() {
+		$get_amp_html_link = static function () {
 			return get_echo( 'amp_add_amphtml_link' );
 		};
 
-		$assert_amphtml_link_present = function() use ( $amphtml_url, $get_amp_html_link, $sandboxing_level ) {
+		$assert_amphtml_link_present = function () use ( $amphtml_url, $get_amp_html_link, $sandboxing_level ) {
 			$sandboxing_level = amp_get_sandboxing_level();
 
 			if ( 0 === $sandboxing_level || 3 === $sandboxing_level ) {
@@ -1374,7 +1374,7 @@ public function test_amp_add_generator_metadata() {
 		}
 		AMP_Options_Manager::update_option( Option::THEME_SUPPORT, AMP_Theme_Support::READER_MODE_SLUG );
 
-		$get_generator_tag = static function() {
+		$get_generator_tag = static function () {
 			return get_echo( 'amp_add_generator_metadata' );
 		};
 
@@ -2009,7 +2009,7 @@ public function test_amp_get_content_sanitizers() {
 		// Make sure the style and validating sanitizers are always at the end, even after filtering.
 		add_filter(
 			'amp_content_sanitizers',
-			static function( $classes ) {
+			static function ( $classes ) {
 				$classes['Even_After_Validating_Sanitizer'] = [];
 				return $classes;
 			}
@@ -2186,7 +2186,7 @@ public function test_amp_get_content_sanitizers_amp_to_amp() {
 		$excluded_urls = [ 'https://baz.com', 'https://example.com/one' ];
 		add_filter(
 			'amp_to_amp_excluded_urls',
-			static function() use ( $excluded_urls ) {
+			static function () use ( $excluded_urls ) {
 				return $excluded_urls;
 			}
 		);
@@ -2466,7 +2466,7 @@ public function test_amp_get_schemaorg_metadata() {
 		$self = $this;
 		add_filter(
 			'amp_post_template_metadata',
-			static function( $meta, $post ) use ( $self, $post_id ) {
+			static function ( $meta, $post ) use ( $self, $post_id ) {
 				$self->assertEquals( $post_id, $post->ID );
 				$meta['did_amp_post_template_metadata'] = true;
 				$self->assertArrayNotHasKey( 'amp_schemaorg_metadata', $meta );
@@ -2477,7 +2477,7 @@ static function( $meta, $post ) use ( $self, $post_id ) {
 		);
 		add_filter(
 			'amp_schemaorg_metadata',
-			static function( $meta ) use ( $self ) {
+			static function ( $meta ) use ( $self ) {
 				$meta['did_amp_schemaorg_metadata'] = true;
 				$self->assertArrayHasKey( 'did_amp_post_template_metadata', $meta );
 				$meta['author']['name'] = 'George';
diff --git a/tests/php/test-amp-image-dimension-extractor.php b/tests/php/test-amp-image-dimension-extractor.php
index ce216ee4abd..6f80402ec76 100644
--- a/tests/php/test-amp-image-dimension-extractor.php
+++ b/tests/php/test-amp-image-dimension-extractor.php
@@ -54,10 +54,10 @@ public function test__single_url() {
 
 		add_action(
 			'amp_extract_image_dimensions_batch_callbacks_registered',
-			static function() use ( $cdn_url ) {
+			static function () use ( $cdn_url ) {
 				add_filter(
 					'amp_extract_image_dimensions_batch',
-					static function() use ( $cdn_url ) {
+					static function () use ( $cdn_url ) {
 						return [
 							$cdn_url => [
 								100,
diff --git a/tests/php/test-amp-img-sanitizer.php b/tests/php/test-amp-img-sanitizer.php
index 9128703ce12..7b9aded9ba4 100644
--- a/tests/php/test-amp-img-sanitizer.php
+++ b/tests/php/test-amp-img-sanitizer.php
@@ -29,7 +29,7 @@ public function set_up() {
 		parent::set_up();
 		add_filter(
 			'amp_extract_image_dimensions_batch',
-			static function( $urls ) {
+			static function ( $urls ) {
 				$dimensions = [];
 				foreach ( array_keys( $urls ) as $url ) {
 					if ( preg_match( '#/(?P<width>\d+)x(?P<height>\d+)$#', $url, $matches ) ) {
@@ -633,7 +633,7 @@ public function test_converter( $source, $expected = null, $args = [], $expected
 		$args = array_merge(
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			],
diff --git a/tests/php/test-amp-script-sanitizer.php b/tests/php/test-amp-script-sanitizer.php
index 070e7ac2c01..9aa4648d34d 100644
--- a/tests/php/test-amp-script-sanitizer.php
+++ b/tests/php/test-amp-script-sanitizer.php
@@ -373,7 +373,7 @@ public function test_cascading_sanitizer_argument_changes_with_custom_scripts( $
 
 		add_filter(
 			'pre_http_request',
-			static function( $preempt, $request, $url ) {
+			static function ( $preempt, $request, $url ) {
 				$r = [
 					'response' => [
 						'code'    => 200,
diff --git a/tests/php/test-amp-style-sanitizer.php b/tests/php/test-amp-style-sanitizer.php
index 969b41aaa1a..9c8ccb3ae1b 100644
--- a/tests/php/test-amp-style-sanitizer.php
+++ b/tests/php/test-amp-style-sanitizer.php
@@ -481,7 +481,7 @@ public function test_body_style_attribute_sanitizer( $source, $expected_content,
 		$error_codes = [];
 		$args        = [
 			'use_document_element'      => $use_document_element,
-			'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+			'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 				$error_codes[] = $error['code'];
 			},
 		];
@@ -919,13 +919,13 @@ public function get_link_and_style_test_data() {
 	public function test_link_and_style_elements( $source, $expected_stylesheets, $expected_errors = [] ) {
 		add_filter(
 			'locale',
-			static function() {
+			static function () {
 				return 'en_US';
 			}
 		);
 		add_filter(
 			'pre_http_request',
-			static function( $preempt, $request, $url ) {
+			static function ( $preempt, $request, $url ) {
 				$preempt = [
 					'response' => [
 						'code' => 200,
@@ -945,7 +945,7 @@ static function( $preempt, $request, $url ) {
 		$error_codes = [];
 		$args        = [
 			'use_document_element'      => true,
-			'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+			'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 				$error_codes[] = $error['code'];
 			},
 		];
@@ -1007,7 +1007,7 @@ public function test_allowlisted_properties_in_declaration_block() {
 			$dom,
 			[
 				'use_document_element' => true,
-				'validation_error_callback' => static function( $error ) use ( &$actual_error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$actual_error_codes ) {
 					$actual_error_codes[] = $error['code'];
 					return true;
 				},
@@ -1918,7 +1918,7 @@ public function test_browser_css_hacks( $input ) {
 			$dom,
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			]
@@ -1947,7 +1947,7 @@ public function test_font_data_url_handling() {
 			$dom,
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			]
@@ -2106,7 +2106,7 @@ static function ( Element $link_element ) {
 
 			$this->assertEqualSets( $expected_urls, $actual_urls, "Is cached: $is_cached" );
 
-			for ( $i = 0; $i < $link_elements_count; $i ++ ) {
+			for ( $i = 0; $i < $link_elements_count; $i++ ) {
 				$this->assertStringEndsWith(
 					$expected_urls[ $i ],
 					$link_elements->item( $i )->getAttribute( 'href' )
@@ -2163,7 +2163,7 @@ public function test_class_amp_bind_preservation() {
 			$dom,
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			]
@@ -2300,7 +2300,7 @@ public function test_large_custom_css_and_rule_removal() {
 			$dom,
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			]
@@ -2412,7 +2412,7 @@ public function test_external_stylesheet_handling( $href, $content_type, $respon
 		$request_count = 0;
 		add_filter(
 			'pre_http_request',
-			function( $preempt, $request, $url ) use ( $href, &$request_count, $content_type, $response_body ) {
+			function ( $preempt, $request, $url ) use ( $href, &$request_count, $content_type, $response_body ) {
 				$this->assertMatchesRegularExpression( '#^https?://#', $url );
 				if ( set_url_scheme( $url, 'https' ) === set_url_scheme( $href, 'https' ) ) {
 					$request_count++;
@@ -2432,7 +2432,7 @@ function( $preempt, $request, $url ) use ( $href, &$request_count, $content_type
 			3
 		);
 
-		$sanitize_and_get_stylesheets = static function() use ( $href ) {
+		$sanitize_and_get_stylesheets = static function () use ( $href ) {
 			$html = sprintf( '<html amp><head><meta charset="utf-8"><link rel="stylesheet" href="%s"></head><body></body></html>', esc_url( $href ) ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 			$dom  = Document::fromHtml( $html, Options::DEFAULTS );
 
@@ -2442,7 +2442,7 @@ function( $preempt, $request, $url ) use ( $href, &$request_count, $content_type
 				$dom,
 				[
 					'use_document_element'      => true,
-					'validation_error_callback' => static function( $error ) use ( &$found_error_codes ) {
+					'validation_error_callback' => static function ( $error ) use ( &$found_error_codes ) {
 						$found_error_codes[] = $error['code'];
 					},
 				]
@@ -2487,7 +2487,7 @@ public function test_external_stylesheet_cache_control() {
 
 		add_filter(
 			'pre_http_request',
-			function( $preempt, $request, $url ) use ( $href, &$request_count, $response_body, $headers, $status_code ) {
+			function ( $preempt, $request, $url ) use ( $href, &$request_count, $response_body, $headers, $status_code ) {
 				$this->assertMatchesRegularExpression( '#^https?://#', $url );
 				if ( set_url_scheme( $url, 'https' ) === set_url_scheme( $href, 'https' ) ) {
 					$request_count++;
@@ -2505,7 +2505,7 @@ function( $preempt, $request, $url ) use ( $href, &$request_count, $response_bod
 			3
 		);
 
-		$sanitize_and_get_stylesheets = static function() use ( $href ) {
+		$sanitize_and_get_stylesheets = static function () use ( $href ) {
 			$html = sprintf( '<html amp><head><meta charset="utf-8"><link rel="stylesheet" href="%s"></head><body></body></html>', esc_url( $href ) ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 			$dom  = Document::fromHtml( $html, Options::DEFAULTS );
 
@@ -2515,7 +2515,7 @@ function( $preempt, $request, $url ) use ( $href, &$request_count, $response_bod
 				$dom,
 				[
 					'use_document_element'      => true,
-					'validation_error_callback' => static function( $error ) use ( &$found_error_codes ) {
+					'validation_error_callback' => static function ( $error ) use ( &$found_error_codes ) {
 						$found_error_codes[] = $error['code'];
 					},
 				]
@@ -2629,7 +2629,7 @@ public function test_external_stylesheet( $style_url, $http_response, $expected_
 
 		add_filter(
 			'pre_http_request',
-			function( $preempt, $request, $url ) use ( $style_url, $http_response, &$request_count ) {
+			function ( $preempt, $request, $url ) use ( $style_url, $http_response, &$request_count ) {
 				$this->assertMatchesRegularExpression( '#^https?://#', $url );
 				if ( set_url_scheme( $url, 'https' ) === set_url_scheme( $style_url, 'https' ) ) {
 					$request_count++;
@@ -2647,7 +2647,7 @@ function( $preempt, $request, $url ) use ( $style_url, $http_response, &$request
 			3
 		);
 
-		$sanitize_and_get_stylesheets = static function( $css_url ) {
+		$sanitize_and_get_stylesheets = static function ( $css_url ) {
 			$html = sprintf( '<html amp><head><meta charset="utf-8"><link rel="stylesheet" href="%s"></head><body></body></html>', esc_url( $css_url ) ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 			$dom  = Document::fromHtml( $html, Options::DEFAULTS );
 
@@ -2657,7 +2657,7 @@ function( $preempt, $request, $url ) use ( $style_url, $http_response, &$request
 				$dom,
 				[
 					'use_document_element'      => true,
-					'validation_error_callback' => static function( $error ) use ( &$found_error_codes ) {
+					'validation_error_callback' => static function ( $error ) use ( &$found_error_codes ) {
 						$found_error_codes[] = $error['code'];
 					},
 				]
@@ -2776,7 +2776,7 @@ public function test_keyframe_sanitizer( $source, $expected = null, $expected_er
 			$dom,
 			[
 				'use_document_element' => true,
-				'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+				'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 					$error_codes[] = $error['code'];
 				},
 			]
@@ -3034,7 +3034,7 @@ public function test_font_urls( $url, $error_codes ) {
 			$dom,
 			[
 				'use_document_element'      => true,
-				'validation_error_callback' => static function( $error ) use ( &$validation_errors ) {
+				'validation_error_callback' => static function ( $error ) use ( &$validation_errors ) {
 					$validation_errors[] = $error;
 				},
 			]
@@ -3202,7 +3202,7 @@ static function ( WP_UnitTestCase $test, $stylesheet ) {
 				includes_url( '/dynamic/import-buttons.php' ),
 				'<style>div::after{content:"After import-buttons"}</style><body class="wp-core-ui"><div><button class="button"></button></div></body>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 				1,
-				static function( $requested_url ) {
+				static function ( $requested_url ) {
 					if ( false !== strpos( $requested_url, 'import-buttons.php' ) ) {
 						return '@import url( "../css/./foo/../buttons.css" );body{color:#123456}';
 					}
@@ -3220,7 +3220,7 @@ static function ( WP_UnitTestCase $test, $stylesheet ) {
 				includes_url( '/dynamic/import-buttons.php' ),
 				'<style>div::after{content:"After import-buttons2"}</style><body class="wp-core-ui"><div><button class="button"></button></div></body>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 				1,
-				static function( $requested_url ) {
+				static function ( $requested_url ) {
 					if ( false !== strpos( $requested_url, 'import-buttons.php' ) ) {
 						return sprintf( '@import "%s";body{color:#123456}', plugins_url( 'tests/php/data/css/buttons.css', AMP__FILE__ ) );
 					}
@@ -3238,7 +3238,7 @@ static function ( WP_UnitTestCase $test, $stylesheet ) {
 				includes_url( '/dynamic/import-buttons.php' ),
 				'<style>div::after{content:"After import-buttons2"}</style><body><div></div></body>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 				2,
-				static function( $requested_url ) {
+				static function ( $requested_url ) {
 					$self_call_url = includes_url( '/dynamic/nested.php' );
 					if ( false !== strpos( $requested_url, 'import-buttons.php' ) ) {
 						return sprintf( '@import "%s";body{color:#123456}', $self_call_url );
@@ -3293,7 +3293,7 @@ static function ( $stylesheet_url ) {
 
 		add_filter(
 			'pre_http_request',
-			static function( $preempt, $request, $url ) use ( $mock_response, $stylesheet_urls, &$http_request_count ) {
+			static function ( $preempt, $request, $url ) use ( $mock_response, $stylesheet_urls, &$http_request_count ) {
 				$http_request_count++;
 				if ( $mock_response ) {
 					$body = $mock_response( $url, $stylesheet_urls );
@@ -3494,7 +3494,7 @@ function () use ( $render_template ) {
 					require_once get_template_directory() . '/functions.php';
 					add_action(
 						'wp_head',
-						static function() {
+						static function () {
 							printf( '<style media=print id="early-print-style">html:after { content:"earlyprintstyle %s"; }</style>', esc_html( str_repeat( 'a', 75000 - 10 ) ) );
 						},
 						-1000
@@ -3505,7 +3505,7 @@ static function() {
 
 					add_action(
 						'wp_footer',
-						function() {
+						function () {
 							?>
 							<figure class="wp-block-audio"><figcaption></figcaption></figure>
 							<div class="wp-block-foo"><figcaption></figcaption></div>
@@ -3518,7 +3518,7 @@ function() {
 
 					return $render_template();
 				},
-				function( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
+				function ( $original_dom, $original_source, $amphtml_dom, $amphtml_source ) {
 					/**
 					 * Vars.
 					 *
@@ -3596,7 +3596,7 @@ public function test_prioritized_stylesheets( $html_generator, $assert ) {
 		$error_codes = [];
 		$args        = [
 			'use_document_element'      => true,
-			'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+			'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 				$error_codes[] = $error['code'];
 			},
 		];
diff --git a/tests/php/test-amp-wordpress-embed-handler.php b/tests/php/test-amp-wordpress-embed-handler.php
index 8d025ff122e..7d4483cb42e 100644
--- a/tests/php/test-amp-wordpress-embed-handler.php
+++ b/tests/php/test-amp-wordpress-embed-handler.php
@@ -16,7 +16,8 @@
  */
 class AMP_WordPress_Embed_Handler_Test extends TestCase {
 
-	use MarkupComparison, WithoutBlockPreRendering;
+	use MarkupComparison;
+	use WithoutBlockPreRendering;
 
 	/** @var string */
 	const WP_59_ALPHA_POST_URL = 'https://make.wordpress.org/core/2021/10/12/proposal-for-a-performance-team/';
diff --git a/tests/php/test-class-amp-accessibility-sanitizer.php b/tests/php/test-class-amp-accessibility-sanitizer.php
index a686350ccdb..025686f9637 100644
--- a/tests/php/test-class-amp-accessibility-sanitizer.php
+++ b/tests/php/test-class-amp-accessibility-sanitizer.php
@@ -153,7 +153,6 @@ public function get_skip_link_test_data() {
 				'expected' => '<div id="main-container">Hello World!</div>',
 			],
 		];
-
 	}
 
 	/**
@@ -211,6 +210,5 @@ public function test_add_skip_link_for_none_fse_theme() {
 		$actual = AMP_DOM_Utils::get_content_from_dom( $dom );
 
 		$this->assertEqualMarkup( $expected, $actual );
-
 	}
 }
diff --git a/tests/php/test-class-amp-base-sanitizer.php b/tests/php/test-class-amp-base-sanitizer.php
index 5ef6072d3c8..8e95645873f 100644
--- a/tests/php/test-class-amp-base-sanitizer.php
+++ b/tests/php/test-class-amp-base-sanitizer.php
@@ -611,7 +611,7 @@ public function test_remove_invalid_attribute() {
 		$sanitizer = new AMP_Video_Sanitizer(
 			$dom,
 			[
-				'validation_error_callback' => static function( $error, $context ) use ( $that ) {
+				'validation_error_callback' => static function ( $error, $context ) use ( $that ) {
 					$that->assertEquals(
 						[
 							'node_name'          => 'onload',
@@ -642,7 +642,7 @@ public function test_remove_invalid_attribute() {
 		$sanitizer = new AMP_Video_Sanitizer(
 			$dom,
 			[
-				'validation_error_callback' => static function( $error, $context ) use ( $that ) {
+				'validation_error_callback' => static function ( $error, $context ) use ( $that ) {
 					$that->assertEquals(
 						[
 							'node_name'          => 'onload',
diff --git a/tests/php/test-class-amp-cli-option-command.php b/tests/php/test-class-amp-cli-option-command.php
index 35b42ad370d..54703853881 100644
--- a/tests/php/test-class-amp-cli-option-command.php
+++ b/tests/php/test-class-amp-cli-option-command.php
@@ -21,7 +21,8 @@
  */
 class Test_AMP_CLI_Option_Command extends DependencyInjectedTestCase {
 
-	use PrivateAccess, MockAdminUser;
+	use PrivateAccess;
+	use MockAdminUser;
 
 	/**
 	 * OptionCommand instance.
diff --git a/tests/php/test-class-amp-cli-validation-command.php b/tests/php/test-class-amp-cli-validation-command.php
index 6ae7c09fcc2..c41d495c538 100644
--- a/tests/php/test-class-amp-cli-validation-command.php
+++ b/tests/php/test-class-amp-cli-validation-command.php
@@ -20,7 +20,8 @@
  */
 class Test_AMP_CLI_Validation_Command extends DependencyInjectedTestCase {
 
-	use PrivateAccess, ValidationRequestMocking;
+	use PrivateAccess;
+	use ValidationRequestMocking;
 
 	/**
 	 * Store a reference to the validation command object.
diff --git a/tests/php/test-class-amp-customizer-design-settings.php b/tests/php/test-class-amp-customizer-design-settings.php
index a2501963372..e80f984e8f4 100644
--- a/tests/php/test-class-amp-customizer-design-settings.php
+++ b/tests/php/test-class-amp-customizer-design-settings.php
@@ -88,7 +88,6 @@ public function test_is_amp_customizer_enabled_and_init( callable $set_up, $enab
 
 		$this->assertEquals( $enabled ? 10 : false, has_action( 'amp_customizer_init', [ AMP_Customizer_Design_Settings::class, 'init_customizer' ] ) );
 		$this->assertEquals( $enabled ? 10 : false, has_filter( 'amp_customizer_get_settings', [ AMP_Customizer_Design_Settings::class, 'append_settings' ] ) );
-
 	}
 
 	/** @return array */
diff --git a/tests/php/test-class-amp-gallery-block-sanitizer.php b/tests/php/test-class-amp-gallery-block-sanitizer.php
index ce8cfc4f40e..089a5c39688 100644
--- a/tests/php/test-class-amp-gallery-block-sanitizer.php
+++ b/tests/php/test-class-amp-gallery-block-sanitizer.php
@@ -14,7 +14,8 @@
  */
 class AMP_Gallery_Block_Sanitizer_Test extends TestCase {
 
-	use PrivateAccess, MarkupComparison;
+	use PrivateAccess;
+	use MarkupComparison;
 
 	/**
 	 * Get data.
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index 8c80d54838d..70dfeec1cbb 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -28,7 +28,7 @@ public function set_up() {
 		// Mock the HTTP request.
 		add_filter(
 			'pre_oembed_result',
-			static function( $pre, $url ) {
+			static function ( $pre, $url ) {
 				if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
 					return $pre;
 				}
diff --git a/tests/php/test-class-amp-http.php b/tests/php/test-class-amp-http.php
index fe83c0565d8..b42e96e584c 100644
--- a/tests/php/test-class-amp-http.php
+++ b/tests/php/test-class-amp-http.php
@@ -548,7 +548,7 @@ public function test_handle_wp_die() {
 		add_filter( 'wp_doing_ajax', '__return_true' );
 		add_filter(
 			'wp_die_ajax_handler',
-			static function() {
+			static function () {
 				return '__return_null';
 			}
 		);
@@ -572,7 +572,7 @@ public function test_filter_comment_post_redirect() {
 		add_filter( 'wp_doing_ajax', '__return_true' );
 		add_filter(
 			'wp_die_ajax_handler',
-			static function() {
+			static function () {
 				return '__return_null';
 			}
 		);
@@ -602,7 +602,7 @@ static function() {
 		);
 		add_filter(
 			'amp_comment_posted_message',
-			static function( $message, WP_Comment $filter_comment ) {
+			static function ( $message, WP_Comment $filter_comment ) {
 				return sprintf( '(comment=%d,approved=%d)', $filter_comment->comment_ID, $filter_comment->comment_approved );
 			},
 			10,
diff --git a/tests/php/test-class-amp-imgur-embed-handler.php b/tests/php/test-class-amp-imgur-embed-handler.php
index 810b2cb37aa..6f1ab0b58e2 100644
--- a/tests/php/test-class-amp-imgur-embed-handler.php
+++ b/tests/php/test-class-amp-imgur-embed-handler.php
@@ -26,7 +26,7 @@ public function set_up() {
 		// Mock the HTTP request.
 		add_filter(
 			'pre_http_request',
-			static function( $pre, $r, $url ) {
+			static function ( $pre, $r, $url ) {
 				if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
 					return $pre;
 				}
diff --git a/tests/php/test-class-amp-link-sanitizer.php b/tests/php/test-class-amp-link-sanitizer.php
index c1c00b6ea78..a1cf924ce56 100644
--- a/tests/php/test-class-amp-link-sanitizer.php
+++ b/tests/php/test-class-amp-link-sanitizer.php
@@ -386,7 +386,7 @@ public function test_is_frontend_url( $url, $expected ) {
 
 			add_filter(
 				'home_url',
-				static function() use ( $new_home_url ) {
+				static function () use ( $new_home_url ) {
 					return $new_home_url;
 				}
 			);
diff --git a/tests/php/test-class-amp-nav-menu-toggle-sanitizer.php b/tests/php/test-class-amp-nav-menu-toggle-sanitizer.php
index 3d800095dfb..fa3d6df277f 100644
--- a/tests/php/test-class-amp-nav-menu-toggle-sanitizer.php
+++ b/tests/php/test-class-amp-nav-menu-toggle-sanitizer.php
@@ -30,13 +30,13 @@ public function data_converter() {
 		$head      = '<head><meta charset="utf-8"></head>';
 
 		$amp_state               = '<amp-state id="navMenuToggledOn"><script type="application/json">false</script></amp-state>';
-		$amp_get_container_attrs = function( $class = '', $toggle_class = 'toggled-on' ) {
+		$amp_get_container_attrs = function ( $class = '', $toggle_class = 'toggled-on' ) {
 			if ( empty( $toggle_class ) ) {
 				return '';
 			}
 			return ' data-amp-bind-class="&quot;' . $class . '&quot; + ( navMenuToggledOn ? &quot; ' . $toggle_class . '&quot; : \'\' )"';
 		};
-		$amp_get_toggle_attrs    = function( $class = '', $toggle_class = 'toggled-on' ) { // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning -- Sniff has a bug.
+		$amp_get_toggle_attrs    = function ( $class = '', $toggle_class = 'toggled-on' ) { // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning -- Sniff has a bug.
 			return ' on="tap:AMP.setState({ navMenuToggledOn: ! navMenuToggledOn })" aria-expanded="false" data-amp-bind-aria-expanded="navMenuToggledOn ? \'true\' : \'false\'"' . ( ! empty( $toggle_class ) ? ' data-amp-bind-class="&quot;' . $class . '&quot; + ( navMenuToggledOn ? &quot; ' . $toggle_class . '&quot; : \'\' )"' : '' );
 		};
 
diff --git a/tests/php/test-class-amp-post-type-support.php b/tests/php/test-class-amp-post-type-support.php
index cc729e06fb3..d90a5fe8ed8 100644
--- a/tests/php/test-class-amp-post-type-support.php
+++ b/tests/php/test-class-amp-post-type-support.php
@@ -92,7 +92,6 @@ static function ( $post_types ) {
 			],
 			AMP_Post_Type_Support::get_eligible_post_types()
 		);
-
 	}
 
 	/**
diff --git a/tests/php/test-class-amp-reader-themes-rest-controller.php b/tests/php/test-class-amp-reader-themes-rest-controller.php
index aa964d183d8..d74a0e6238b 100644
--- a/tests/php/test-class-amp-reader-themes-rest-controller.php
+++ b/tests/php/test-class-amp-reader-themes-rest-controller.php
@@ -80,7 +80,7 @@ public function test_get_items() {
 			$this->assertContains( $expected_reader_theme, $actual_reader_themes );
 		}
 
-		$filter = static function() {
+		$filter = static function () {
 			return [
 				[
 					'name'           => 'My theme',
@@ -131,7 +131,7 @@ public function test_get_items_header_with_themes_api_failure() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_header_with_themes_api_empty_array() {
-		$filter_cb = static function() {
+		$filter_cb = static function () {
 			return (object) [ 'themes' => [] ];
 		};
 		add_filter( 'themes_api_result', $filter_cb );
@@ -141,7 +141,6 @@ public function test_get_items_header_with_themes_api_empty_array() {
 			[ 'X-AMP-Theme-API-Error' => 'The default reader themes cannot be displayed because a plugin appears to be overriding the themes response from WordPress.org.' ],
 			$response->get_headers()
 		);
-
 	}
 
 	/**
@@ -150,7 +149,7 @@ public function test_get_items_header_with_themes_api_empty_array() {
 	 * @covers ::get_items
 	 */
 	public function test_themes_api_remote_wp_error() {
-		$filter_cb = static function() {
+		$filter_cb = static function () {
 			return new WP_Error(
 				'amp_test_error',
 				'Test message'
diff --git a/tests/php/test-class-amp-service-worker.php b/tests/php/test-class-amp-service-worker.php
index a70c57818b7..9681badb004 100644
--- a/tests/php/test-class-amp-service-worker.php
+++ b/tests/php/test-class-amp-service-worker.php
@@ -227,7 +227,7 @@ public function test_handle_service_worker_iframe_install() {
 		add_filter(
 			'wp_die_handler',
 			static function () {
-				return static function() {
+				return static function () {
 					throw new Exception( 'exited' );
 				};
 			}
diff --git a/tests/php/test-class-amp-srcset-sanitizer.php b/tests/php/test-class-amp-srcset-sanitizer.php
index 3a24259ccc4..b7b7dd81f86 100644
--- a/tests/php/test-class-amp-srcset-sanitizer.php
+++ b/tests/php/test-class-amp-srcset-sanitizer.php
@@ -140,7 +140,7 @@ public function test_sanitize( $source, $expected = null, $expected_error_codes
 
 		$args = [
 			'use_document_element'      => true,
-			'validation_error_callback' => static function( $error ) use ( &$error_codes ) {
+			'validation_error_callback' => static function ( $error ) use ( &$error_codes ) {
 				$error_codes[] = $error['code'];
 			},
 		];
diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php
index 3870a22be84..52c3a35b7f7 100644
--- a/tests/php/test-class-amp-theme-support.php
+++ b/tests/php/test-class-amp-theme-support.php
@@ -183,14 +183,14 @@ public function test_supports_reader_mode() {
 		// Add filters so that get_template_directory() the theme in the mock filesystem.
 		add_filter(
 			'theme_root',
-			function() use ( $mock_directory ) {
+			function () use ( $mock_directory ) {
 				return $mock_directory->url();
 			}
 		);
 
 		add_filter(
 			'template',
-			function() use ( $mock_theme ) {
+			function () use ( $mock_theme ) {
 				return $mock_theme;
 			}
 		);
@@ -498,7 +498,7 @@ public function test_get_template_availability() {
 		AMP_Options_Manager::update_option( Option::SUPPORTED_TEMPLATES, [ 'is_special', 'is_custom', 'is_page' ] );
 		add_filter(
 			'amp_supportable_templates',
-			static function( $templates ) {
+			static function ( $templates ) {
 				$templates['is_single']        = [
 					'label'  => 'Single post',
 					'parent' => 'is_singular',
@@ -506,7 +506,7 @@ static function( $templates ) {
 				$templates['is_special']       = [
 					'label'    => 'Special post',
 					'parent'   => 'is_single',
-					'callback' => static function( WP_Query $query ) {
+					'callback' => static function ( WP_Query $query ) {
 						return $query->is_singular() && 'special' === get_post( $query->get_queried_object_id() )->post_name;
 					},
 				];
@@ -516,14 +516,14 @@ static function( $templates ) {
 				];
 				$templates['is_custom']        = [
 					'label'    => 'Custom',
-					'callback' => static function( WP_Query $query ) {
+					'callback' => static function ( WP_Query $query ) {
 						return false !== $query->get( 'custom', false );
 					},
 				];
 				$templates['is_custom[thing]'] = [
 					'label'    => 'Custom Thing',
 					'parent'   => 'is_custom',
-					'callback' => static function( WP_Query $query ) {
+					'callback' => static function ( WP_Query $query ) {
 						return 'thing' === $query->get( 'custom', false );
 					},
 				];
@@ -532,7 +532,7 @@ static function( $templates ) {
 		);
 		add_filter(
 			'query_vars',
-			static function( $vars ) {
+			static function ( $vars ) {
 				$vars[] = 'custom';
 				return $vars;
 			}
@@ -637,7 +637,7 @@ static function ( $templates ) {
 				$templates['missing_parent'] = [
 					'label'    => 'Missing parent',
 					'parent'   => 'is_unknown',
-					'callback' => static function( WP_Query $query ) {
+					'callback' => static function ( WP_Query $query ) {
 						return false !== $query->get( 'missing_parent', false );
 					},
 				];
@@ -753,10 +753,10 @@ public function test_get_supportable_templates() {
 		// Test inclusion of custom template.
 		add_filter(
 			'amp_supportable_templates',
-			static function( $templates ) {
+			static function ( $templates ) {
 				$templates['is_custom'] = [
 					'label'    => 'Custom',
-					'callback' => static function( WP_Query $query ) {
+					'callback' => static function ( WP_Query $query ) {
 						return false !== $query->get( 'custom', false );
 					},
 				];
@@ -1017,13 +1017,13 @@ public function test_init_admin_bar() {
 
 		add_action(
 			'admin_bar_init',
-			function() {
+			function () {
 				wp_enqueue_style( 'example-admin-bar', 'https://example.com/example-admin-bar.css', [ 'admin-bar' ], '0.1' );
 				wp_enqueue_script( 'example-admin-bar', 'https://example.com/example-admin-bar.js', [ 'admin-bar' ], '0.1', false );
 			}
 		);
 
-		$callback = function() {
+		$callback = function () {
 			?>
 			<style type="text/css" media="screen">
 				html { margin-top: 64px !important; }
@@ -1621,7 +1621,7 @@ public function test_finish_output_buffering() {
 		ob_start();
 		echo 'foo';
 		ob_start(
-			static function( $response ) {
+			static function ( $response ) {
 				return strtoupper( $response );
 			}
 		);
@@ -1640,7 +1640,6 @@ static function( $response ) {
 		$this->assertStringContainsString( 'BAR', $output );
 		$this->assertStringContainsString( '<amp-video src="test.mp4"', $output );
 		$this->assertStringNotContainsString( '<script data-test', $output );
-
 	}
 
 	/**
@@ -1693,7 +1692,7 @@ static function ( $url ) {
 
 		$this->set_private_property( AMP_Theme_Support::class, 'metadata', amp_get_schemaorg_metadata() );
 
-		$call_prepare_response = static function() use ( $original_html ) {
+		$call_prepare_response = static function () use ( $original_html ) {
 			AMP_HTTP::$headers_sent                     = [];
 			AMP_Validation_Manager::$validation_results = [];
 			return AMP_Theme_Support::prepare_response( $original_html );
@@ -1783,7 +1782,7 @@ function ( $dom, $effective_sandboxing_level ) {
 				if ( ! isset( $removed_nodes[ $node_name ] ) ) {
 					$removed_nodes[ $node_name ] = 0;
 				}
-				$removed_nodes[ $node_name ]++;
+				++$removed_nodes[ $node_name ];
 			}
 		}
 
@@ -2109,7 +2108,7 @@ static function ( $script ) {
 
 		add_action(
 			'wp_enqueue_scripts',
-			static function() {
+			static function () {
 				wp_enqueue_script( 'amp-list' );
 				wp_enqueue_style( 'my-font', 'https://fonts.googleapis.com/css?family=Tangerine', [], null ); // phpcs:ignore
 			}
@@ -2117,7 +2116,7 @@ static function() {
 
 		add_filter(
 			'script_loader_tag',
-			static function( $tag, $handle ) {
+			static function ( $tag, $handle ) {
 				if ( ! wp_scripts()->get_data( $handle, 'conditional' ) ) {
 					$tag = preg_replace( '/(?<=<script)/', " handle='$handle' ", $tag );
 				}
@@ -2129,7 +2128,7 @@ static function( $tag, $handle ) {
 
 		add_action(
 			'wp_footer',
-			static function() {
+			static function () {
 				wp_print_scripts( 'amp-mathml' );
 				?>
 				<amp-mathml layout="container" data-formula="\[x = {-b \pm \sqrt{b^2-4ac} \over 2a}.\]"></amp-mathml>
@@ -2140,7 +2139,7 @@ static function() {
 
 		add_filter(
 			'get_site_icon_url',
-			static function() {
+			static function () {
 				return home_url( '/favicon.png' );
 			}
 		);
@@ -2388,7 +2387,7 @@ public function test_prepare_response_redirect() {
 		$this->go_to( home_url( '/?amp=1' ) );
 		add_filter(
 			'amp_content_sanitizers',
-			static function( $sanitizers ) {
+			static function ( $sanitizers ) {
 				$sanitizers[ AMP_Theme_Support_Sanitizer_Counter::class ] = [];
 				return $sanitizers;
 			}
@@ -2413,7 +2412,7 @@ static function( $sanitizers ) {
 		$redirects = [];
 		add_filter(
 			'wp_redirect',
-			static function( $url ) use ( &$redirects ) {
+			static function ( $url ) use ( &$redirects ) {
 				array_unshift( $redirects, $url );
 				return '';
 			}
@@ -2511,6 +2510,6 @@ class AMP_Theme_Support_Sanitizer_Counter extends AMP_Base_Sanitizer {
 	 * "Sanitize".
 	 */
 	public function sanitize() {
-		self::$count++;
+		++self::$count;
 	}
 }
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index 8d9e7009998..31d0d869a06 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -153,6 +153,5 @@ public function test_filter_oembed_html( $cache, $url, $expected ) {
 			$expected,
 			$handler->filter_oembed_html( $cache, $url )
 		);
-
 	}
 }
diff --git a/tests/php/test-dom-element-list.php b/tests/php/test-dom-element-list.php
index d0e8e6888d7..7dc68781dc0 100644
--- a/tests/php/test-dom-element-list.php
+++ b/tests/php/test-dom-element-list.php
@@ -84,7 +84,7 @@ public function test_dom_element_list_get_iterator( $images, $expected_count ) {
 		$iteration_count = 0;
 		foreach ( $dom_element_list as $dom_element_list_image ) {
 			unset( $dom_element_list_image );
-			$iteration_count++;
+			++$iteration_count;
 		}
 
 		$this->assertEquals( $expected_count, $iteration_count );
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 52adaf8359f..32f3d1e985c 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -1104,7 +1104,7 @@ static function () {
 			],
 
 			'attribute_amp_accordion_value'                => call_user_func(
-				static function() {
+				static function () {
 					$html = str_replace(
 						[ "\n", "\t" ],
 						'',
@@ -3810,7 +3810,7 @@ public function test_sanitize( $source, $expected = null, $expected_scripts = []
 			array_merge(
 				[
 					'use_document_element'      => true,
-					'validation_error_callback' => static function( $error ) use ( &$actual_errors ) {
+					'validation_error_callback' => static function ( $error ) use ( &$actual_errors ) {
 						$actual_errors[] = $error;
 						return true;
 					},
@@ -3858,7 +3858,7 @@ public function test_sanitize_body_only() {
 			$dom,
 			[
 				'use_document_element'      => false,
-				'validation_error_callback' => static function( $error ) use ( &$actual_errors ) {
+				'validation_error_callback' => static function ( $error ) use ( &$actual_errors ) {
 					$actual_errors[] = $error;
 					return true;
 				},
@@ -4200,7 +4200,7 @@ public function test_replace_node_with_children_validation_errors( $source_conte
 		$sanitizer = new AMP_Tag_And_Attribute_Sanitizer(
 			$dom,
 			[
-				'validation_error_callback' => function( $error, $context ) use ( &$expected_errors, $sanitize ) {
+				'validation_error_callback' => function ( $error, $context ) use ( &$expected_errors, $sanitize ) {
 					$expected = array_shift( $expected_errors );
 					$this->assertIsArray( $expected );
 					$tag = $expected['node_name'];
diff --git a/tests/php/test-uninstall.php b/tests/php/test-uninstall.php
index 8b27356731d..d46e3ed101d 100644
--- a/tests/php/test-uninstall.php
+++ b/tests/php/test-uninstall.php
@@ -13,11 +13,11 @@
 use AmpProject\AmpWP\Validation\URLValidationCron;
 use AmpProject\AmpWP\DevTools\BlockSources;
 
-use function \AmpProject\AmpWP\delete_options;
-use function \AmpProject\AmpWP\delete_user_metadata;
-use function \AmpProject\AmpWP\delete_posts;
-use function \AmpProject\AmpWP\delete_terms;
-use function \AmpProject\AmpWP\delete_transients;
+use function AmpProject\AmpWP\delete_options;
+use function AmpProject\AmpWP\delete_user_metadata;
+use function AmpProject\AmpWP\delete_posts;
+use function AmpProject\AmpWP\delete_terms;
+use function AmpProject\AmpWP\delete_transients;
 
 /**
  * @runInSeparateProcess
diff --git a/tests/php/test-wp-http-remote-get-request.php b/tests/php/test-wp-http-remote-get-request.php
index a769a301132..0c07e6706e7 100644
--- a/tests/php/test-wp-http-remote-get-request.php
+++ b/tests/php/test-wp-http-remote-get-request.php
@@ -48,7 +48,7 @@ public function test_processing_headers( $headers, $header_to_check, $expected )
 
 		add_filter(
 			'pre_http_request',
-			function( $preempt, $request, $url ) use ( $href, $headers ) {
+			function ( $preempt, $request, $url ) use ( $href, $headers ) {
 				$this->assertMatchesRegularExpression( '#^https?://#', $url );
 				if ( set_url_scheme( $url, 'https' ) === set_url_scheme( $href, 'https' ) ) {
 					$preempt = [
diff --git a/tests/php/validation/test-class-amp-validated-url-post-type.php b/tests/php/validation/test-class-amp-validated-url-post-type.php
index 228903a9892..e2cfc2d23f8 100644
--- a/tests/php/validation/test-class-amp-validated-url-post-type.php
+++ b/tests/php/validation/test-class-amp-validated-url-post-type.php
@@ -194,7 +194,7 @@ public function test_get_invalid_url_validation_errors() {
 
 		add_filter(
 			'amp_validation_error_default_sanitized',
-			static function( $sanitized, $error ) {
+			static function ( $sanitized, $error ) {
 				if ( 'new accepted' === $error['code'] ) {
 					$sanitized = true;
 				} elseif ( 'new rejected' === $error['code'] ) {
@@ -208,7 +208,7 @@ static function( $sanitized, $error ) {
 
 		add_filter(
 			'amp_validation_error_sanitized',
-			static function( $sanitized, $error ) {
+			static function ( $sanitized, $error ) {
 				if ( 'accepted' === $error['code'] ) {
 					$sanitized = true;
 				} elseif ( 'rejected' === $error['code'] ) {
@@ -375,7 +375,7 @@ public function test_store_validation_errors() {
 
 		add_filter(
 			'amp_validation_error_sanitized',
-			static function( $sanitized, $error ) {
+			static function ( $sanitized, $error ) {
 				if ( 'accepted' === $error['code'] ) {
 					$sanitized = true;
 				} elseif ( 'rejected' === $error['code'] ) {
@@ -484,7 +484,7 @@ static function( $sanitized, $error ) {
 		$this->assertEquals(
 			$errors,
 			array_map(
-				static function( $stored_error ) {
+				static function ( $stored_error ) {
 					return $stored_error['data'];
 				},
 				$stored_errors
@@ -1156,12 +1156,12 @@ public function test_handle_bulk_action() {
 		// The action isn't correct, so the callback should return the URL unchanged.
 		$this->assertEquals( $initial_redirect, AMP_Validated_URL_Post_Type::handle_bulk_action( $initial_redirect, 'trash', $items ) );
 
-		$filter = function() {
+		$filter = function () {
 			return [
 				'body' => wp_json_encode(
 					[
 						'results' => array_map(
-							static function( $error ) {
+							static function ( $error ) {
 								return array_merge(
 									compact( 'error' ),
 									[ 'sanitized' => false ]
@@ -1189,7 +1189,7 @@ static function( $error ) {
 		// Test error scenario.
 		add_filter(
 			'pre_http_request',
-			static function() {
+			static function () {
 				return [
 					'body' => '<html></html>',
 				];
@@ -1270,19 +1270,19 @@ public function test_handle_validate_request() {
 		$exception = null;
 		add_filter(
 			'wp_redirect',
-			static function( $url, $status ) {
+			static function ( $url, $status ) {
 				throw new Exception( $url, $status );
 			},
 			10,
 			2
 		);
 
-		$filter = function() {
+		$filter = function () {
 			return [
 				'body' => wp_json_encode(
 					[
 						'results' => array_map(
-							static function( $error ) {
+							static function ( $error ) {
 								return array_merge(
 									compact( 'error' ),
 									[ 'sanitized' => false ]
@@ -1296,7 +1296,7 @@ static function( $error ) {
 		};
 		add_filter( 'pre_http_request', $filter, 10, 3 );
 
-		$handle_validate_request = static function() {
+		$handle_validate_request = static function () {
 			try {
 				AMP_Validated_URL_Post_Type::handle_validate_request();
 			} catch ( Exception $exception ) {
@@ -1403,7 +1403,7 @@ public function test_recheck_post() {
 		);
 		add_filter(
 			'pre_http_request',
-			static function() {
+			static function () {
 				return [
 					'body' => wp_json_encode(
 						[
@@ -1494,7 +1494,7 @@ public function test_handle_validation_error_status_update() {
 
 		add_filter(
 			'pre_http_request',
-			static function() use ( $errors ) {
+			static function () use ( $errors ) {
 				$results = array_map(
 					static function ( $error ) {
 						return [
@@ -1542,7 +1542,7 @@ static function ( $error ) {
 
 		add_filter(
 			'wp_redirect',
-			static function( $url, $status ) {
+			static function ( $url, $status ) {
 				throw new Exception( $url, $status );
 			},
 			10,
@@ -2008,7 +2008,6 @@ public function test_filter_post_row_actions() {
 		$this->assertArrayNotHasKey( 'trash', $filtered_actions );
 		$this->assertArrayHasKey( 'delete', $filtered_actions );
 		$this->assertStringContainsString( 'Forget</a>', $filtered_actions['delete'] );
-
 	}
 
 	/**
diff --git a/tests/php/validation/test-class-amp-validation-error-taxonomy.php b/tests/php/validation/test-class-amp-validation-error-taxonomy.php
index 9e337c65d55..b0f784f2daa 100644
--- a/tests/php/validation/test-class-amp-validation-error-taxonomy.php
+++ b/tests/php/validation/test-class-amp-validation-error-taxonomy.php
@@ -997,7 +997,6 @@ function ( $actions ) {
 		$actions = AMP_Validation_Error_Taxonomy::filter_tag_row_actions( $initial_actions, get_term( $term_this_taxonomy ) );
 		$this->assertTrue( array_key_exists( 'copy', $actions ) );
 		$this->assertStringContainsString( 'Copy to clipboard', $actions['copy'] );
-
 	}
 
 	/**
@@ -1486,7 +1485,7 @@ public function test_handle_validation_error_update() {
 	public function test_handle_clear_empty_terms_request() {
 		add_filter(
 			'wp_redirect',
-			static function() {
+			static function () {
 				throw new Exception( 'redirected' );
 			}
 		);
diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php
index ab059a79144..16dc8eb2456 100644
--- a/tests/php/validation/test-class-amp-validation-manager.php
+++ b/tests/php/validation/test-class-amp-validation-manager.php
@@ -343,8 +343,8 @@ public function test_init_validate_request_with_error() {
 		$died = false;
 		add_filter(
 			'wp_die_ajax_handler',
-			function() use ( &$died ) {
-				return function() use ( &$died ) {
+			function () use ( &$died ) {
+				return function () use ( &$died ) {
 					$died = true;
 				};
 			}
@@ -745,7 +745,7 @@ public function test_add_validation_error_track_removed() {
 		$node = $this->node;
 		add_filter(
 			'amp_validation_error',
-			static function( $error, $context ) use ( $node, $that ) {
+			static function ( $error, $context ) use ( $node, $that ) {
 				$error['filtered'] = true;
 				$that->assertEquals( AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_TAG, $error['code'] );
 				$that->assertSame( $node, $context['node'] );
@@ -1247,7 +1247,7 @@ function ( ...$sources_sets ) {
 						$amp_source_count = 0;
 						foreach ( $sources as $source ) {
 							if ( 'plugin' === $source['type'] && 'amp' === $source['name'] ) {
-								$amp_source_count++;
+								++$amp_source_count;
 							}
 						}
 						$this->assertGreaterThanOrEqual( 1, $amp_source_count );
@@ -1561,7 +1561,7 @@ public function test_callback_wrappers() {
 		AMP_Validation_Manager::add_validation_error_sourcing();
 
 		$increment_var_by_ref = function ( &$number ) {
-			$number++;
+			++$number;
 			echo "<output>$number</output>"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		};
 
@@ -1682,14 +1682,14 @@ public function test_callback_wrappers_for_nested_actions() {
 		$handle_outer_action = null;
 
 		// Ensure that nested actions output the expected stack, and that has_action() works as expected in spite of the function wrapping.
-		$handle_outer_action = function() use ( &$handle_outer_action, &$handle_inner_action ) {
+		$handle_outer_action = function () use ( &$handle_outer_action, &$handle_inner_action ) {
 			$this->assertEquals( 10, has_action( 'outer_action', $handle_outer_action ) );
 			$this->assertEquals( 10, has_action( 'inner_action', $handle_inner_action ) );
 			do_action( 'inner_action' );
 			$this->assertEquals( 10, has_action( 'inner_action', $handle_inner_action ) );
 		};
 		$outer_reflection    = new ReflectionFunction( $handle_outer_action );
-		$handle_inner_action = function() use ( &$handle_outer_action, &$handle_inner_action ) {
+		$handle_inner_action = function () use ( &$handle_outer_action, &$handle_inner_action ) {
 			$this->assertEquals( 10, has_action( 'outer_action', $handle_outer_action ) );
 			$this->assertEquals( 10, has_action( 'inner_action', $handle_inner_action ) );
 			echo '<b>Hello</b>';
@@ -1786,7 +1786,7 @@ public function test_decorate_shortcode_and_filter_source() {
 		}
 
 		AMP_Validation_Manager::add_validation_error_sourcing();
-		$shortcode_fallback = static function() {
+		$shortcode_fallback = static function () {
 			return '<b>test</b>';
 		};
 		add_shortcode(
@@ -2061,7 +2061,7 @@ public function test_filter_wrapped_callback() {
 	public function test_action_wrapped_callback() {
 		$test_string     = "<b class='\nfoo\nbar\n'>Cool!</b>";
 		$action_callback = [
-			'function'      => static function() use ( $test_string ) {
+			'function'      => static function () use ( $test_string ) {
 				echo $test_string; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			},
 			'accepted_args' => 1,
@@ -2776,7 +2776,7 @@ public function test_validate_url( $validation_errors, $after_matter ) {
 
 		// Test headers absent.
 		self::factory()->post->create();
-		$filter = static function() {
+		$filter = static function () {
 			return [
 				'body'    => '',
 				'headers' => [],
@@ -2803,7 +2803,7 @@ public function test_validate_url( $validation_errors, $after_matter ) {
 			'id'   => 123,
 		];
 		$stylesheets = [ [ 'CSS!' ] ];
-		$filter        = function( $pre, $r, $url ) use ( $validation_errors, $php_error, $queried_object, $stylesheets, $after_matter ) {
+		$filter        = function ( $pre, $r, $url ) use ( $validation_errors, $php_error, $queried_object, $stylesheets, $after_matter ) {
 			$url_query_vars = [];
 			parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $url_query_vars );
 			$this->assertArrayHasKey( AMP_Validation_Manager::VALIDATE_QUERY_VAR, $url_query_vars );
@@ -2880,7 +2880,7 @@ public function test_validate_url_on_another_site() {
 	 * @covers AMP_Validation_Manager::validate_url()
 	 */
 	public function test_validate_url_for_redirect_to_another_site() {
-		$filter = static function() {
+		$filter = static function () {
 			return [
 				'response' => [
 					'code'    => 301,
diff --git a/uninstall.php b/uninstall.php
index a19caea973d..9770e51add6 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -12,7 +12,7 @@
 	die;
 }
 
-require_once dirname( __FILE__ ) . '/includes/uninstall-functions.php';
+require_once __DIR__ . '/includes/uninstall-functions.php';
 
 if ( is_multisite() && ! wp_is_large_network() ) {
 	$site_ids = get_sites(