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

Timestamp:

05/16/2020 06:40:52 PM (4 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-admin/includes/class-wp-automatic-updater.php (modified) (13 diffs)

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

@@ -144 +144 @@
         // Only relax the filesystem checks when the update doesn't include new files.
         $allow_relaxed_file_ownership = false;
-        if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+        if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
             $allow_relaxed_file_ownership = true;
         }
@@ -150 +150 @@
         // 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 ( 'core' == $type ) {
+            if ( 'core' === $type ) {
                 $this->send_core_update_notification_email( $item );
             }
@@ -157 +157 @@
 
         // Next up, is this an item we can update?
-        if ( 'core' == $type ) {
+        if ( 'core' === $type ) {
             $update = Core_Upgrader::should_update_to_version( $item->current );
         } else {
@@ -185 +185 @@
 
         if ( ! $update ) {
-            if ( 'core' == $type ) {
+            if ( 'core' === $type ) {
                 $this->send_core_update_notification_email( $item );
             }
@@ -192 +192 @@
 
         // If it's a core update, are we actually compatible with its requirements?
-        if ( 'core' == $type ) {
+        if ( 'core' === $type ) {
             global $wpdb;
 
@@ -345 +345 @@
 
         $allow_relaxed_file_ownership = false;
-        if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
+        if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
             $allow_relaxed_file_ownership = true;
         }
@@ -368 +368 @@
         }
 
-        if ( 'core' == $type ) {
-            if ( is_wp_error( $upgrade_result ) && ( 'up_to_date' == $upgrade_result->get_error_code() || 'locked' == $upgrade_result->get_error_code() ) ) {
-                // These aren't actual errors, treat it as a skipped-update instead to avoid triggering the post-core update failure routines.
+        if ( 'core' === $type ) {
+            if ( is_wp_error( $upgrade_result )
+                && ( 'up_to_date' === $upgrade_result->get_error_code()
+                    || 'locked' === $upgrade_result->get_error_code() )
+            ) {
+                // These aren't actual errors, treat it as a skipped-update instead
+                // to avoid triggering the post-core update failure routines.
                 return false;
             }
@@ -627 +631 @@
 
         $next_user_core_update = get_preferred_from_update_core();
+
         // If the update transient is empty, use the update we just performed.
         if ( ! $next_user_core_update ) {
             $next_user_core_update = $core_update;
         }
-        $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
+
+        $newer_version_available = ( 'upgrade' === $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
 
         /**
@@ -716 +722 @@
                 // Don't show this message if there is a newer version available.
                 // Potential for confusion, and also not useful for them to know at this point.
-                if ( 'fail' == $type && ! $newer_version_available ) {
+                if ( 'fail' === $type && ! $newer_version_available ) {
                     $body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
                 }
@@ -779 +785 @@
         $body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
 
-        if ( 'critical' == $type && is_wp_error( $result ) ) {
+        if ( 'critical' === $type && is_wp_error( $result ) ) {
             $body .= "\n***\n\n";
             /* translators: %s: WordPress version. */
@@ -788 +794 @@
             // If we had a rollback and we're still critical, then the rollback failed too.
             // Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-            if ( 'rollback_was_required' == $result->get_error_code() ) {
+            if ( 'rollback_was_required' === $result->get_error_code() ) {
                 $errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
             } else {
@@ -798 +804 @@
                     continue;
                 }
+
                 $error_code = $error->get_error_code();
                 /* translators: %s: Error code. */
                 $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
-                if ( 'rollback_was_required' == $error_code ) {
+
+                if ( 'rollback_was_required' === $error_code ) {
                     continue;
                 }
+
                 if ( $error->get_error_message() ) {
                     $body .= "\n" . $error->get_error_message();
                 }
+
                 $error_data = $error->get_error_data();
                 if ( $error_data ) {
@@ -812 +822 @@
                 }
             }
+
             $body .= "\n";
         }