Improve wp comment spam output (#272)

Improve wp comment spam output

Author: schlessera

features/comment.feature

@@ -276,7 +276,7 @@ Feature: Manage WordPress comments
     When I run `wp comment spam {COMMENT_ID}`
     Then STDOUT should be:
       """
-      Success: Marked as spam comment {COMMENT_ID}.
+      Success: Marked comment {COMMENT_ID} as spam.
       """
 
     When I run `wp comment list --format=count --status=spam`
@@ -301,7 +301,7 @@ Feature: Manage WordPress comments
     When I run `wp comment spam {COMMENT_ID}`
     Then STDOUT should be:
       """
-      Success: Marked as spam comment {COMMENT_ID}.
+      Success: Marked comment {COMMENT_ID} as spam.
       """
 
     When I try `wp comment unspam {COMMENT_ID}`

src/Comment_Command.php

@@ -429,10 +429,9 @@ private function call( $args, $status, $success, $failure ) {
 		$func = "wp_{$status}_comment";
 
 		if ( ! $func( $comment_id ) ) {
-			WP_CLI::error( "{$failure} comment {$comment_id}." );
+			WP_CLI::error( sprintf( $failure, "comment {$comment_id}" ) );
 		}
-
-		WP_CLI::success( "{$success} comment {$comment_id}." );
+		WP_CLI::success( sprintf( $success, "comment {$comment_id}" ) );
 	}
 
 	private function set_status( $args, $status, $success ) {
@@ -473,7 +472,7 @@ private function check_server_name() {
 	 */
 	public function trash( $args, $assoc_args ) {
 		foreach ( $args as $id ) {
-			$this->call( $id, __FUNCTION__, 'Trashed', 'Failed trashing' );
+			$this->call( $id, __FUNCTION__, 'Trashed %s.', 'Failed trashing %s.' );
 		}
 	}
 
@@ -494,7 +493,7 @@ public function trash( $args, $assoc_args ) {
 	public function untrash( $args, $assoc_args ) {
 		$this->check_server_name();
 		foreach ( $args as $id ) {
-			$this->call( $id, __FUNCTION__, 'Untrashed', 'Failed untrashing' );
+			$this->call( $id, __FUNCTION__, 'Untrashed %s.', 'Failed untrashing %s.' );
 		}
 	}
 
@@ -514,7 +513,7 @@ public function untrash( $args, $assoc_args ) {
 	 */
 	public function spam( $args, $assoc_args ) {
 		foreach ( $args as $id ) {
-			$this->call( $id, __FUNCTION__, 'Marked as spam', 'Failed marking as spam' );
+			$this->call( $id, __FUNCTION__, 'Marked %s as spam.', 'Failed marking %s as spam.' );
 		}
 	}
 
@@ -535,7 +534,7 @@ public function spam( $args, $assoc_args ) {
 	public function unspam( $args, $assoc_args ) {
 		$this->check_server_name();
 		foreach ( $args as $id ) {
-			$this->call( $id, __FUNCTION__, 'Unspammed', 'Failed unspamming' );
+			$this->call( $id, __FUNCTION__, 'Unspammed %s.', 'Failed unspamming %s.' );
 		}
 	}