diff --git a/composer.json b/composer.json
index 3c9e021d66..526516f176 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
 		"issues": "https://core.trac.wordpress.org/"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "~0.4.4",
-		"wp-coding-standards/wpcs": "~1.0.0"
+		"dealerdirect/phpcodesniffer-composer-installer": "~0.5.0",
+		"wp-coding-standards/wpcs": "~1.2.0"
 	},
 	"scripts": {
 		"format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
diff --git a/composer.lock b/composer.lock
index 291b5943eb..08c0f3dc01 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,34 +4,32 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "525cadb533bc92cc922d79144b33b14a",
+    "content-hash": "c3625c9fc2ce3a44cad41a64f258bafd",
     "packages": [],
     "packages-dev": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.4.4",
+            "version": "v0.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08"
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/2e41850d5f7797cbb1af7b030d245b3b24e63a08",
-                "reference": "2e41850d5f7797cbb1af7b030d245b3b24e63a08",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
                 "shasum": ""
             },
             "require": {
                 "composer-plugin-api": "^1.0",
                 "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "*"
+                "squizlabs/php_codesniffer": "^2|^3"
             },
             "require-dev": {
                 "composer/composer": "*",
-                "wimg/php-compatibility": "^8.0"
-            },
-            "suggest": {
-                "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
             },
             "type": "composer-plugin",
             "extra": {
@@ -49,13 +47,13 @@
             "authors": [
                 {
                     "name": "Franck Nijhof",
-                    "email": "f.nijhof@dealerdirect.nl",
-                    "homepage": "http://workingatdealerdirect.eu",
-                    "role": "Developer"
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
                 }
             ],
             "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://workingatdealerdirect.eu",
+            "homepage": "http://www.dealerdirect.com",
             "keywords": [
                 "PHPCodeSniffer",
                 "PHP_CodeSniffer",
@@ -73,20 +71,20 @@
                 "stylecheck",
                 "tests"
             ],
-            "time": "2017-12-06T16:27:17+00:00"
+            "time": "2018-10-26T13:21:45+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.3.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "628a481780561150481a9ec74709092b9759b3ec"
+                "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
-                "reference": "628a481780561150481a9ec74709092b9759b3ec",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
+                "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
                 "shasum": ""
             },
             "require": {
@@ -124,20 +122,20 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2018-07-26T23:47:18+00:00"
+            "time": "2018-12-19T23:57:18+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
-            "version": "1.0.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
-                "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755"
+                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/539c6d74e6207daa22b7ea754d6f103e9abb2755",
-                "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755",
+                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
+                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
                 "shasum": ""
             },
             "require": {
@@ -145,7 +143,7 @@
                 "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
             },
             "require-dev": {
-                "phpcompatibility/php-compatibility": "*"
+                "phpcompatibility/php-compatibility": "^9.0"
             },
             "suggest": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
@@ -167,7 +165,7 @@
                 "standards",
                 "wordpress"
             ],
-            "time": "2018-07-25T18:10:35+00:00"
+            "time": "2018-12-18T09:43:51+00:00"
         }
     ],
     "aliases": [],
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e157c03ac5..118bbdb5f3 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -5,12 +5,6 @@
 	<rule ref="WordPress-Core"/>
 	<rule ref="WordPress.CodeAnalysis.EmptyStatement"/>
 
-	<rule ref="PEAR.Functions.FunctionCallSignature">
-		<properties>
-			<property name="allowMultipleArguments" value="false"/>
-		</properties>
-	</rule>
-
 	<rule ref="WordPress.NamingConventions.ValidVariableName">
 		<properties>
 			<property name="customPropertiesWhitelist" type="array">
diff --git a/src/wp-activate.php b/src/wp-activate.php
index 5954140960..df82ae0b09 100644
--- a/src/wp-activate.php
+++ b/src/wp-activate.php
@@ -135,10 +135,10 @@ get_header( 'wp-activate' );
 		</form>
 
 		<?php
-} else {
-	if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
-		$signup = $result->get_error_data();
-		?>
+	} else {
+		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
+			$signup = $result->get_error_data();
+			?>
 			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 			<?php
 			echo '<p class="lead-in">';
@@ -162,17 +162,17 @@ get_header( 'wp-activate' );
 				);
 			}
 			echo '</p>';
