Changeset 42343 for trunk/tests/phpunit/tests/ajax/DeleteComment.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/tests/phpunit/tests/ajax/DeleteComment.php (modified) (21 diffs)

trunk/tests/phpunit/tests/ajax/DeleteComment.php

@@ -18 +18 @@
     /**
      * List of comments
+     *
      * @var array
      */
@@ -24 +25 @@
     /**
      * ID of a post.
+     *
      * @var int
      */
@@ -31 +33 @@
         self::$post_id = $factory->post->create();
 
-        $comment_ids = $factory->comment->create_post_comments( self::$post_id, 8 );
+        $comment_ids    = $factory->comment->create_post_comments( self::$post_id, 8 );
         self::$comments = array_map( 'get_comment', $comment_ids );
     }
@@ -39 +41 @@
      */
     protected function _clear_post_action() {
-        unset($_POST['trash']);
-        unset($_POST['untrash']);
-        unset($_POST['spam']);
-        unset($_POST['unspam']);
-        unset($_POST['delete']);
+        unset( $_POST['trash'] );
+        unset( $_POST['untrash'] );
+        unset( $_POST['spam'] );
+        unset( $_POST['unspam'] );
+        unset( $_POST['delete'] );
         $this->_last_response = '';
     }
@@ -54 +56 @@
      * Test as a privilged user (administrator)
      * Expects test to pass
+     *
      * @param mixed $comment Comment object
      * @param string action trash, untrash, etc.
@@ -69 +72 @@
         $_POST['id']          = $comment->comment_ID;
         $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );
-        $_POST[$action]       = 1;
+        $_POST[ $action ]     = 1;
         $_POST['_total']      = count( self::$comments );
         $_POST['_per_page']   = 100;
@@ -95 +98 @@
             $total = $_POST['_total'] - 1;
 
-        // unspam, untrash should make the total go up
+            // unspam, untrash should make the total go up
         } elseif ( in_array( $action, array( 'untrash', 'unspam' ) ) ) {
             $total = $_POST['_total'] + 1;
@@ -102 +105 @@
         // The total is calculated based on a page break -OR- a random number.  Let's look for both possible outcomes
         $comment_count = wp_count_comments( 0 );
-        $recalc_total = $comment_count->total_comments;
+        $recalc_total  = $comment_count->total_comments;
 
         // Check for either possible total
-        $message = sprintf( 'returned value: %1$d $total: %2$d  $recalc_total: %3$d', (int)  $xml->response[0]->comment[0]->supplemental[0]->total[0], $total, $recalc_total );
-        $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0] , array( $total, $recalc_total ) ), $message );
+        $message = sprintf( 'returned value: %1$d $total: %2$d  $recalc_total: %3$d', (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], $total, $recalc_total );
+        $this->assertTrue( in_array( (int) $xml->response[0]->comment[0]->supplemental[0]->total[0], array( $total, $recalc_total ) ), $message );
     }
 
@@ -112 +115 @@
      * Test as a non-privileged user (subscriber)
      * Expects test to fail
+     *
      * @param mixed $comment Comment object
      * @param string action trash, untrash, etc.
@@ -127 +131 @@
         $_POST['id']          = $comment->comment_ID;
         $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );
-        $_POST[$action]       = 1;
+        $_POST[ $action ]     = 1;
         $_POST['_total']      = count( self::$comments );
         $_POST['_per_page']   = 100;
@@ -142 +146 @@
      * Test with a bad nonce
      * Expects test to fail
+     *
      * @param mixed $comment Comment object
      * @param string action trash, untrash, etc.
@@ -157 +162 @@
         $_POST['id']          = $comment->comment_ID;
         $_POST['_ajax_nonce'] = wp_create_nonce( uniqid() );
-        $_POST[$action]       = 1;
+        $_POST[ $action ]     = 1;
         $_POST['_total']      = count( self::$comments );
         $_POST['_per_page']   = 100;
@@ -171 +176 @@
      * Test with a bad id
      * Expects test to fail
+     *
      * @param mixed $comment Comment object
      * @param string action trash, untrash, etc.
@@ -186 +192 @@
         $_POST['id']          = 12346789;
         $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_12346789' );
-        $_POST[$action]       = 1;
+        $_POST[ $action ]     = 1;
         $_POST['_total']      = count( self::$comments );
         $_POST['_per_page']   = 100;
@@ -207 +213 @@
      * Test doubling the action (e.g. trash a trashed comment)
      * Expects test to fail
+     *
      * @param mixed $comment Comment object
      * @param string action trash, untrash, etc.
@@ -222 +229 @@
         $_POST['id']          = $comment->comment_ID;
         $_POST['_ajax_nonce'] = wp_create_nonce( 'delete-comment_' . $comment->comment_ID );
-        $_POST[$action]       = 1;
+        $_POST[ $action ]     = 1;
         $_POST['_total']      = count( self::$comments );
         $_POST['_per_page']   = 100;
@@ -255 +262 @@
     /**
      * Delete a comment as an administrator (expects success)
+     *
      * @return void
      */
@@ -272 +280 @@
     /**
      * Delete a comment as a subscriber (expects permission denied)
+     *
      * @return void
      */
@@ -289 +298 @@
     /**
      * Delete a comment with no id
+     *
      * @return void
      */
@@ -306 +316 @@
     /**
      * Delete a comment with a bad nonce
+     *
      * @return void
      */
@@ -323 +334 @@
     /**
      * Test trashing an already trashed comment, etc.
+     *
      * @return void
      */