Changeset 50762

Timestamp:

04/16/2021 11:59:14 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-admin/includes/class-wp-automatic-updater.php.

Includes minor code layout fixes for better readability.

See #52627.

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (13 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -152 +152 @@
 
                 // If we can't do an auto core update, we may still be able to email the user.
-                if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
+                if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership )
+                        || $this->is_vcs_checkout( $context )
+                ) {
                         if ( 'core' === $type ) {
                                 $this->send_core_update_notification_email( $item );
@@ -257 +259 @@
                 if ( $notified
                         && get_site_option( 'admin_email' ) === $notified['email']
-                        && $notified['version'] == $item->current
+                        && $notified['version'] === $item->current
                 ) {
                         return false;
@@ -634 +636 @@
                         && 'fail' === $notified['type']
                         && get_site_option( 'admin_email' ) === $notified['email']
-                        && $notified['version'] == $core_update->current
+                        && $notified['version'] === $core_update->current
                 ) {
                         $send = false;
@@ -683 +685 @@
                 }
 
-                $newer_version_available = ( 'upgrade' === $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
+                if ( 'upgrade' === $next_user_core_update->response
+                        && version_compare( $next_user_core_update->version, $core_update->version, '>' )
+                ) {
+                        $newer_version_available = true;
+                } else {
+                        $newer_version_available = false;
+                }
 
                 /**
@@ -1190 +1198 @@
                                         } else {
                                                 $body[] = sprintf(
-                                                         /* translators: 1: Theme name, 2: Version number. */
+                                                        /* translators: 1: Theme name, 2: Version number. */
                                                         __( '- %1$s version %2$s' ),
                                                         $item->name,
@@ -1281 +1289 @@
                 if ( isset( $this->update_results['core'] ) ) {
                         $result = $this->update_results['core'][0];
+
                         if ( $result->result && ! is_wp_error( $result->result ) ) {
                                 /* translators: %s: WordPress version. */
@@ -1289 +1298 @@
                                 $failures++;
                         }
+
                         $body[] = '';
                 }
@@ -1297 +1307 @@
                                 continue;
                         }
+
                         $success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
+
                         if ( $success_items ) {
                                 $messages = array(
@@ -1311 +1323 @@
                                 }
                         }
-                        if ( $success_items != $this->update_results[ $type ] ) {
+
+                        if ( $success_items !== $this->update_results[ $type ] ) {
                                 // Failed updates.
                                 $messages = array(
@@ -1320 +1333 @@
 
                                 $body[] = $messages[ $type ];
+
                                 foreach ( $this->update_results[ $type ] as $item ) {
                                         if ( ! $item->result || is_wp_error( $item->result ) ) {
@@ -1328 +1342 @@
                                 }
                         }
+
                         $body[] = '';
                 }
 
                 $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+
                 if ( $failures ) {
                         $body[] = trim(
@@ -1368 +1384 @@
                                 continue;
                         }
+
                         foreach ( $this->update_results[ $type ] as $update ) {
                                 $body[] = $update->name;
                                 $body[] = str_repeat( '-', strlen( $update->name ) );
+
                                 foreach ( $update->messages as $message ) {
                                         $body[] = '  ' . html_entity_decode( str_replace( '…', '...', $message ) );
                                 }
+
                                 if ( is_wp_error( $update->result ) ) {
                                         $results = array( 'update' => $update->result );
+
                                         // If we rolled back, we want to know an error that occurred then too.
                                         if ( 'rollback_was_required' === $update->result->get_error_code() ) {
                                                 $results = (array) $update->result->get_error_data();
                                         }
+
                                         foreach ( $results as $result_type => $result ) {
                                                 if ( ! is_wp_error( $result ) ) {
@@ -1398 +1419 @@
                                         }
                                 }
+
                                 $body[] = '';
                         }