Changeset 42228 for trunk/src/wp-includes/formatting.php

Timestamp:

11/26/2017 11:56:25 PM (7 years ago)

Author:

pento

Message:

General: Fix some precision alignment formatting warnings.

The WPCS WordPress.WhiteSpace.PrecisionAlignment rule throws warnings for a bunch of code that will likely cause issues for wpcbf. Fixing these manually beforehand gives us better auto-fixed results later.

See #41057.

File:

• trunk/src/wp-includes/formatting.php (modified) (9 diffs)

trunk/src/wp-includes/formatting.php

@@ -619 +619 @@
     if ( ! isset( $regex ) ) {
         $comments =
-              '!'           // Start of comment, after the <.
+            '!'           // Start of comment, after the <.
             . '(?:'         // Unroll the loop: Consume everything until --> is found.
             .     '-(?!->)' // Dash not followed by end of comment.
@@ -627 +627 @@
 
         $cdata =
-              '!\[CDATA\['  // Start of comment, after the <.
+            '!\[CDATA\['  // Start of comment, after the <.
             . '[^\]]*+'     // Consume non-].
             . '(?:'         // Unroll the loop: Consume everything until ]]> is found.
@@ -636 +636 @@
 
         $escaped =
-              '(?='           // Is the element escaped?
+            '(?='           // Is the element escaped?
             .    '!--'
             . '|'
@@ -648 +648 @@
 
         $regex =
-              '/('              // Capture the entire match.
+            '/('              // Capture the entire match.
             .     '<'           // Find start of element.
             .     '(?'          // Conditional expression follows.
@@ -679 +679 @@
     if ( ! isset( $html_regex ) ) {
         $comment_regex =
-              '!'           // Start of comment, after the <.
+            '!'           // Start of comment, after the <.
             . '(?:'         // Unroll the loop: Consume everything until --> is found.
             .     '-(?!->)' // Dash not followed by end of comment.
@@ -687 +687 @@
 
         $html_regex =            // Needs replaced with wp_html_split() per Shortcode API Roadmap.
-              '<'                // Find start of element.
+            '<'                // Find start of element.
             . '(?(?=!--)'        // Is this a comment?
             .     $comment_regex // Find end of comment.
@@ -719 +719 @@
     $tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
     $regex =
-          '\['              // Find start of shortcode.
+        '\['              // Find start of shortcode.
         . '[\/\[]?'         // Shortcodes may begin with [/ or [[
         . $tagregexp        // Only match registered shortcodes, because performance.
@@ -819 +819 @@
 
     $pattern =
-          '/'
+        '/'
         . '<p>'                              // Opening paragraph
         . '(?:' . $spaces . ')*+'            // Optional leading whitespace
@@ -2752 +2752 @@
 
     if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-         preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
-    ) {
+        preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text ) ) {
+
         return "<a $text>";
     }