-	} elseif ( $result === null || is_wp_error( $result ) ) {
-		?>
+		} elseif ( $result === null || is_wp_error( $result ) ) {
+			?>
 			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 			<?php if ( is_wp_error( $result ) ) : ?>
 				<p><?php echo $result->get_error_message(); ?></p>
 			<?php endif; ?>
 			<?php
-	} else {
-		$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-		$user = get_userdata( (int) $result['user_id'] );
-		?>
+		} else {
+			$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+			$user = get_userdata( (int) $result['user_id'] );
+			?>
 			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 
 			<div id="signup-welcome">
@@ -199,11 +199,11 @@ get_header( 'wp-activate' );
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
 				?>
 				</p>
-			<?php
-			endif;
+				<?php
+				endif;
+		}
 	}
-}
-?>
+	?>
 	</div>
 </div>
 <script type="text/javascript">
diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php
index 9460c80ca6..127a46a6a7 100644
--- a/src/wp-admin/custom-header.php
+++ b/src/wp-admin/custom-header.php
@@ -642,43 +642,43 @@ class Custom_Image_Header {
 </tr>
 			<?php
 	endif;
-if ( ! empty( $this->default_headers ) ) :
-	?>
+		if ( ! empty( $this->default_headers ) ) :
+			?>
 <tr>
 <th scope="row"><?php _e( 'Default Images' ); ?></th>
 <td>
-	<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+			<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
 	<?php else : ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
 	<?php endif; ?>
-	<?php
-	$this->show_header_selector( 'default' );
-	?>
+			<?php
+			$this->show_header_selector( 'default' );
+			?>
 </td>
 </tr>
-	<?php
+			<?php
 	endif;
-if ( get_header_image() ) :
-	?>
+		if ( get_header_image() ) :
+			?>
 <tr>
 <th scope="row"><?php _e( 'Remove Image' ); ?></th>
 <td>
 	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ); ?></p>
-	<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
+			<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
 </td>
 </tr>
-	<?php
+			<?php
 	endif;
 
-	$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
-if ( $default_image && get_header_image() != $default_image ) :
-	?>
+		$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
+		if ( $default_image && get_header_image() != $default_image ) :
+			?>
 <tr>
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>
 <td>
 	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ); ?></p>
-	<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
+			<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
 </td>
 </tr>
 	<?php endif; ?>
@@ -741,7 +741,7 @@ endif;
 		do_action( 'custom_header_options' );
 
 		wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
-?>
+		?>
 
 		<?php submit_button( null, 'primary', 'save-header-options' ); ?>
 </form>
diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index f93e799c03..53ef0bc8b8 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -1218,7 +1218,7 @@ class WP_List_Table {
 		endif;
 		$this->extra_tablenav( $which );
 		$this->pagination( $which );
-?>
+		?>
 
 		<br class="clear" />
 	</div>
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index 859bf4f68b..7cc37c056f 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -280,7 +280,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		<?php } else { ?>
 			<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
 			<?php
-}
+		}
 	}
 
 	/**
@@ -392,7 +392,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				<br class="clear" />
 			</div>
 			<?php
-}
+		}
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index c054e6fb64..c16b9a8ed4 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -1471,14 +1471,14 @@ class WP_Posts_List_Table extends WP_List_Table {
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
-		<?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>
+				<?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>
 
 			<label>
 				<span class="title"><?php _e( 'Slug' ); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
-			<?php
+					<?php
 	endif; // is_post_type_viewable check
 	endif; // $bulk
 	endif; // post_type_supports title
@@ -1493,39 +1493,39 @@ class WP_Posts_List_Table extends WP_List_Table {
 				<?php
 	endif; // $bulk
 
-if ( post_type_supports( $screen->post_type, 'author' ) ) :
-	$authors_dropdown = '';
+			if ( post_type_supports( $screen->post_type, 'author' ) ) :
+				$authors_dropdown = '';
 
-	if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
-		$users_opt = array(
-			'hide_if_only_one_author' => false,
-			'who'                     => 'authors',
-			'name'                    => 'post_author',
-			'class'                   => 'authors',
-			'multi'                   => 1,
-			'echo'                    => 0,
-			'show'                    => 'display_name_with_login',
-		);
-		if ( $bulk ) {
-			$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
-		}
+				if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+					$users_opt = array(
+						'hide_if_only_one_author' => false,
+						'who'                     => 'authors',
+						'name'                    => 'post_author',
+						'class'                   => 'authors',
+						'multi'                   => 1,
+						'echo'                    => 0,
+						'show'                    => 'display_name_with_login',
+					);
+					if ( $bulk ) {
+						$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+					}
 
-		if ( $authors = wp_dropdown_users( $users_opt ) ) :
-			$authors_dropdown  = '<label class="inline-edit-author">';
-			$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-			$authors_dropdown .= $authors;
-			$authors_dropdown .= '</label>';
-		endif;
-	endif; // authors
-	?>
+					if ( $authors = wp_dropdown_users( $users_opt ) ) :
+						$authors_dropdown  = '<label class="inline-edit-author">';
+						$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+						$authors_dropdown .= $authors;
+						$authors_dropdown .= '</label>';
+					endif;
+				endif; // authors
+				?>
 
-	<?php
-	if ( ! $bulk ) {
-		echo $authors_dropdown;}
+				<?php
+				if ( ! $bulk ) {
+					echo $authors_dropdown;}
 	endif; // post_type_supports author
 
-if ( ! $bulk && $can_publish ) :
-	?>
+			if ( ! $bulk && $can_publish ) :
+				?>
 
 		<div class="inline-edit-group wp-clearfix">
 			<label class="alignleft">
@@ -1545,7 +1545,7 @@ if ( ! $bulk && $can_publish ) :
 				</label>
 			</div>
 
-	<?php endif; ?>
+				<?php endif; ?>
 
 		</div></fieldset>
 
@@ -1690,7 +1690,7 @@ if ( ! $bulk && $can_publish ) :
 			<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
-			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+				<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
 					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
@@ -1703,7 +1703,7 @@ if ( ! $bulk && $can_publish ) :
 			<?php endif; ?>
 			</div>
 
-	<?php
+				<?php
 	endif; // $bulk
 	endif; // post_type_supports comments or pings
 			?>
diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php
index f96430984d..21094b880a 100644
--- a/src/wp-admin/includes/class-wp-screen.php
+++ b/src/wp-admin/includes/class-wp-screen.php
@@ -918,8 +918,8 @@ final class WP_Screen {
 			</div>
 			<?php
 		endif;
-if ( $this->show_screen_options() ) :
-	?>
+		if ( $this->show_screen_options() ) :
+			?>
 			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
 			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
 			</div>
diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php
index 5d7cfde73f..28e1978721 100644
--- a/src/wp-admin/includes/class-wp-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-users-list-table.php
@@ -286,7 +286,7 @@ class WP_Users_List_Table extends WP_List_Table {
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
 		do_action( 'restrict_manage_users', $which );
-?>
+		?>
 		</div>
 		<?php
 		/**
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index b61dcd56d8..805d69cac7 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -318,7 +318,7 @@ endif;
 	<?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
 		<?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
-	<?php
+		<?php
 	endif;
 	else :
 		?>
diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 1c1e5d72a0..9187d0d689 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -998,11 +998,11 @@ function confirm_delete_users( $users ) {
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
 	<?php else : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
-	<?php
+		<?php
 	endif;
 
 	submit_button( __( 'Confirm Deletion' ), 'primary' );
-?>
+	?>
 	</form>
 	<?php
 	return true;
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
index 3d277e8998..c3165f2e88 100644
--- a/src/wp-admin/includes/plugin-install.php
+++ b/src/wp-admin/includes/plugin-install.php
@@ -696,10 +696,10 @@ function install_plugin_information() {
 			?>
 			<p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
 			<?php
-}
+		}
 
-if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
-	?>
+		if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
+			?>
 			<h3><?php _e( 'Reviews' ); ?></h3>
 			<p class="fyi-description"><?php _e( 'Read all reviews on WordPress.org or write your own!' ); ?></p>
 			<?php
@@ -727,9 +727,9 @@ if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
 				</div>
 				<?php
 			}
-}
-if ( ! empty( $api->contributors ) ) {
-	?>
+		}
+		if ( ! empty( $api->contributors ) ) {
+			?>
 			<h3><?php _e( 'Contributors' ); ?></h3>
 			<ul class="contributors">
 				<?php
@@ -747,10 +747,10 @@ if ( ! empty( $api->contributors ) ) {
 				}
 				?>
 			</ul>
-			<?php if ( ! empty( $api->donate_link ) ) { ?>
+					<?php if ( ! empty( $api->donate_link ) ) { ?>
 				<a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a>
 			<?php } ?>
-		<?php } ?>
+				<?php } ?>
 	</div>
 	<div id="section-holder" class="wrap">
 	<?php
diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php
index 714e42dc5b..7a1e2a81b4 100644
--- a/src/wp-admin/includes/post.php
+++ b/src/wp-admin/includes/post.php
@@ -1732,16 +1732,16 @@ function _admin_notice_post_locked() {
 		<?php if ( $preview_link ) { ?>
 		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
 			<?php
-}
+		}
 
 		// Allow plugins to prevent some users overriding the post lock
-if ( $override ) {
-	?>
+		if ( $override ) {
+			?>
 	<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
 			<?php
-}
+		}
 
-?>
+		?>
 		</p>
 		</div>
 		<?php
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index 09de783086..a8eba5ea28 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -822,14 +822,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
 			</span><!-- /add-new-menu-action -->
 		</form>
-	<?php
+			<?php
 		endif;
 
 		$metabox_holder_disabled_class = '';
-if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
-	$metabox_holder_disabled_class = ' metabox-holder-disabled';
-}
-?>
+		if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+			$metabox_holder_disabled_class = ' metabox-holder-disabled';
+		}
+		?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame" class="wp-clearfix">
 	<div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
@@ -914,10 +914,10 @@ if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
 								endif;
 
 								$no_menus_style = '';
-if ( $one_theme_location_no_menus ) {
-	$no_menus_style = 'style="display: none;"';
-}
-?>
+							if ( $one_theme_location_no_menus ) {
+								$no_menus_style = 'style="display: none;"';
+							}
+							?>
 							<div class="menu-settings" <?php echo $no_menus_style; ?>>
 								<h3><?php _e( 'Menu Settings' ); ?></h3>
 								<?php
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
index f80e7e6a34..5dfe03b538 100644
--- a/src/wp-admin/network/site-new.php
+++ b/src/wp-admin/network/site-new.php
@@ -231,14 +231,14 @@ printf(
 			<?php if ( is_subdomain_install() ) { ?>
 				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
 				<?php
-} else {
-	echo get_network()->domain . get_network()->path
-	?>
+			} else {
+				echo get_network()->domain . get_network()->path
+				?>
 				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required />
-	<?php
-}
+				<?php
+			}
 			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
-?>
+			?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index e934662571..9667723d1d 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -349,28 +349,28 @@ printf( __( 'If you like, you may enter custom structures for your category and
 </p>
 		<?php else : ?>
 <p>
-	<?php
-	printf(
-		/* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
-		__( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ),
-		__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
-		'<code>web.config</code>',
-		'<kbd>CTRL + a</kbd>'
-	);
-	?>
+			<?php
+			printf(
+				/* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
+				__( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ),
+				__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+				'<code>web.config</code>',
+				'<kbd>CTRL + a</kbd>'
+			);
+			?>
 </p>
 <form action="options-permalink.php" method="post">
-	<?php wp_nonce_field( 'update-permalink' ); ?>
+			<?php wp_nonce_field( 'update-permalink' ); ?>
 	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea></p>
 </form>
 <p>
-	<?php
-	printf(
-		/* translators: %s: web.config */
-		__( 'If you temporarily make your site&#8217;s root directory writable for us to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
-		'<code>web.config</code>'
-	);
-	?>
+			<?php
+			printf(
+				/* translators: %s: web.config */
+				__( 'If you temporarily make your site&#8217;s root directory writable for us to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
+				'<code>web.config</code>'
+			);
+			?>
 </p>
 		<?php endif; ?>
 	<?php endif; ?>
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index cfcce8f66a..521a8e290d 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -228,7 +228,7 @@ switch ( $action ) {
 	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
 		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 				<?php
-}
+	}
 		}
 		?>
 
