Ticket #49376: 49376.diff

phpcs.xml.dist

@@ -270 +270 @@
                 </properties>
         </rule>
 
+        <!-- Enforce no parenthesis for language constructs, and only one space immediately after.
+                Including this rule is temporary until it is moved from the WordPress-Extra ruleset to
+                the WordPress-Core ruleset upstream.
+        -->
+        <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+
         <!-- Assignments in while conditions are a valid method of looping over iterables. -->
         <rule ref="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition">
                 <exclude-pattern>*</exclude-pattern>

src/wp-admin/includes/meta-boxes.php

@@ -427 +427 @@
                         echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
                 } else {
                         $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-                        echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+                        echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . '</a>';
                 }
         }
         ?>

src/wp-admin/includes/translation-install.php

@@ -21 +21 @@
         require ABSPATH . WPINC . '/version.php';
 
         if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ) ) ) {
-                return  new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
+                return new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
         }
 
         /**

src/wp-includes/functions.php

@@ -5200 +5200 @@
 function is_lighttpd_before_150() {
         $server_parts    = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
         $server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
-        return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
+        return 'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
 }
 
 /**

src/wp-includes/shortcodes.php

@@ -258 +258 @@
         // Also, see shortcode_unautop() and shortcode.js.
 
         // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
-        return
-                '\\['                                // Opening bracket.
+        return '\\['                                // Opening bracket.
                 . '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]].
                 . "($tagregexp)"                     // 2: Shortcode name.
                 . '(?![\\w-])'                       // Not followed by word character or hyphen.