From c12a0cf4f3d475669a7e08a1095f38afd0936e3d Mon Sep 17 00:00:00 2001
From: Felix Arntz <flixos90@git.wordpress.org>
Date: Mon, 24 Sep 2018 15:22:01 +0000
Subject: [PATCH] Multisite: Fix coding standard errors after [43654].

See #41333.


git-svn-id: https://develop.svn.wordpress.org/trunk@43655 602fd350-edb4-49c9-b593-d223f7449a82
---
 phpcs.xml.dist                         |  1 +
 src/wp-includes/ms-blogs.php           | 22 ++++++++++++----------
 tests/phpunit/tests/multisite/site.php | 14 ++++++++------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 612c772d0c..1bd55b6f4c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -83,6 +83,7 @@
 	</rule>
 	<rule ref="WordPress.DB.PreparedSQL.NotPrepared">
 		<exclude-pattern>/tests/phpunit/tests/admin/includesSchema\.php</exclude-pattern>
+		<exclude-pattern>/tests/phpunit/tests/multisite/site\.php</exclude-pattern>
 	</rule>
 
 	<!-- Whitelist the I18n functions file from issues identified by the I18n sniff
diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index 25424416fb..21d0820920 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -58,7 +58,7 @@ function get_blogaddress_by_id( $blog_id ) {
  */
 function get_blogaddress_by_name( $blogname ) {
 	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' ) {
+		if ( 'main' === $blogname ) {
 			$blogname = 'www';
 		}
 		$url = rtrim( network_home_url(), '/' );
@@ -178,12 +178,12 @@ function get_blog_details( $fields = null, $get_all = true ) {
 
 	$blog_id = (int) $blog_id;
 
-	$all     = $get_all == true ? '' : 'short';
+	$all     = $get_all ? '' : 'short';
 	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
 
 	if ( $details ) {
 		if ( ! is_object( $details ) ) {
-			if ( $details == -1 ) {
+			if ( -1 == $details ) {
 				return false;
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
@@ -203,7 +203,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 		// If short was requested and full cache is set, we can return.
 		if ( $details ) {
 			if ( ! is_object( $details ) ) {
-				if ( $details == -1 ) {
+				if ( -1 == $details ) {
 					return false;
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
@@ -1175,10 +1175,12 @@ function wp_uninitialize_site( $site_id ) {
 		return new WP_Error( 'site_already_uninitialized', __( 'The site appears to be already uninitialized.' ) );
 	}
 
-	$users = get_users( array(
-		'blog_id' => $site->id,
-		'fields'  => 'ids',
-	) );
+	$users = get_users(
+		array(
+			'blog_id' => $site->id,
+			'fields'  => 'ids',
+		)
+	);
 
 	// Remove users from the site.
 	if ( ! empty( $users ) ) {
@@ -1229,7 +1231,7 @@ function wp_uninitialize_site( $site_id ) {
 		// Get indexed directory from stack
 		$dir = $stack[ $index ];
 
-		// phpcs:disable Generic.PHP.NoSilencedErrors.Discouraged
+		// phpcs:disable WordPress.PHP.NoSilencedErrors.Discouraged
 		$dh = @opendir( $dir );
 		if ( $dh ) {
 			$file = @readdir( $dh );
@@ -1259,7 +1261,7 @@ function wp_uninitialize_site( $site_id ) {
 		}
 	}
 
-	// phpcs:enable Generic.PHP.NoSilencedErrors.Discouraged
+	// phpcs:enable WordPress.PHP.NoSilencedErrors.Discouraged
 	if ( $switch ) {
 		restore_current_blog();
 	}
diff --git a/tests/phpunit/tests/multisite/site.php b/tests/phpunit/tests/multisite/site.php
index 14229581f2..cb3c3d9a05 100644
--- a/tests/phpunit/tests/multisite/site.php
+++ b/tests/phpunit/tests/multisite/site.php
@@ -60,11 +60,13 @@ if ( is_multisite() ) :
 			unset( $id );
 
 			remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
-			self::$uninitialized_site_id = wp_insert_site( array(
-				'domain'  => 'uninitialized.org',
-				'path'    => '/',
-				'site_id' => self::$network_ids['make.wordpress.org/'],
-			) );
+			self::$uninitialized_site_id = wp_insert_site(
+				array(
+					'domain'  => 'uninitialized.org',
+					'path'    => '/',
+					'site_id' => self::$network_ids['make.wordpress.org/'],
+				)
+			);
 			add_action( 'wp_initialize_site', 'wp_initialize_site', 10, 2 );
 		}
 
@@ -2306,8 +2308,8 @@ if ( is_multisite() ) :
 					$args
 				)
 			);
-			$passed_args = $this->wp_initialize_site_args;
 
+			$passed_args                   = $this->wp_initialize_site_args;
 			$this->wp_initialize_site_args = null;
 
 			$this->assertEqualSetsWithIndex( $args, $passed_args );