@@ -304,13 +304,13 @@ switch ( $action ) {
 </tr>
 			<?php
 endif; // $_wp_admin_css_colors
-if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
-	?>
+		if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
+			?>
 <tr class="user-comment-shortcuts-wrap">
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
 <td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?></label> <?php _e( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>' ); ?></td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
 <th scope="row"><?php _e( 'Toolbar' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Toolbar' ); ?></span></legend>
@@ -414,17 +414,17 @@ endif;
 			<?php
 endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {
-	?>
+		if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {
+			?>
 <tr class="user-super-admin-wrap"><th><?php _e( 'Super Admin' ); ?></th>
 <td>
-	<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
+			<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
 <?php else : ?>
 <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
 <?php endif; ?>
 </td></tr>
-<?php } ?>
+		<?php } ?>
 
 <tr class="user-first-name-wrap">
 	<th><label for="first_name"><?php _e( 'First Name' ); ?></label></th>
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index 42ce41e87e..b79e5a8672 100644
--- a/src/wp-admin/users.php
+++ b/src/wp-admin/users.php
@@ -288,40 +288,40 @@ switch ( $wp_list_table->current_action() ) {
 				?>
 			<input type="hidden" name="delete_option" value="delete" />
 			<?php else : ?>
-		<?php if ( 1 == $go_delete ) : ?>
+				<?php if ( 1 == $go_delete ) : ?>
 			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
 		<?php else : ?>
 			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-			<?php _e( 'Delete all content.' ); ?></label></li>
+				<?php _e( 'Delete all content.' ); ?></label></li>
 			<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-			<?php
-			echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-			wp_dropdown_users(
-				array(
-					'name'    => 'reassign_user',
-					'exclude' => array_diff( $userids, array( $current_user->ID ) ),
-					'show'    => 'display_name_with_login',
-				)
-			);
-			?>
+				<?php
+				echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
+				wp_dropdown_users(
+					array(
+						'name'    => 'reassign_user',
+						'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+						'show'    => 'display_name_with_login',
+					)
+				);
+				?>
 			</li>
 		</ul></fieldset>
-	<?php
+				<?php
 	endif;
-	/**
-	 * Fires at the end of the delete users form prior to the confirm button.
-	 *
-	 * @since 4.0.0
-	 * @since 4.5.0 The `$userids` parameter was added.
-	 *
-	 * @param WP_User $current_user WP_User object for the current user.
-	 * @param int[]   $userids      Array of IDs for users being deleted.
-	 */
-	do_action( 'delete_user_form', $current_user, $userids );
-?>
+			/**
+			 * Fires at the end of the delete users form prior to the confirm button.
+			 *
+			 * @since 4.0.0
+			 * @since 4.5.0 The `$userids` parameter was added.
+			 *
+			 * @param WP_User $current_user WP_User object for the current user.
+			 * @param int[]   $userids      Array of IDs for users being deleted.
+			 */
+			do_action( 'delete_user_form', $current_user, $userids );
+			?>
 	<input type="hidden" name="action" value="dodelete" />
 			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
 	<?php else : ?>
@@ -522,12 +522,12 @@ switch ( $wp_list_table->current_action() ) {
 			<?php
 	endif;
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg ) {
-		echo $msg;
-	}
-}
-?>
+		if ( ! empty( $messages ) ) {
+			foreach ( $messages as $msg ) {
+				echo $msg;
+			}
+		}
+		?>
 
 	<div class="wrap">
 	<h1 class="wp-heading-inline">
diff --git a/src/wp-content/themes/twentyeleven/comments.php b/src/wp-content/themes/twentyeleven/comments.php
index 208806b67f..2fec43aba6 100644
--- a/src/wp-content/themes/twentyeleven/comments.php
+++ b/src/wp-content/themes/twentyeleven/comments.php
@@ -24,7 +24,7 @@
 			 */
 			return;
 		endif;
-?>
+	?>
 
 	<?php // You can start editing here -- including this comment! ?>
 
diff --git a/src/wp-content/themes/twentyeleven/content-gallery.php b/src/wp-content/themes/twentyeleven/content-gallery.php
index a95f92c1e4..8345686780 100644
--- a/src/wp-content/themes/twentyeleven/content-gallery.php
+++ b/src/wp-content/themes/twentyeleven/content-gallery.php
@@ -55,14 +55,14 @@
 						<?php endif; // end twentyeleven_get_gallery_images() check ?>
 				<?php the_excerpt(); ?>
 		<?php endif; ?>
-		<?php
-		wp_link_pages(
-			array(
-				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
-				'after'  => '</div>',
-			)
-		);
-		?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'after'  => '</div>',
+				)
+			);
+			?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
diff --git a/src/wp-content/themes/twentyfifteen/header.php b/src/wp-content/themes/twentyfifteen/header.php
index a6a43c2b90..63b0437771 100644
--- a/src/wp-content/themes/twentyfifteen/header.php
+++ b/src/wp-content/themes/twentyfifteen/header.php
@@ -36,16 +36,16 @@
 						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 					<?php else : ?>
 						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
-					<?php
+						<?php
 					endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-if ( $description || is_customize_preview() ) :
-	?>
+					if ( $description || is_customize_preview() ) :
+						?>
 						<p class="site-description"><?php echo $description; ?></p>
-					<?php
+						<?php
 					endif;
-?>
+					?>
 				<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
 		</header><!-- .site-header -->
diff --git a/src/wp-content/themes/twentyfifteen/inc/template-tags.php b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
index dad54e6cce..056d19413c 100644
--- a/src/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -209,7 +209,7 @@ if ( ! function_exists( 'twentyfifteen_post_thumbnail' ) ) :
 		?>
 	</a>
 
-	<?php
+		<?php
 	endif; // End is_singular()
 	}
 endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-aside.php b/src/wp-content/themes/twentyfourteen/content-aside.php
