Changeset 43571 for trunk/src/wp-admin/includes/class-wp-comments-list-table.php

Timestamp:

08/17/2018 01:50:26 AM (6 years ago)

Author:

pento

Message:

Coding Standards: Upgrade WPCS to 1.0.0

WPCS 1.0.0 includes a bunch of new auto-fixers, which drops the number of coding standards issues across WordPress significantly. Prior to running the auto-fixers, there were 15,312 issues detected. With this commit, we now drop to 4,769 issues.

This change includes three notable additions:

• Multiline function calls must now put each parameter on a new line.
• Auto-formatting files is now part of the grunt precommit script.
• Auto-fixable coding standards issues will now cause Travis failures.

Fixes #44600.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (10 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -159 +159 @@
         $total_comments = get_comments(
             array_merge(
-                $args, array(
+                $args,
+                array(
                     'count'  => true,
                     'offset' => 0,
@@ -225 +226 @@
 
             /* translators: %s: current user's comments count */
-            'mine' => _nx_noop(
+            'mine'      => _nx_noop(
                 'Mine <span class="count">(%s)</span>',
                 'Mine <span class="count">(%s)</span>',
@@ -278 +279 @@
             if ( 'mine' === $status ) {
                 $current_user_id    = get_current_user_id();
-                $num_comments->mine = get_comments( array(
-                    'user_id' => $current_user_id,
-                    'count'   => true,
-                ) );
-                $link = add_query_arg( 'user_id', $current_user_id, $link );
+                $num_comments->mine = get_comments(
+                    array(
+                        'user_id' => $current_user_id,
+                        'count'   => true,
+                    )
+                );
+                $link               = add_query_arg( 'user_id', $current_user_id, $link );
             } else {
                 $link = remove_query_arg( 'user_id', $link );
@@ -368 +371 @@
             $has_items = $this->has_items();
         }
-?>
+        ?>
         <div class="alignleft actions">
-<?php
-if ( 'top' === $which ) {
-?>
+        <?php
+        if ( 'top' === $which ) {
+            ?>
     <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
     <select id="filter-by-comment-type" name="comment_type">
         <option value=""><?php _e( 'All comment types' ); ?></option>
-<?php
-        /**
-         * Filters the comment types dropdown menu.
-         *
-         * @since 2.7.0
-         *
-         * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
-         */
-        $comment_types = apply_filters(
-            'admin_comment_types_dropdown', array(
-                'comment' => __( 'Comments' ),
-                'pings'   => __( 'Pings' ),
-            )
-        );
-
-foreach ( $comment_types as $type => $label ) {
-    echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
-}
-    ?>
+            <?php
+                /**
+                 * Filters the comment types dropdown menu.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
+                 */
+                $comment_types = apply_filters(
+                    'admin_comment_types_dropdown',
+                    array(
+                        'comment' => __( 'Comments' ),
+                        'pings'   => __( 'Pings' ),
+                    )
+                );
+
+            foreach ( $comment_types as $type => $label ) {
+                echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+            }
+            ?>
     </select>
-<?php
-    /**
-     * Fires just before the Filter submit button for comment types.
-     *
-     * @since 3.5.0
-     */
-    do_action( 'restrict_manage_comments' );
-    submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-}
-
-if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
-    wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
-    $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
-    submit_button( $title, 'apply', 'delete_all', false );
-}
+            <?php
+            /**
+             * Fires just before the Filter submit button for comment types.
+             *
+             * @since 3.5.0
+             */
+            do_action( 'restrict_manage_comments' );
+            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+        }
+
+        if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
+            wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
+            $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+            submit_button( $title, 'apply', 'delete_all', false );
+        }
         /**
          * Fires after the Filter submit button for comment types.
@@ -491 +495 @@
         $this->screen->render_screen_reader_content( 'heading_list' );
 
-?>
+        ?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
     <thead>
@@ -517 +521 @@
 
 </table>
-<?php
+        <?php
 
         $this->display_tablenav( 'bottom' );
@@ -677 +681 @@
     public function column_cb( $comment ) {
         if ( $this->user_can ) {
-        ?>
+            ?>
         <label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
         <input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
-        <?php
+            <?php
         }
     }
@@ -710 +714 @@
             /** This filter is documented in wp-admin/includes/comment.php */
             $comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
-        ?>
+            ?>
         <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
             <textarea class="comment" rows="1" cols="1"><?php echo esc_textarea( $comment_content ); ?></textarea>
@@ -718 +722 @@
             <div class="comment_status"><?php echo $comment->comment_approved; ?></div>
         </div>
-        <?php
+            <?php
         }
     }
@@ -760 +764 @@
                         's'    => $author_ip,
                         'mode' => 'detail',
-                    ), admin_url( 'edit-comments.php' )
+                    ),
+                    admin_url( 'edit-comments.php' )
                 );
                 if ( 'spam' === $comment_status ) {