Changeset 44566

Timestamp:

01/11/2019 06:39:55 AM (6 years ago)

Author:

pento

Message:

Coding Standards: Fix the Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace violations.

See #45934.

Location:

trunk/src

Files:

• wp-admin/includes/export.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (2 diffs)
• wp-content/themes/twentyfourteen/functions.php (modified) (1 diff)
• wp-content/themes/twentythirteen/functions.php (modified) (1 diff)
• wp-includes/class-wp-locale.php (modified) (1 diff)
• wp-includes/class-wp-text-diff-renderer-table.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/export.php

@@ -204 +204 @@
      */
     function wxr_site_url() {
-        // Multisite: the base URL.
         if ( is_multisite() ) {
+            // Multisite: the base URL.
             return network_home_url();
-        } // WordPress (single site): the blog URL.
-        else {
+        } else {
+            // WordPress (single site): the blog URL.
             return get_bloginfo_rss( 'url' );
         }

trunk/src/wp-admin/includes/image.php

@@ -216 +216 @@
             }
         }
-    } // Try to create image thumbnails for PDFs
-    elseif ( 'application/pdf' === $mime_type ) {
+    } elseif ( 'application/pdf' === $mime_type ) {
+        // Try to create image thumbnails for PDFs.
+
         $fallback_sizes = array(
             'thumbnail',

trunk/src/wp-admin/update-core.php

@@ -40 +40 @@
     if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
         $version_string = $update->current;
-    } // If the only available update is a partial builds, it doesn't need a language-specific version string.
-    elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
+    } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
+        // If the only available update is a partial builds, it doesn't need a language-specific version string.
         $version_string = $update->current;
     } else {
@@ -122 +122 @@
     if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
         echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.' ) . '</p>';
-    } // Partial builds don't need language-specific warnings.
-    elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+    } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+        // Partial builds don't need language-specific warnings.
         echo '<p class="hint">' . sprintf( __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), $update->response != 'development' ? $update->current : '' ) . '</p>';
     }

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -456 +456 @@
             if ( $next_id ) {
                 $next_attachment_url = get_attachment_link( $next_id );
-            } // or get the URL of the first image attachment.
-            else {
+            } else {
+                // or get the URL of the first image attachment.
                 $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
             }

trunk/src/wp-content/themes/twentythirteen/functions.php

@@ -588 +588 @@
             if ( $next_id ) {
                 $next_attachment_url = get_attachment_link( $next_id );
-            } // or get the URL of the first image attachment.
-            else {
+            } else {
+                // or get the URL of the first image attachment.
                 $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
             }

trunk/src/wp-includes/class-wp-locale.php

@@ -217 +217 @@
         if ( isset( $GLOBALS['text_direction'] ) ) {
             $this->text_direction = $GLOBALS['text_direction'];
-        } /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
-        elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
+
+            /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
+        } elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
             $this->text_direction = 'rtl';
         }

trunk/src/wp-includes/class-wp-text-diff-renderer-table.php

@@ -390 +390 @@
             if ( isset( $orig_matches[ $o ] ) ) {
                 $final_matches[ $f ] = 'x';
-            } // Best match of this orig is already taken?  Must mean this orig is a deleted row.
-            elseif ( isset( $final_matches[ $f ] ) ) {
+            } elseif ( isset( $final_matches[ $f ] ) ) {
+                // Best match of this orig is already taken?  Must mean this orig is a deleted row.
                 $orig_matches[ $o ] = 'x';
             }

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -2898 +2898 @@
         if ( $page->ID && ( $page->post_type == 'page' ) ) {
             return $this->_prepare_page( $page );
-        } // If the page doesn't exist indicate that.
-        else {
+        } else {
+            // If the page doesn't exist indicate that.
             return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
         }

trunk/src/wp-includes/formatting.php

@@ -2479 +2479 @@
                 $tag = '';
                 // or close to be safe $tag = '/' . $tag;
-            } // if stacktop value = tag close value then pop
-            elseif ( $tagstack[ $stacksize - 1 ] == $tag ) { // found closing tag
+
+                // if stacktop value = tag close value then pop
+            } elseif ( $tagstack[ $stacksize - 1 ] == $tag ) { // found closing tag
                 $tag = '</' . $tag . '>'; // Close Tag
                 // Pop
@@ -2506 +2507 @@
             if ( '' == $tag ) {
                 // do nothing
-            } // ElseIf it presents itself as a self-closing tag...
-            elseif ( substr( $regex[2], -1 ) == '/' ) {
+            } elseif ( substr( $regex[2], -1 ) == '/' ) { // ElseIf it presents itself as a self-closing tag...
                 // ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
                 // immediately close it with a closing tag (the tag will encapsulate no text as a result)
@@ -2513 +2513 @@
                     $regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
                 }
-            } // ElseIf it's a known single-entity tag but it doesn't close itself, do so
-            elseif ( in_array( $tag, $single_tags ) ) {
+            } elseif ( in_array( $tag, $single_tags ) ) { // ElseIf it's a known single-entity tag but it doesn't close itself, do so
                 $regex[2] .= '/';
-            } // Else it's not a single-entity tag
-            else {
+            } else { // Else it's not a single-entity tag
                 // If the top of the stack is the same as the tag we want to push, close previous tag
                 if ( $stacksize > 0 && ! in_array( $tag, $nestable_tags ) && $tagstack[ $stacksize - 1 ] == $tag ) {

trunk/src/wp-includes/general-template.php

@@ -921 +921 @@
             wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr )
         );
-    } // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
-    elseif ( is_customize_preview() ) {
+    } elseif ( is_customize_preview() ) {
+        // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
         $html = sprintf(
             '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',

trunk/src/wp-includes/load.php

@@ -69 +69 @@
     if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
-        // IIS Mod-Rewrite
         if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+            // IIS Mod-Rewrite
             $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
-        } // IIS Isapi_Rewrite
-        elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+        } elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+            // IIS Isapi_Rewrite
             $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
         } else {

trunk/src/wp-includes/media.php

@@ -105 +105 @@
             $max_width = min( intval( $content_width ), $max_width );
         }
-    } // $size == 'full' has no constraint
-    else {
+    } else { // $size == 'full' has no constraint
         $max_width  = $width;
         $max_height = $height;