Changeset 55636 for branches/6.2

Timestamp:

04/08/2023 09:19:29 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Apply various alignment corrections from composer format.

This fixes a few WPCS warnings along the lines of:

• Array double arrow not aligned correctly
• Equals sign not aligned with surrounding statements
• Usage of ELSE IF is discouraged; use ELSEIF instead

Follow-up to [55099], [55192], [55194], [55271].

Props davidbaumwald, jrf, SergeyBiryukov.
Merges [55606] to the 6.2 branch.
Fixes #57994.

Location:

branches/6.2

Files:

• . (modified) (1 prop)
• src/wp-admin/user-edit.php (modified) (2 diffs)
• src/wp-includes/block-template-utils.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)

branches/6.2/src/wp-admin/user-edit.php

@@ -350 +350 @@
 
                     <?php
-                    $languages = get_available_languages();
+                    $languages                = get_available_languages();
                     $can_install_translations = current_user_can( 'install_languages' ) && wp_can_install_language_pack();
                     ?>
@@ -371 +371 @@
                             wp_dropdown_languages(
                                 array(
-                                    'name'                        => 'locale',
-                                    'id'                          => 'locale',
-                                    'selected'                    => $user_locale,
-                                    'languages'                   => $languages,
+                                    'name'      => 'locale',
+                                    'id'        => 'locale',
+                                    'selected'  => $user_locale,
+                                    'languages' => $languages,
                                     'show_available_translations' => $can_install_translations,
-                                    'show_option_site_default'    => true,
+                                    'show_option_site_default' => true,
                                 )
                             );

branches/6.2/src/wp-includes/block-template-utils.php

@@ -1339 +1339 @@
             $template_hierarchy[] = $type;
         }
-    } else if ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
+    } elseif ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
         $template_hierarchy[] = $matches[1];
-    } else if ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
+    } elseif ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
         $type           = $matches[1];
         $slug_remaining = $matches[2];

branches/6.2/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -273 +273 @@
         }
 
-        $result  = wp_update_post( wp_slash( (array) $changes ), true, false );
+        $result = wp_update_post( wp_slash( (array) $changes ), true, false );
         if ( is_wp_error( $result ) ) {
             return $result;

branches/6.2/src/wp-includes/script-loader.php

@@ -1109 +1109 @@
     $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
     $mejs_settings = array(
-        'pluginPath'  => includes_url( 'js/mediaelement/', 'relative' ),
-        'classPrefix' => 'mejs-',
-        'stretching'  => 'responsive',
+        'pluginPath'            => includes_url( 'js/mediaelement/', 'relative' ),
+        'classPrefix'           => 'mejs-',
+        'stretching'            => 'responsive',
         /** This filter is documented in wp-includes/media.php */
         'audioShortcodeLibrary' => apply_filters( 'wp_audio_shortcode_library', 'mediaelement' ),