Changeset 25835

Timestamp:

10/17/2013 11:20:56 PM (11 years ago)

Author:

nacin

Message:

In automatic background updates, standardize on 'update'.

New, final filter names:

• auto_update_{$type} (plugin, theme, core, language)
• automatic_updates_is_vcs_checkout
• automatic_updates_disabled

New class name is WP_Automatic_Updater. Method names include update() and should_update().

see #22704.

Location:

trunk/src

Files:

• wp-admin/about.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (17 diffs)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (3 diffs)
• wp-includes/update.php (modified) (1 diff)

trunk/src/wp-admin/about.php

@@ -45 +45 @@
             if ( $can_auto_update ) {
                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-                $upgrader = new WP_Automatic_Upgrader;
+                $upgrader = new WP_Automatic_Updater;
                 $future_minor_update = (object) array(
                     'current'       => $wp_version . '.1-about.php',
@@ -52 +52 @@
                     'mysql_version' => $required_mysql_version,
                 );
-                $can_auto_update = $upgrader->should_upgrade( 'core', $future_minor_update, ABSPATH );
+                $can_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
             }
             if ( $can_auto_update ) : ?>

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1403 +1403 @@
 
     // Determines if this WordPress Core version should update to $offered_ver or not
-    static function should_upgrade_to_version( $offered_ver /* x.y.z */ ) {
+    static function should_update_to_version( $offered_ver /* x.y.z */ ) {
         include ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
 
@@ -1552 +1552 @@
 
 /**
- * WordPress automatic background upgrader.
+ * WordPress automatic background updater.
  *
  * @since 3.7.0
  */
-class WP_Automatic_Upgrader {
+class WP_Automatic_Updater {
 
     protected $update_results = array();
@@ -1571 +1571 @@
         $disabled = defined( 'AUTOMATIC_UPDATES_DISABLED' ) && AUTOMATIC_UPDATES_DISABLED;
 
-        return apply_filters( 'auto_upgrader_disabled', $disabled );
+        return apply_filters( 'automatic_updates_disabled', $disabled );
     }
 
@@ -1601 +1601 @@
             }
         }
-        return apply_filters( 'auto_upgrade_is_vcs_checkout', $checkout, $context );
+        return apply_filters( 'automatic_updates_is_vcs_checkout', $checkout, $context );
     }
 
     /**
-     * Tests to see if we can and should upgrade a specific item.
+     * Tests to see if we can and should update a specific item.
      */
