From b2a11463804e70fe052e13c93a6c9c9db4ec038e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 7 Feb 2020 19:16:06 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@47207


git-svn-id: http://core.svn.wordpress.org/trunk@47007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/meta-boxes.php          | 2 +-
 wp-admin/includes/translation-install.php | 2 +-
 wp-includes/functions.php                 | 2 +-
 wp-includes/shortcodes.php                | 3 +--
 wp-includes/version.php                   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 6307035f3a..7316a1a65b 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -427,7 +427,7 @@ function attachment_submit_meta_box( $post ) {
 			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>';
 		}
 	}
 	?>
diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php
index 76ad22bd81..5d15b22f66 100644
--- a/wp-admin/includes/translation-install.php
+++ b/wp-admin/includes/translation-install.php
@@ -21,7 +21,7 @@ function translations_api( $type, $args = null ) {
 	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.' ) );
 	}
 
 	/**
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index a48a09a03b..ef4d23debb 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -5200,7 +5200,7 @@ function _doing_it_wrong( $function, $message, $version ) {
 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' );
 }
 
 /**
diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 5c425bc64a..3b3ef23615 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -258,8 +258,7 @@ function get_shortcode_regex( $tagnames = null ) {
 	// 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.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ef20cc274..334f6c61b6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47206';
+$wp_version = '5.4-alpha-47207';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.