Changeset 58360

Timestamp:

06/07/2024 12:27:59 PM (2 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-admin/includes/post.php.

Follow-up to [2718], [7103], [7338], [8857], [9036], [9103], [11807], [11908], [15315], [16901], [17078], [23725], [23735], [44141], [45583].

Props aristath, poena, afercia, SergeyBiryukov.
See #60700.

Location:

trunk

Files:

• src/wp-admin/includes/post.php (modified) (15 diffs)
• tests/phpunit/tests/admin/includesPost.php (modified) (3 diffs)

trunk/src/wp-admin/includes/post.php

@@ -73 +73 @@
     }
 
-    if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
+    if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
         && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 
@@ -166 +166 @@
 
     foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
-        if ( ! empty( $post_data[ 'hidden_' . $timeunit ] ) && $post_data[ 'hidden_' . $timeunit ] != $post_data[ $timeunit ] ) {
+        if ( ! empty( $post_data[ 'hidden_' . $timeunit ] ) && $post_data[ 'hidden_' . $timeunit ] != $post_data[ $timeunit ] ) {
             $post_data['edit_date'] = '1';
             break;
@@ -376 +376 @@
             }
 
-            if ( $meta->post_id != $post_id ) {
+            if ( = $post_id ) {
                 continue;
             }
@@ -403 +403 @@
             }
 
-            if ( $meta->post_id != $post_id ) {
+            if ( = $post_id ) {
                 continue;
             }
@@ -517 +517 @@
     }
 
-    if ( -1 == $post_data['_status'] ) {
+    if ( == $post_data['_status'] ) {
         $post_data['post_status'] = null;
         unset( $post_data['post_status'] );
@@ -551 +551 @@
 
     foreach ( $reset as $field ) {
-        if ( isset( $post_data[ $field ] ) && ( '' === $post_data[ $field ] || -1 == $post_data[ $field ] ) ) {
+        if ( isset( $post_data[ $field ] ) && ( '' === $post_data[ $field ] || == $post_data[ $field ] ) ) {
             unset( $post_data[ $field ] );
         }
@@ -1405 +1405 @@
  */
 function postbox_classes( $box_id, $screen_id ) {
-    if ( isset( $_GET['edit'] ) && $_GET['edit'] == $box_id ) {
+    if ( isset( $_GET['edit'] ) && $_GET['edit'] == $box_id ) {
         $classes = array( '' );
     } elseif ( get_user_option( 'closedpostboxes_' . $screen_id ) ) {
@@ -1578 +1578 @@
         // Encourage a pretty permalink setting.
         if ( ! get_option( 'permalink_structure' ) && current_user_can( 'manage_options' )
-            && ! ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID )
+            && ! ( 'page' === get_option( 'show_on_front' ) && == $post->ID )
         ) {
             $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small">' . __( 'Change Permalink Structure' ) . "</a></span>\n";
@@ -1714 +1714 @@
     $lock = explode( ':', $lock );
     $time = $lock[0];
-    $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+    $user = isset( $lock[1] ) ?  get_post_meta( $post->ID, '_edit_last', true );
 
     if ( ! get_userdata( $user ) ) {
@@ -1723 +1723 @@
     $time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
-    if ( $time && $time > time() - $time_window && get_current_user_id() != $user ) {
+    if ( $time && $time > time() - $time_window && get_current_user_id() != $user ) {
         return $user;
     }
@@ -1753 +1753 @@
     $user_id = get_current_user_id();
 
-    if ( 0 == $user_id ) {
+    if ( 0 == $user_id ) {
         return false;
     }
@@ -1830 +1830 @@
         $query_args = array();
         if ( get_post_type_object( $post->post_type )->public ) {
-            if ( 'publish' === $post->post_status || $user->ID != $post->post_author ) {
+            if ( 'publish' === $post->post_status || $user->ID != $post->post_author ) {
                 // Latest content is in autosave.
                 $nonce                       = wp_create_nonce( 'post_preview_' . $post->ID );
@@ -2082 +2082 @@
     $is_autosave = false;
 
-    if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
+    if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
         && ( 'draft' === $post->post_status || 'auto-draft' === $post->post_status )
     ) {
@@ -2157 +2157 @@
     }
 
-    if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
+    if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
         && ( 'auto-draft' === $post->post_status || 'draft' === $post->post_status )
     ) {
@@ -2409 +2409 @@
             $meta_boxes = (array) $wp_meta_boxes[ $current_screen->id ][ $location ][ $priority ];
             foreach ( $meta_boxes as $meta_box ) {
-                if ( false == $meta_box || ! $meta_box['title'] ) {
+                if ( false == $meta_box || ! $meta_box['title'] ) {
                     continue;
                 }

trunk/tests/phpunit/tests/admin/includesPost.php

@@ -241 +241 @@
         $request = array(
             'post_type'      => 'post',
-            'post_author'    => -1,
-            'ping_status'    => -1,
-            'comment_status' => -1,
-            '_status'        => -1,
+            'post_author'    => ,
+            'ping_status'    => ,
+            'comment_status' => ,
+            '_status'        => ,
             'post'           => array( $post1, $post2 ),
         );
@@ -274 +274 @@
 
         $request = array(
-            'post_format' => -1, // Don't change the post format.
-            '_status'     => -1,
+            'post_format' => , // Don't change the post format.
+            '_status'     => ,
             'post'        => $post_ids,
         );
@@ -368 +368 @@
         $request = array(
             'post_format' => 'aside',
-            '_status'     => -1,
+            '_status'     => ,
             'post'        => array( self::$post_id ),
         );