index 48d7abca19..3fd3acda6e 100644
--- a/src/wp-content/themes/twentyfourteen/content-aside.php
+++ b/src/wp-content/themes/twentyfourteen/content-aside.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-audio.php b/src/wp-content/themes/twentyfourteen/content-audio.php
index c700996a08..4dba002a26 100644
--- a/src/wp-content/themes/twentyfourteen/content-audio.php
+++ b/src/wp-content/themes/twentyfourteen/content-audio.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-gallery.php b/src/wp-content/themes/twentyfourteen/content-gallery.php
index e8c252454c..9ecdfbf92d 100644
--- a/src/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/src/wp-content/themes/twentyfourteen/content-gallery.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-image.php b/src/wp-content/themes/twentyfourteen/content-image.php
index 70b1e04c09..911ef23964 100644
--- a/src/wp-content/themes/twentyfourteen/content-image.php
+++ b/src/wp-content/themes/twentyfourteen/content-image.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-link.php b/src/wp-content/themes/twentyfourteen/content-link.php
index d51d634c5e..9ad0810206 100644
--- a/src/wp-content/themes/twentyfourteen/content-link.php
+++ b/src/wp-content/themes/twentyfourteen/content-link.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-none.php b/src/wp-content/themes/twentyfourteen/content-none.php
index a83e06ee4a..a97f84c866 100644
--- a/src/wp-content/themes/twentyfourteen/content-none.php
+++ b/src/wp-content/themes/twentyfourteen/content-none.php
@@ -20,12 +20,12 @@
 	<?php elseif ( is_search() ) : ?>
 
 	<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfourteen' ); ?></p>
