Changeset 53896

Timestamp:

08/14/2022 02:12:22 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Restore correct regex formatting in dbDelta().

An earlier regex for normalizing index definitions disables the PHPCS check for extra padding in order to keep a more readable indentation. However, this was missed for index columns regex.

Follow-up to [37583], [42228], [42249], [42343].

See #55647.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -2892 +2892 @@
                     foreach ( $index_columns as $id => &$index_column ) {
                         // Extract column name and number of indexed characters (sub_part).
+                        // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
                         preg_match(
                             '/'
-                            . '`?'                      // Name can be escaped with a backtick.
-                            . '(?P<column_name>'    // 1) Name of the column.
-                            . '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
-                            . ')'
-                            . '`?'                      // Name can be escaped with a backtick.
-                            . '(?:'                     // Optional sub part.
-                            . '\s*'                 // Optional white space character between name and opening bracket.
-                            . '\('                  // Opening bracket for the sub part.
-                            . '\s*'             // Optional white space character after opening bracket.
-                            . '(?P<sub_part>'
-                            . '\d+'         // 2) Number of indexed characters.
-                            . ')'
-                            . '\s*'             // Optional white space character before closing bracket.
-                            . '\)'                 // Closing bracket for the sub part.
-                            . ')?'
+                            .   '`?'                      // Name can be escaped with a backtick.
+                            .       '(?P<column_name>'    // 1) Name of the column.
+                            .           '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
+                            .       ')'
+                            .   '`?'                      // Name can be escaped with a backtick.
+                            .   '(?:'                     // Optional sub part.
+                            .       '\s*'                 // Optional white space character between name and opening bracket.
+                            .       '\('                  // Opening bracket for the sub part.
+                            .           '\s*'             // Optional white space character after opening bracket.
+                            .           '(?P<sub_part>'
+                            .               '\d+'         // 2) Number of indexed characters.
+                            .           ')'
+                            .           '\s*'             // Optional white space character before closing bracket.
+                            .       '\)'                  // Closing bracket for the sub part.
+                            .   ')?'
                             . '/',
                             $index_column,
                             $index_column_matches
                         );
+                        // phpcs:enable
 
                         // Escape the column name with backticks.