Changeset 47207

Timestamp:

02/07/2020 07:14:29 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Adjust coding standards to always omit parentheses for include/require statements.

These are language constructs, not function calls, so the parentheses are unnecessary.

This updates the PHPCS configuration file the enforce the sniff until it is moved from the WordPress-Extra ruleset to the WordPress-Core ruleset upstream.

Follow-up to [47198].

Props desrosj, jrf, GaryJ.
Fixes #49376.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (3 diffs)
• src/wp-admin/includes/meta-boxes.php (modified) (1 diff)
• src/wp-admin/includes/translation-install.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/shortcodes.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -170 +170 @@
 
     <!-- Whitelist the I18n functions file from issues identified by the I18n sniff
-        (such as calling the low-level translate() function). -->
+         (such as calling the low-level translate() function). -->
     <rule ref="WordPress.WP.I18n">
         <exclude-pattern>/src/wp-includes/l10n\.php</exclude-pattern>
@@ -190 +190 @@
 
     <!-- Exclude checking of line endings when reporting errors, but fix them when running phpcbf.
-        Git and SVN manage these pretty well cross-platform as "native".
-        Whitelist configuration files. -->
+         Git and SVN manage these pretty well cross-platform as "native".
+         Whitelist configuration files. -->
     <rule ref="Generic.Files.LineEndings">
         <exclude-pattern>/wp-config\.php</exclude-pattern>
@@ -271 +271 @@
     </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="PEAR.Files.IncludingFile.BracketsNotRequired">
+        <type>warning</type>
+    </rule>
+    <rule ref="PEAR.Files.IncludingFile.UseRequire">
+        <type>warning</type>
+    </rule>
+    <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
+        <type>warning</type>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+
     <!-- Assignments in while conditions are a valid method of looping over iterables. -->
     <rule ref="WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition">

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

@@ -428 +428 @@
         } 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>';
         }
     }

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

@@ -22 +22 @@
 
     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.' ) );
     }
 

trunk/src/wp-includes/functions.php

@@ -5201 +5201 @@
     $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' );
 }
 

trunk/src/wp-includes/shortcodes.php

@@ -259 +259 @@
 
     // 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.