-	<?php get_search_form(); ?>
+		<?php get_search_form(); ?>
 
 	<?php else : ?>
 
 	<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfourteen' ); ?></p>
-	<?php get_search_form(); ?>
+		<?php get_search_form(); ?>
 
 	<?php endif; ?>
 </div><!-- .page-content -->
diff --git a/src/wp-content/themes/twentyfourteen/content-quote.php b/src/wp-content/themes/twentyfourteen/content-quote.php
index 27a7b169ca..703190878e 100644
--- a/src/wp-content/themes/twentyfourteen/content-quote.php
+++ b/src/wp-content/themes/twentyfourteen/content-quote.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content-video.php b/src/wp-content/themes/twentyfourteen/content-video.php
index 13609b64a6..c13d67009c 100644
--- a/src/wp-content/themes/twentyfourteen/content-video.php
+++ b/src/wp-content/themes/twentyfourteen/content-video.php
@@ -19,8 +19,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index 2d54fc9aa5..367cf337e9 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -21,8 +21,8 @@
 			<?php
 			endif;
 
-if ( is_single() ) :
-	the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
diff --git a/src/wp-content/themes/twentyfourteen/inc/template-tags.php b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
index cf5debfa4b..1500386440 100644
--- a/src/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -197,16 +197,16 @@ if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
 		<?php else : ?>
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
-	<?php
-	if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
-		the_post_thumbnail( 'twentyfourteen-full-width' );
-	} else {
-		the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
-	}
-	?>
+			<?php
+			if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
+				the_post_thumbnail( 'twentyfourteen-full-width' );
+			} else {
+				the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
+			}
+			?>
 	</a>
 
