Changeset 47808 for trunk/src/wp-includes/comment.php

Timestamp:

05/16/2020 06:40:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison where static strings are involved.

This reduces the number of WordPress.PHP.StrictComparisons.LooseComparison issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-includes/comment.php (modified) (10 diffs)

trunk/src/wp-includes/comment.php

@@ -128 +128 @@
      */
     if ( 1 == get_option( 'comment_whitelist' ) ) {
-        if ( 'trackback' !== $comment_type && 'pingback' !== $comment_type && '' != $author && '' != $email ) {
+        if ( 'trackback' !== $comment_type && 'pingback' !== $comment_type && '' !== $author && '' !== $email ) {
             $comment_user = get_user_by( 'email', wp_unslash( $email ) );
             if ( ! empty( $comment_user->ID ) ) {
@@ -964 +964 @@
         'pings'     => array(),
     );
-    $count            = count( $comments );
+
+    $count = count( $comments );
+
     for ( $i = 0; $i < $count; $i++ ) {
         $type = $comments[ $i ]->comment_type;
+
         if ( empty( $type ) ) {
             $type = 'comment';
         }
+
         $comments_by_type[ $type ][] = &$comments[ $i ];
-        if ( 'trackback' == $type || 'pingback' == $type ) {
+
+        if ( 'trackback' === $type || 'pingback' === $type ) {
             $comments_by_type['pings'][] = &$comments[ $i ];
         }
@@ -1282 +1287 @@
 
     $mod_keys = trim( get_option( 'blacklist_keys' ) );
-    if ( '' == $mod_keys ) {
+    if ( '' === $mod_keys ) {
         return false; // If moderation keys are empty.
     }
@@ -1672 +1677 @@
     } elseif ( '0' == $approved ) {
         return 'unapproved';
-    } elseif ( 'spam' == $approved ) {
+    } elseif ( 'spam' === $approved ) {
         return 'spam';
-    } elseif ( 'trash' == $approved ) {
+    } elseif ( 'trash' === $approved ) {
         return 'trash';
     } else {
@@ -2115 +2120 @@
 
     $commentdata['comment_parent'] = isset( $commentdata['comment_parent'] ) ? absint( $commentdata['comment_parent'] ) : 0;
-    $parent_status                 = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
-    $commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
+
+    $parent_status = ( $commentdata['comment_parent'] > 0 ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
+
+    $commentdata['comment_parent'] = ( 'approved' === $parent_status || 'unapproved' === $parent_status ) ? $commentdata['comment_parent'] : 0;
 
     if ( ! isset( $commentdata['comment_author_IP'] ) ) {
@@ -2376 +2383 @@
     if ( ! isset( $data['comment_approved'] ) ) {
         $data['comment_approved'] = 1;
-    } elseif ( 'hold' == $data['comment_approved'] ) {
+    } elseif ( 'hold' === $data['comment_approved'] ) {
         $data['comment_approved'] = 0;
-    } elseif ( 'approve' == $data['comment_approved'] ) {
+    } elseif ( 'approve' === $data['comment_approved'] ) {
         $data['comment_approved'] = 1;
     }
@@ -2801 +2808 @@
     foreach ( (array) $services as $service ) {
         $service = trim( $service );
-        if ( '' != $service ) {
+        if ( '' !== $service ) {
             weblog_ping( $service );
         }
@@ -2986 +2993 @@
 
     // Using a timeout of 3 seconds should be enough to cover slow servers.
-    $client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' == $path ) ) ? false : $path ) );
+    $client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' === $path ) ) ? false : $path ) );
     $client->timeout    = 3;
     $client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
@@ -3267 +3274 @@
     $status = get_post_status( $post );
 
-    if ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
+    if ( ( 'private' === $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
         return new WP_Error( 'comment_id_not_found' );
     }
@@ -3286 +3293 @@
         return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
 
-    } elseif ( 'trash' == $status ) {
+    } elseif ( 'trash' === $status ) {
 
         /**