Changeset 7373

Timestamp:

11/18/2025 01:03:20 AM (5 weeks ago)

Author:

johnjamesjacoby

Message:

Tools - Code Improvement: stop ignoring Universal.WhiteSpace.PrecisionAlignment.Found sniff.

This change removes any precision alignment that used spaces instead of tabs.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/includes/admin/settings.php (modified) (8 diffs)
• src/includes/admin/tools/help.php (modified) (4 diffs)
• src/includes/common/formatting.php (modified) (1 diff)
• src/includes/common/functions.php (modified) (1 diff)
• src/includes/core/template-loader.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -476 +476 @@
     </rule>
 
-    <rule ref="Universal.WhiteSpace.PrecisionAlignment.Found">
-        <exclude-pattern>/src/*</exclude-pattern>
-    </rule>
-
     <rule ref="WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine">
         <exclude-pattern>/src/*</exclude-pattern>

trunk/src/includes/admin/settings.php

@@ -1625 +1625 @@
 function bbp_converter_setting_callback_dbserver() {
 ?>
-    <input name="_bbp_converter_db_server"
-           id="_bbp_converter_db_server"
-           type="text"
-           class="code"
-           value="<?php bbp_form_option( '_bbp_converter_db_server', 'localhost' ); ?>"
-           <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_server' ); ?>
+    <input
+        name="_bbp_converter_db_server"
+        id="_bbp_converter_db_server"
+        type="text"
+        class="code"
+        value="<?php bbp_form_option( '_bbp_converter_db_server', 'localhost' ); ?>"
+        <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_server' ); ?>
     />
     <p class="description">
@@ -1651 +1652 @@
 function bbp_converter_setting_callback_dbport() {
     ?>
-    <input name="_bbp_converter_db_port"
-           id="_bbp_converter_db_port"
-           type="text"
-           class="code"
-           value="<?php bbp_form_option( '_bbp_converter_db_port', '3306' ); ?>"
-           <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_port' ); ?>
+    <input
+        name="_bbp_converter_db_port"
+        id="_bbp_converter_db_port"
+        type="text"
+        class="code"
+        value="<?php bbp_form_option( '_bbp_converter_db_port', '3306' ); ?>"
+        <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_port' ); ?>
     />
     <p class="description">
@@ -1943 +1945 @@
         'id'      => 'overview',
         'title'   => esc_html__( 'Overview', 'bbpress' ),
-        'content' => '<p>' . esc_html__( 'This screen provides access to all of the Forums settings.',                          'bbpress' ) . '</p>' .
-                     '<p>' . esc_html__( 'Please see the additional help tabs for more information on each individual section.', 'bbpress' ) . '</p>'
+        'content' =>
+                    '<p>' . esc_html__( 'This screen provides access to all of the Forums settings.',                          'bbpress' ) . '</p>' .
+                    '<p>' . esc_html__( 'Please see the additional help tabs for more information on each individual section.', 'bbpress' ) . '</p>'
     ) );
 
@@ -1951 +1954 @@
         'id'      => 'main_settings',
         'title'   => esc_html__( 'Main Settings', 'bbpress' ),
-        'content' => '<p>' . esc_html__( 'The "Main Settings" section includes a number of options:', 'bbpress' ) . '</p>' .
-                     '<p>' .
+        'content' =>
+                    '<p>' . esc_html__( 'The "Main Settings" section includes a number of options:', 'bbpress' ) . '</p>' .
+                    '<p>' .
                         '<ul>' .
                             '<li>' . esc_html__( 'You can choose to lock a post after a certain number of minutes. "Locking post editing" will prevent the author from editing some amount of time after saving a post.',              'bbpress' ) . '</li>' .
@@ -1971 +1975 @@
         'id'      => 'theme_packages',
         'title'   => esc_html__( 'Theme Packages', 'bbpress' ),
-        'content' => '<p>' . esc_html__( 'The "Theme Packages" section allows you to choose which theme package should be used.', 'bbpress' ) . '</p>' .
-                     '<p>' .
+        'content' =>
+                    '<p>' . esc_html__( 'The "Theme Packages" section allows you to choose which theme package should be used.', 'bbpress' ) . '</p>' .
+                    '<p>' .
                         '<ul>' .
                             '<li>' . esc_html__( 'The "bbPress Default" package is installed by default.',      'bbpress' ) . '</li>' .
@@ -1985 +1990 @@
         'id'      => 'per_page',
         'title'   => esc_html__( 'Per Page', 'bbpress' ),
-        'content' => '<p>' . esc_html__( 'The "Per Page" section allows you to control the number of topics and replies appear on each page.',                                                    'bbpress' ) . '</p>' .
+        'content' =>
+                    '<p>' . esc_html__( 'The "Per Page" section allows you to control the number of topics and replies appear on each page.',                                                    'bbpress' ) . '</p>' .
                         '<ul>' .
                             '<li>' . esc_html__( 'This is comparable to the WordPress "Reading Settings" page, where you can set the number of posts that should show on blog pages and in feeds.', 'bbpress' ) . '</li>' .
                             '<li>' . esc_html__( 'These are broken up into two separate groups: one for what appears in your theme, another for RSS feeds.',                                        'bbpress' ) . '</li>' .
                         '</ul>' .
-                     '<p>'
+                    '<p>'
     ) );
 
@@ -1997 +2003 @@
         'id'      => 'slugs',
         'title'   => esc_html__( 'Slugs', 'bbpress' ),
-        'content' => '<p>' . esc_html__( 'The "Slugs" section allows you to control the permalink structure for your forums.',                                                                                                            'bbpress' ) . '</p>' .
+        'content' =>
+                    '<p>' . esc_html__( 'The "Slugs" section allows you to control the permalink structure for your forums.',                                                                                                            'bbpress' ) . '</p>' .
                         '<ul>' .
                             '<li>' . esc_html__( '"Archive Slugs" are used as the "root" for your forums and topics. If you combine these values with existing page slugs, bbPress will attempt to output the most correct title and content.', 'bbpress' ) . '</li>' .
@@ -2003 +2010 @@
                             '<li>' . esc_html__( 'In the event of a slug collision with WordPress or BuddyPress, a warning will appear next to the problem slug(s).', 'bbpress' ) . '</li>' .
                         '</ul>' .
-                     '<p>'
+                    '<p>'
     ) );
 

trunk/src/includes/admin/tools/help.php

@@ -29 +29 @@
         'id'      => 'repair_forums',
         'title'   => __( 'Repair Forums', 'bbpress' ),
-        'content' => '<p>' . __( 'There is more detailed information available on the bbPress and BuddyPress codex for the following:', 'bbpress' ) . '</p>' .
-                     '<p>' .
+        'content' =>
+                    '<p>' . __( 'There is more detailed information available on the bbPress and BuddyPress codex for the following:', 'bbpress' ) . '</p>' .
+                    '<p>' .
                         '<ul>' .
                             '<li>' . __( 'BuddyPress Group Forums: <a href="https://codex.buddypress.org/getting-started/installing-group-and-sitewide-forums/">Installing Group and Sitewide Forums</a> and <a href="https://codex.buddypress.org/getting-started/guides/migrating-from-old-forums-to-bbpress-2/">Migrating from old forums to bbPress 2.2+</a>.', 'bbpress' ) . '</li>' .
@@ -94 +95 @@
         'id'      => 'overview',
         'title'   => __( 'Overview', 'bbpress' ),
-        'content' => '<p>' . __( 'This screen provides access to all of the bbPress Import Forums settings and resources.',                                      'bbpress' ) . '</p>' .
-                     '<p>' . __( 'Please see the additional help tabs for more information on each individual section.',                                         'bbpress' ) . '</p>' .
-                     '<p>' . __( 'Also see the main article on the bbPress codex <a href="https://codex.bbpress.org/import-forums/">bbPress: Import Forums</a>.', 'bbpress' ) . '</p>'
+        'content' =>
+                    '<p>' . __( 'This screen provides access to all of the bbPress Import Forums settings and resources.',                                      'bbpress' ) . '</p>' .
+                    '<p>' . __( 'Please see the additional help tabs for more information on each individual section.',                                         'bbpress' ) . '</p>' .
+                    '<p>' . __( 'Also see the main article on the bbPress codex <a href="https://codex.bbpress.org/import-forums/">bbPress: Import Forums</a>.', 'bbpress' ) . '</p>'
     ) );
 
@@ -103 +105 @@
         'id'      => 'database_settings',
         'title'   => __( 'Database Settings', 'bbpress' ),
-        'content' => '<p>' . __( 'In the Database Settings you have a number of options:', 'bbpress' ) . '</p>' .
-                     '<p>' .
+        'content' =>
+                    '<p>' . __( 'In the Database Settings you have a number of options:', 'bbpress' ) . '</p>' .
+                    '<p>' .
                         '<ul>' .
                             '<li>' . __( 'The settings in this section refer to the database connection strings used by your old forum software. The best way to determine the exact settings you need is to copy them from your legacy forums configuration file or contact your web hosting provider.', 'bbpress' ) . '</li>' .
@@ -115 +118 @@
         'id'      => 'importer_options',
         'title'   => __( 'Importer Options', 'bbpress' ),
-        'content' => '<p>' . __( 'In the Options you have a number of options:', 'bbpress' ) . '</p>' .
-                     '<p>' .
+        'content' =>
+                    '<p>' . __( 'In the Options you have a number of options:', 'bbpress' ) . '</p>' .
+                    '<p>' .
                         '<ul>' .
                             '<li>' . __( 'Depending on your MySQL configuration you can tweak the "Rows Limit" and "Delay Time" that may help to improve the overall time it takes to perform a complete forum import.', 'bbpress' ) . '</li>' .

trunk/src/includes/common/formatting.php

@@ -313 +313 @@
 
     // Bail on links that match the current domain
-    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 )
+    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 )
     ) {
         return "<a {$text}>";

trunk/src/includes/common/functions.php

@@ -176 +176 @@
 
     // Is the post by an anonymous user?
-    if ( ( bbp_get_topic_post_type() === $data['post_type'] && ! bbp_is_topic_anonymous( $postarr['ID'] ) ) ||
-         ( bbp_get_reply_post_type() === $data['post_type'] && ! bbp_is_reply_anonymous( $postarr['ID'] ) ) ) {
+    if (
+        ( bbp_get_topic_post_type() === $data['post_type'] && ! bbp_is_topic_anonymous( $postarr['ID'] ) )
+        ||
+        ( bbp_get_reply_post_type() === $data['post_type'] && ! bbp_is_reply_anonymous( $postarr['ID'] ) )
+    ) {
         return $data;
     }

trunk/src/includes/core/template-loader.php

@@ -93 +93 @@
     }
 
-     /**
+    /**
      * Filters the path to the template file that is being used.
      *