-	<?php
+			<?php
 	endif; // End is_singular()
 	}
 endif;
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php b/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
index 83b84bf354..f4b1977be9 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
@@ -30,6 +30,6 @@
 				get_search_form();
 
 		endif;
-?>
+		?>
 	</div><!-- .page-content -->
 </section><!-- .no-results -->
diff --git a/src/wp-content/themes/twentysixteen/header.php b/src/wp-content/themes/twentysixteen/header.php
index 41159f122d..f264ac2cd7 100644
--- a/src/wp-content/themes/twentysixteen/header.php
+++ b/src/wp-content/themes/twentysixteen/header.php
@@ -35,12 +35,12 @@
 						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 					<?php else : ?>
 						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
-					<?php
+						<?php
 					endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-if ( $description || is_customize_preview() ) :
-	?>
+					if ( $description || is_customize_preview() ) :
+						?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php endif; ?>
 				</div><!-- .site-branding -->
diff --git a/src/wp-content/themes/twentysixteen/inc/template-tags.php b/src/wp-content/themes/twentysixteen/inc/template-tags.php
index 963513f631..caeed1c5ac 100644
--- a/src/wp-content/themes/twentysixteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentysixteen/inc/template-tags.php
@@ -145,7 +145,7 @@ if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) :
 		<?php the_post_thumbnail( 'post-thumbnail', array( 'alt' => the_title_attribute( 'echo=0' ) ) ); ?>
 	</a>
 
-	<?php
+		<?php
 	endif; // End is_singular()
 	}
 endif;
diff --git a/src/wp-content/themes/twentyten/loop.php b/src/wp-content/themes/twentyten/loop.php
index b241b1bc7f..fb97c12c41 100644
--- a/src/wp-content/themes/twentyten/loop.php
+++ b/src/wp-content/themes/twentyten/loop.php
@@ -133,7 +133,7 @@ while ( have_posts() ) :
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
-	<?php /* How to display all other posts. */ ?>
+		<?php /* How to display all other posts. */ ?>
 
 	<?php else : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -143,7 +143,7 @@ while ( have_posts() ) :
 				<?php twentyten_posted_on(); ?>
 			</div><!-- .entry-meta -->
 
-	<?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
+		<?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
 			<div class="entry-summary">
 				<?php the_excerpt(); ?>
 			</div><!-- .entry-summary -->
diff --git a/src/wp-content/themes/twentythirteen/content-none.php b/src/wp-content/themes/twentythirteen/content-none.php
index d9549e1a89..dba04c06de 100644
--- a/src/wp-content/themes/twentythirteen/content-none.php
+++ b/src/wp-content/themes/twentythirteen/content-none.php
@@ -20,12 +20,12 @@
 	<?php elseif ( is_search() ) : ?>
 
 	<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with different keywords.', 'twentythirteen' ); ?></p>
-	<?php get_search_form(); ?>
+		<?php get_search_form(); ?>
 
 	<?php else : ?>
 
 	<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentythirteen' ); ?></p>
-	<?php get_search_form(); ?>
+		<?php get_search_form(); ?>
 
 	<?php endif; ?>
 </div><!-- .page-content -->
diff --git a/src/wp-includes/feed-atom-comments.php b/src/wp-includes/feed-atom-comments.php
index 01a475ff94..64e26aa2fd 100644
--- a/src/wp-includes/feed-atom-comments.php
+++ b/src/wp-includes/feed-atom-comments.php
@@ -110,13 +110,13 @@ if ( have_comments() ) :
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
 	<?php else : // post pass ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