-    function should_upgrade( $type, $item, $context ) {
+    function should_update( $type, $item, $context ) {
         if ( $this->is_disabled() )
             return false;
 
-        // Checks to see if WP_Filesystem is set up to allow unattended upgrades.
+        // Checks to see if WP_Filesystem is set up to allow unattended updates.
         $skin = new Automatic_Upgrader_Skin;
         if ( ! $skin->request_filesystem_credentials( false, $context ) )
@@ -1619 +1619 @@
             return false;
 
-        // Next up, do we actually have it enabled for this type of update?
-        switch ( $type ) {
-            case 'language':
-                $upgrade = ! empty( $item->autoupdate );
-                break;
-            case 'core':
-                $upgrade = Core_Upgrader::should_upgrade_to_version( $item->current );
-                break;
-            default:
-            case 'plugin':
-            case 'theme':
-                $upgrade = false;
-                break;
-        }
+        // Next up, is this an item we can update?
+        if ( 'core' == $type )
+            $update = Core_Upgrader::should_update_to_version( $item->current );
+        else
+            $update = ! empty( $item->autoupdate );
 
         // And does the user / plugins want it?
-        // Plugins may filter on 'auto_upgrade_plugin', and check the 2nd param, $item, to only enable it for certain Plugins/Themes
-        if ( ! apply_filters( 'auto_upgrade_' . $type, $upgrade, $item ) )
+        // Plugins may filter on 'auto_update_plugin', and check the 2nd param, $item, to only enable it for certain Plugins/Themes
+        if ( ! apply_filters( 'auto_update_' . $type, $update, $item ) )
             return false;
 
@@ -1656 +1647 @@
     }
 
-    function upgrade( $type, $item ) {
-
-        $skin = new Automatic_Upgrader_Skin();
+    function update( $type, $item ) {
+
+        $skin = new Automatic_Upgrader_Skin;
 
         switch ( $type ) {
             case 'core':
-                // The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter
+                // The Core upgrader doesn't use the Upgrader's skin during the actual main part of the upgrade, instead, firing a filter.
                 add_filter( 'update_feedback', array( $skin, 'feedback' ) );
                 $upgrader = new Core_Upgrader( $skin );
@@ -1681 +1672 @@
         }
 
-        // Determine whether we can and should perform this upgrade.
-        if ( ! $this->should_upgrade( $type, $item, $context ) )
+        // Determine whether we can and should perform this update.
+        if ( ! $this->should_update( $type, $item, $context ) )
             return false;
 
@@ -1734 +1725 @@
 
     /**
-     * Kicks off a upgrade request for each item in the upgrade "queue"
+     * Kicks off a update request for each item in the update "queue".
      */
     function run() {
@@ -1742 +1733 @@
             return;
 
-        $lock_name = 'auto_upgrader.lock';
+        $lock_name = 'auto_updater.lock';
 
         // Try to lock
@@ -1773 +1764 @@
         if ( $plugin_updates && !empty( $plugin_updates->response ) ) {
             foreach ( array_keys( $plugin_updates->response ) as $plugin ) {
-                $this->upgrade( 'plugin', $plugin );
+                $this->update( 'plugin', $plugin );
             }
             // Force refresh of plugin update information
@@ -1784 +1775 @@
         if ( $theme_updates && !empty( $theme_updates->response ) ) {
             foreach ( array_keys( $theme_updates->response ) as $theme ) {
-                $this->upgrade( 'theme', $theme );
+                $this->update( 'theme', $theme );
             }
             // Force refresh of theme update information
@@ -1790 +1781 @@
         }
 
-        // Next, Process any core upgrade
+        // Next, Process any core update
         wp_version_check(); // Check for Core updates
         $extra_update_stats = array();
@@ -1798 +1789 @@
             $start_time = time();
 
-            $core_update_result = $this->upgrade( 'core', $core_update );
+            $core_update_result = $this->update( 'core', $core_update );
             delete_site_transient( 'update_core' );
 
@@ -1827 +1818 @@
         if ( $language_updates ) {
             foreach ( $language_updates as $update ) {
-                $this->upgrade( 'language', $update );
+                $this->update( 'language', $update );
             }
 
@@ -1851 +1842 @@
             return;
 
-        $upgrade_count = 0;
-        foreach ( $this->update_results as $type => $upgrades )
-            $upgrade_count += count( $upgrades );
+        $update_count = 0;
+        foreach ( $this->update_results as $type => $updates )
+            $update_count += count( $updates );
 
         $body = array();
@@ -1911 +1902 @@
         }
 
-        $body[] = 'UPGRADE LOG';
-        $body[] = '===========';
+        $body[] = 'UPDATE LOG';
+        $body[] = '==========';
         $body[] = '';
 
@@ -1918 +1909 @@
             if ( ! isset( $this->update_results[ $type ] ) )
                 continue;
-            foreach ( $this->update_results[ $type ] as $upgrade ) {
-                $body[] = $upgrade->name;
-                $body[] = str_repeat( '-', strlen( $upgrade->name ) );
-                foreach ( $upgrade->messages as $message )
+            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( $upgrade->result ) )
-                    $body[] = '  Error: [' . $upgrade->result->get_error_code() . '] ' . $upgrade->result->get_error_message();
+                if ( is_wp_error( $update->result ) )
+                    $body[] = '  Error: [' . $update->result->get_error_code() . '] ' . $update->result->get_error_message();
                 $body[] = '';
             }

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

@@ -78 +78 @@
 
     $auto_update = false;
-    $upgrader = new WP_Automatic_Upgrader;
+    $upgrader = new WP_Automatic_Updater;
     foreach ( $updates->updates as $update ) {
         if ( 'autoupdate' != $update->response )
             continue;
 
-        if ( ! $upgrader->should_upgrade( 'core', $update, ABSPATH ) )
+        if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
             continue;
 

trunk/src/wp-admin/update-core.php

@@ -149 +149 @@
         if ( wp_http_supports( 'ssl' ) ) {
             require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-            $upgrader = new WP_Automatic_Upgrader;
+            $upgrader = new WP_Automatic_Updater;
             $future_minor_update = (object) array(
                 'current'       => $wp_version . '.1-update-core.php',
@@ -156 +156 @@
                 'mysql_version' => $required_mysql_version,
             );
-            $should_auto_update = $upgrader->should_upgrade( 'core', $future_minor_update, ABSPATH );
+            $should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
             if ( $should_auto_update )
                 echo ' ' . __( 'Future security updates will be applied automatically.' );
@@ -173 +173 @@
     if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $upgrader = new WP_Automatic_Upgrader;
-        if ( wp_http_supports( 'ssl' ) && $upgrader->should_upgrade( 'core', $updates[0], ABSPATH ) )
+        $upgrader = new WP_Automatic_Updater;
+        if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) )
             echo '<div class="updated inline"><p><strong>BETA TESTERS:</strong> This site is set up to install updates of future beta versions automatically.</p></div>';
     }

trunk/src/wp-includes/update.php

@@ -415 +415 @@
     include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php';
 
-    $upgrader = new WP_Automatic_Upgrader;
+    $upgrader = new WP_Automatic_Updater;
     if ( $upgrader->is_disabled() )
         return;