Changeset 43655 for trunk

Timestamp:

09/24/2018 03:22:01 PM (6 years ago)

Author:

flixos90

Message:

Multisite: Fix coding standard errors after [43654].

See #41333.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (6 diffs)
• tests/phpunit/tests/multisite/site.php (modified) (2 diffs)

trunk/phpcs.xml.dist

@@ -84 +84 @@
     <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>
 

trunk/src/wp-includes/ms-blogs.php

@@ -59 +59 @@
 function get_blogaddress_by_name( $blogname ) {
     if ( is_subdomain_install() ) {
-        if ( $blogname == 'main' ) {
+        if ( 'main' === $blogname ) {
             $blogname = 'www';
         }
@@ -179 +179 @@
     $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 {
@@ -204 +204 @@
         if ( $details ) {
             if ( ! is_object( $details ) ) {
-                if ( $details == -1 ) {
+                if ( -1 == $details ) {
                     return false;
                 } else {
@@ -1176 +1176 @@
     }
 
-    $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.
@@ -1230 +1232 @@
         $dir = $stack[ $index ];
 
-        // phpcs:disable Generic.PHP.NoSilencedErrors.Discouraged
+        // phpcs:disable WordPress.PHP.NoSilencedErrors.Discouraged
         $dh = @opendir( $dir );
         if ( $dh ) {
@@ -1260 +1262 @@
     }
 
-    // phpcs:enable Generic.PHP.NoSilencedErrors.Discouraged
+    // phpcs:enable WordPress.PHP.NoSilencedErrors.Discouraged
     if ( $switch ) {
         restore_current_blog();

trunk/tests/phpunit/tests/multisite/site.php

@@ -61 +61 @@
 
             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 );
         }
@@ -2307 +2309 @@
                 )
             );
-            $passed_args = $this->wp_initialize_site_args;
-
+
+            $passed_args                   = $this->wp_initialize_site_args;
             $this->wp_initialize_site_args = null;