-	<?php
+		<?php
 	endif; // post pass
 	// Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt)
-if ( $comment->comment_parent == 0 ) : // This comment is top level
-	?>
+	if ( $comment->comment_parent == 0 ) : // This comment is top level
+		?>
 	<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
-	<?php
+		<?php
 	else : // This comment is in reply to another comment
 		$parent_comment = get_comment( $comment->comment_parent );
 		// The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system
diff --git a/src/wp-includes/feed-atom.php b/src/wp-includes/feed-atom.php
index b7cd5d941e..73cfda1e5b 100644
--- a/src/wp-includes/feed-atom.php
+++ b/src/wp-includes/feed-atom.php
@@ -66,7 +66,7 @@ do_action( 'rss_tag_pre', 'atom' );
 			 * @since 3.2.0
 			 */
 			do_action( 'atom_author' );
-?>
+			?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss(); ?>]]></title>
 		<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>" />
diff --git a/src/wp-includes/feed-rss2-comments.php b/src/wp-includes/feed-rss2-comments.php
index c0d51dc9cd..b26c913408 100644
--- a/src/wp-includes/feed-rss2-comments.php
+++ b/src/wp-includes/feed-rss2-comments.php
@@ -105,7 +105,7 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 		<?php else : // post pass ?>
 		<description><![CDATA[<?php comment_text_rss(); ?>]]></description>
 		<content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
-		<?php
+			<?php
 		endif; // post pass
 			/**
 			 * Fires at the end of each RSS2 comment feed item.
@@ -116,7 +116,7 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 			 * @param int $comment_post->ID    The ID of the post the comment is connected to.
 			 */
 			do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
-?>
+		?>
 			</item>
 			<?php
 		endwhile;
diff --git a/src/wp-includes/widgets/class-wp-widget-archives.php b/src/wp-includes/widgets/class-wp-widget-archives.php
index 41bc227ab3..4d0581ade6 100644
--- a/src/wp-includes/widgets/class-wp-widget-archives.php
+++ b/src/wp-includes/widgets/class-wp-widget-archives.php
@@ -131,7 +131,7 @@ class WP_Widget_Archives extends WP_Widget {
 			?>
 		</ul>
 			<?php
-}
+		}
 
 		echo $args['after_widget'];
 	}
diff --git a/src/wp-includes/widgets/class-wp-widget-text.php b/src/wp-includes/widgets/class-wp-widget-text.php
index 2295650e3c..b4f4aa2b99 100644
--- a/src/wp-includes/widgets/class-wp-widget-text.php
+++ b/src/wp-includes/widgets/class-wp-widget-text.php
@@ -493,7 +493,7 @@ class WP_Widget_Text extends WP_Widget {
 			<p>
 				<input id="<?php echo $this->get_field_id( 'filter' ); ?>" name="<?php echo $this->get_field_name( 'filter' ); ?>" type="checkbox"<?php checked( ! empty( $instance['filter'] ) ); ?> />&nbsp;<label for="<?php echo $this->get_field_id( 'filter' ); ?>"><?php _e( 'Automatically add paragraphs' ); ?></label>
 			</p>
-		<?php
+			<?php
 		endif;
 	}
 
diff --git a/src/wp-login.php b/src/wp-login.php
index add47ebe63..1a302a35f1 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -1114,13 +1114,13 @@ switch ( $action ) {
 	d.value = '';
 	<?php } else { ?>
 	d = document.getElementById('user_login');
-	<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
+			<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
 	if( d.value != '' )
 	d.value = '';
-		<?php
-}
-}
-?>
+				<?php
+			}
+	}
+	?>
 	d.focus();
 	d.select();
 	} catch(e){}
diff --git a/src/wp-signup.php b/src/wp-signup.php
index 933ff3f342..285eeac3f3 100644
--- a/src/wp-signup.php
+++ b/src/wp-signup.php
@@ -139,9 +139,9 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	<?php if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
 		<p class="error"><?php echo $errmsg; ?></p>
 		<?php
-}
+	}
 	echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" />';
-?>
+	?>
 
 	<?php
 	// Site Language.