Ticket #34676: 34676.5.diff

src/js/_enqueues/admin/common.js

@@ -1596 +1596 @@
                  * notice. Make sure it gets moved just the first time.
                  */
                 if ( ! $progressDiv.hasClass( 'update-details-moved' ) ) {
-                        $progressDiv.insertAfter( $updateNotice ).addClass( 'update-details-moved' );
+                        $progressDiv.appendTo( $updateNotice ).addClass( 'update-details-moved' );
                 }
 
                 // Toggle the progress div visibility.

src/wp-admin/about.php

@@ -45 +45 @@
                 <div class="about__section is-feature">
                         <?php _e( 'Say hello to more and better.' ); ?>
                         <br />
-                        <?php _e( 'More ways to make your pages come alive. With easier ways to get it all done and looking better than ever—and boosts in speed you can feel.' ); ?>
+                        <?php _e( 'More ways to make your pages come alive. With easier ways to get it all done and looking better than ever&mdash;and boosts in speed you can feel.' ); ?>
                 </div>
 
                 <div class="about__section is-feature">
@@ -65 +65 @@
                                 <?php _e( 'More ways to make posts and pages come alive with your best images.' ); ?>
                         </p>
                         <p>
-                                <?php _e( 'More ways to bring your visitors in, and keep them engaged, with the richness of embedded media from the web’s top services.' ); ?>
+                                <?php _e( 'More ways to bring your visitors in, and keep them engaged, with the richness of embedded media from the web&#8217;s top services.' ); ?>
                         </p>
                         <p>
-                                <?php _e( 'More ways to make your vision real, and put blocks in the perfect place — even if a particular kind of block is new to you. More efficient processes.' ); ?>
+                                <?php _e( 'More ways to make your vision real, and put blocks in the perfect place&mdash;even if a particular kind of block is new to you. More efficient processes.' ); ?>
                         </p>
                         <p>
                                 <?php _e( 'And more speed everywhere, so as you build sections or galleries, or just type in a line of prose, you can feel how much faster your work flows.' ); ?>
@@ -86 +86 @@
                         <div class="column is-vertically-aligned-center">
                                 <h2><?php _e( 'Two new blocks. And better blocks overall.' ); ?></h2>
                                 <ul>
-                                        <li><?php _e( 'Two brand-new blocks: Social Links and Buttons make adding interactive features fast and easy.' ); ?></li>
+                                        <li><?php _e( 'Two brand-new blocks: Social Icons and Buttons make adding interactive features fast and easy.' ); ?></li>
                                         <li><?php _e( 'New ways with color: Gradients in the Buttons and Cover block, toolbar access to color options in Rich Text blocks, and for the first time, color options in the Group and Columns blocks.' ); ?></li>
                                         <li><?php _e( 'Guess a whole lot less! Version 5.4 streamlines the whole process for placing and replacing multimedia in every block. Now it works the same way in almost every block!' ); ?></li>
-                                        <li><?php _e( 'And if you’ve ever thought your image in the Media+Text block should link to something else — perhaps a picture of a brochure should download that brochure as a document? Well, now it can.' ); ?></li>
+                                        <li><?php _e( 'And if you&#8217;ve ever thought your image in the Media+Text block should link to something else&mdash;perhaps a picture of a brochure should download that brochure as a document? Well, now it can.' ); ?></li>
                                 </ul>
                         </div>
                 </div>
@@ -101 +101 @@
                                         <li><?php _e( 'Clearer block navigation with block breadcrumbs. And easier selection once you get there.' ); ?></li>
                                         <li><?php _e( 'For when you need to navigate with the keyboard, better tabbing and focus. Plus, you can tab over to the sidebar of nearly any block.' ); ?></li>
                                         <li><?php _e( 'Speed! 14% faster loading of the editor, 51% faster time-to-type!' ); ?></li>
-                                        <li><?php _e( 'Tips are gone. In their place, a Welcome Guide window you can bring up when you need it—and only when you need it—again and again.' ); ?></li>
-                                        <li><?php _e( 'Know at a glance whether you’re in a block’s Edit or Navigation mode. Or, if you have restricted vision, your screen reader will tell you which mode you’re in.' ); ?></li>
+                                        <li><?php _e( 'Tips are gone. In their place, a Welcome Guide window you can bring up when you need it&mdash;and only when you need it&mdash;again and again.' ); ?></li>
+                                        <li><?php _e( 'Know at a glance whether you&#8217;re in a block&#8217;s Edit or Navigation mode. Or, if you have restricted vision, your screen reader will tell you which mode you&#8217;re in.' ); ?></li>
                                 </ul>
-                                <p><?php _e( 'Of course, if you want to work with the very latest tools and features, install the <a href="https://wordpress.org/plugins/gutenberg/">Gutenberg plugin</a>. You’ll get to be the first to use new and exciting features in the block editor, before anyone else has seen them!' ); ?></p>
+                                <p><?php _e( 'Of course, if you want to work with the very latest tools and features, install the <a href="https://wordpress.org/plugins/gutenberg/">Gutenberg plugin</a>. You&#8217;ll get to be the first to use new and exciting features in the block editor, before anyone else has seen them!' ); ?></p>
                         </div>
                         <div class="column is-edge-to-edge has-accent-background-color">
                                 <div class="about__image aligncenter">
@@ -124 +124 @@
                                 <p><?php _e( '5.4 helps with a variety of privacy issues around the world. So when users and stakeholders ask about regulatory compliance, or how your team handles user data, the answers should be a lot easier to get right.' ); ?></p>
                                 <p><?php _e( 'Take a look:' ); ?></p>
                                 <ul>
-                                        <li><?php _e( 'Personal Data Exports include more useful data about what you’ve done in sessions. Plus, a table of contents!' ); ?></li>
-                                        <li><?php _e( 'See where you are when you use Privacy Tools Tables, whether you’re erasing or exporting.' ); ?></li>
-                                        <li><?php _e( 'Plus, little enhancements throughout give the Privacy tools a little cleaner look. Your eyes will thank you!' ); ?></li>
+                                        <li><?php _e( 'Now personal data exports include users session information and users location data from the community events widget. Plus, a table of contents!' ); ?></li>
+                                        <li><?php _e( 'See progress as you process export and erasure requests through the privacy tools.' ); ?></li>
+                                        <li><?php _e( 'Plus, little enhancements throughout give the privacy tools a little cleaner look. Your eyes will thank you!' ); ?></li>
                                 </ul>
                         </div>
                 </div>
@@ -139 +139 @@
                         <div class="column">
                                 <h3><?php _e( 'Add custom fields to menu items—natively' ); ?></h3>
                                 <p>
-                                        <?php _e( 'Two new actions let you add custom fields to menu items—without a plugin and without writing custom walkers.' ); ?>
+                                        <?php _e( 'Two new actions let you add custom fields to menu items&mdash;without a plugin and without writing custom walkers.' ); ?>
                                 </p>
                                 <p>
                                         <?php
@@ -160 +160 @@
                                         ?>
                                 </p>
                                 <p>
-                                        <?php _e( 'Check your code and see where these new actions can replace your custom code, and if you’re concerned about duplication, add a check for the WordPress version.' ); ?>
+                                        <?php _e( 'Check your code and see where these new actions can replace your custom code, and if you&#8217;re concerned about duplication, add a check for the WordPress version.' ); ?>
                                 </p>
                         </div>
                         <div class="column">
@@ -179 +179 @@
                                 <?php
                                 printf(
                                         /* translators: %s: WordPress 5.4 Field Guide link. */
-                                        __( 'There’s lots more for developers to love in WordPress 5.4. To discover more and learn how to make these changes shine on your on your sites, themes, plugins and more, check the <a href="%s">WordPress 5.4 Field Guide.</a>' ),
+                                        __( 'There&#8217;s lots more for developers to love in WordPress 5.4. To discover more and learn how to make these changes shine on your on your sites, themes, plugins and more, check the <a href="%s">WordPress 5.4 Field Guide</a>.' ),
                                         'https://make.wordpress.org/core/?p=80034'
                                 );
                                 ?>
                         </p>
-                        <p>
-                                <?php _e( 'Finally, a note about tooling. If you’re a Composer fan, version 5.4 supports this more modern tooling for PHPUnit and external libraries.' ); ?>
-                        </p>
                 </div>
 
                 <hr />

src/wp-admin/css/color-picker.css

@@ -71 +71 @@
 }
 
 .wp-picker-input-wrap .button.wp-picker-default,
-.wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
+.wp-picker-input-wrap .button.wp-picker-clear,
+.wp-customizer .wp-picker-input-wrap .button.wp-picker-default,
+.wp-customizer .wp-picker-input-wrap .button.wp-picker-clear {
         margin-left: 6px;
         padding: 0 8px;
         line-height: 2.54545455; /* 28px */
@@ -142 +144 @@
                 padding: 0 5px;
         }
 
-        .wp-picker-input-wrap .button.wp-picker-default {
+        .wp-picker-input-wrap .button.wp-picker-default,
+        .wp-picker-input-wrap .button.wp-picker-clear {
                 padding: 0 8px;
                 line-height: 2.14285714; /* 30px */
                 min-height: 32px;
         }
 
-        .wp-customizer .wp-picker-input-wrap .button.wp-picker-default {
+        .wp-customizer .wp-picker-input-wrap .button.wp-picker-default,
+        .wp-customizer .wp-picker-input-wrap .button.wp-picker-clear {
                 padding: 0 8px;
                 font-size: 14px;
                 line-height: 2.14285714; /* 30px */

src/wp-admin/css/common.css

@@ -560 +560 @@
         margin-left: 0;
 }
 
+.update-php .update-maintenance-start {
+        margin-top: 30px;
+}
+
+.update-php .update-maintenance-content {
+        border-left: 2px dashed #aaa;
+        padding: 1px 0 20px 20px;
+        margin: -10px 0;
+}
+
+.update-php .update-maintenance-end {
+        margin-bottom: 30px;
+}
+
 .no-js .widefat thead .check-column input,
 .no-js .widefat tfoot .check-column input {
         display: none;

src/wp-admin/css/themes.css

@@ -896 +896 @@
         .theme-browser .theme:nth-child(3n) {
                 margin-right: 0;
         }
+        
+        .theme-overlay .theme-about {
+                bottom: 105px;
+        }
+
+        .theme-overlay .theme-actions {
+                padding-left: 4%;
+                padding-right: 4%;
+        }
 }
 
 @media only screen and (max-width: 650px) {

src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php

@@ -22 +22 @@
                 parent::add_strings();
                 /* translators: 1: Plugin name, 2: Number of the plugin, 3: Total number of plugins being updated. */
                 $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
+                $this->upgrader->strings['bulk_download']             = __( 'Downloading plugin installers.' );
         }
 
         /**
-         * @param string $title
+         * Outputs copy before workload output.
+         * 
+         * @param string $title Title or string identifier to use.
+         * 
+         * @return void
          */
         public function before( $title = '' ) {
-                parent::before( $this->plugin_info['Title'] );
+                $title = ( '' === $title ) ? $this->plugin_info['Title'] : $title;
+                parent::before( $title );
         }
 
         /**
-         * @param string $title
+         * Outputs copy after workload output.
+         * 
+         * @param string $title Title or string identifier to use.
+         * 
+         * @return void
          */
         public function after( $title = '' ) {
-                parent::after( $this->plugin_info['Title'] );
+                $title = ( $title === '' ) ? $this->plugin_info['Title'] : $title;
+                parent::after( $title );
                 $this->decrement_update_count( 'plugin' );
         }
 
         /**
+         * Outputs copy after bulk actions are all done.
+         *
+         * @return void
          */
         public function bulk_footer() {
                 parent::bulk_footer();

src/wp-admin/includes/class-bulk-theme-upgrader-skin.php

@@ -16 +16 @@
  * @see Bulk_Upgrader_Skin
  */
 class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
-        public $theme_info = array(); // Theme_Upgrader::bulk_upgrade() will fill this in.
+        /**
+         * Theme information, which will be filled by Theme_Upgrader::bulk_upgrade()
+         * @var array
+         */
+        public $theme_info = array();
 
+        /**
+         * Registers strings that will be used.
+         *
+         * @return void
+         */
         public function add_strings() {
                 parent::add_strings();
                 /* translators: 1: Theme name, 2: Number of the theme, 3: Total number of themes being updated. */
                 $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Theme %1$s (%2$d/%3$d)' );
+                $this->upgrader->strings['bulk_download']             = __( 'Downloading theme installers.' );
         }
 
         /**
-         * @param string $title
+         * Outputs copy before workload output.
+         * 
+         * @param string $title Title or string identifier to use.
+         * 
+         * @return void
          */
         public function before( $title = '' ) {
-                parent::before( $this->theme_info->display( 'Name' ) );
+                $title = ( $title === '' ) ? $this->theme_info->display( 'Name' ) : $title;
+                parent::before( $title );
         }
 
         /**
-         * @param string $title
+         * Outputs copy after workload output.
+         * 
+         * @param string $title Title or string identifier to use.
+         * 
+         * @return void
          */
         public function after( $title = '' ) {
-                parent::after( $this->theme_info->display( 'Name' ) );
+                $title = ( $title === '' ) ? $this->theme_info->display( 'Name' ) : $title;
+                parent::after( $title );
                 $this->decrement_update_count( 'theme' );
         }
 
         /**
+         * Outputs copy after bulk actions are all done.
+         *
+         * @return void
          */
         public function bulk_footer() {
                 parent::bulk_footer();

new file src/wp-admin/includes/class-bulk-upgrade-element-base.php

@@ +1 @@
+<?php
+
+/**
+ * Abstract base class for Bulk Upgrade Elements
+ *
+ * @since 5.5.0
+ */
+abstract class WP_Bulk_Upgrade_Element_Base {
+        /**
+         * Is this element already up-to-date
+         *
+         * @var bool
+         */
+        protected $up_to_date = false;
+        
+        /**
+         * Has the package been downloaded
+         *
+         * @var bool
+         */
+        protected $downloaded = false;
+        
+        /**
+         * Was the package unpacked properly
+         *
+         * @var bool
+         */
+        protected $unpacked = false;
+        
+        /**
+         * Has the package been installed
+         *
+         * @var bool
+         */
+        protected $installed = false;
+
+        /**
+         * The verification status of a download
+
+         * @var bool|WP_Error
+         */
+        protected $download_verification_result = false;
+
+        /**
+         * Identifier for this element (source)
+         *
+         * @var mixed
+         */
+        protected $name;
+        
+        /**
+         * Upgrader to use
+         *
+         * @var WP_Upgrader
+         */
+        protected $upgrader;
+
+        /**
+         * Options of current element, used throughout the process
+         *
+         * @var array
+         */
+        protected $options;
+        
+        /**
+         * Info about the current element, used by the upgrader
+         *
+         * @var mixed
+         */
+        protected $info;
+        
+        /**
+         * Name of the download
+         *
+         * @var string
+         */
+        protected $download;
+        
+        /**
+         * Working dir for the unpacked package
+         *
+         * @var string
+         */
+        protected $working_dir;
+
+        /**
+         * Final result of installation (via upgrader)
+         *
+         * @var mixed
+         */
+        protected $result;
+
+        /**
+         * WP_Bulk_Upgrader_Element constructor.
+         *
+         * @param WP_Upgrader $upgrader
+         * @param mixed       $name
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function __construct( $name, WP_Upgrader $upgrader ) {
+                $this->name     = $name;
+                $this->upgrader = $upgrader;
+        }
+
+        /**
+         * Retrievs the original identifier data.
+         *
+         * @return mixed
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function get_name() {
+                return $this->name;
+        }
+
+        /**
+         * Retrieves the cummulated result of the upgrade.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function get_result() {
+                return isset( $this->result ) ? $this->result : $this->installed;
+        }
+
+        /**
+         * Retrieves the result index for the current result.
+         *
+         * @return bool|int
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function get_result_index() {
+                return false;
+        }
+
+        /**
+         * Determines if it is active in the system.
+         *
+         * @return boolean
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        abstract public function is_active();
+
+        /**
+         * Determines if it is downloaded correctly.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function is_downloaded() {
+                return $this->downloaded;
+        }
+
+        /**
+         * Determines if it is unpacked succesfully.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function is_unpacked() {
+                return $this->unpacked;
+        }
+
+        /**
+         * Determines if it is installed succesfully.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function is_installed() {
+                return $this->installed;
+        }
+
+        /**
+         * Determines if it is already up-to-date.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function is_up_to_date() {
+                return $this->up_to_date;
+        }
+
+        /**
+         * Retrieves element info.
+         *
+         * @return mixed
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function get_info() {
+                return $this->info;
+        }
+
+        /**
+         * Applies defaults and filter to options.
+         *
+         * @param array $options Options to use.
+         * 
+         * @return void
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        protected function set_options( $options ) {
+                $defaults = array(
+                        'package'                     => '',
+                        // Please always pass this.
+                        'destination'                 => '',
+                        // And this
+                        'clear_destination'           => false,
+                        'abort_if_destination_exists' => true,
+                        // Abort if the Destination directory exists, Pass clear_destination as false please.
+                        'clear_working'               => true,
+                        'is_multi'                    => false,
+                        'hook_extra'                  => array()
+                        // Pass any extra $hook_extra args here, this will be passed to any hooked filters.
+                );
+
+                $options = wp_parse_args( $options, $defaults );
+
+                /** This filter is documented in wp-admin/includes/class-wp-upgrader.php */
+                $this->options = apply_filters( 'upgrader_package_options', $options );
+        }
+
+        /**
+         * Download this element.
+         *
+         * @return bool|string|WP_Error
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function download() {
+                if ( $this->is_up_to_date() ) {
+                        return false;
+                }
+
+                // Connect to the Filesystem first.
+                $result = $this->upgrader->fs_connect( array( WP_CONTENT_DIR, $this->options['destination'] ) );
+                // Mainly for non-connected filesystem.
+                if ( ! $result || is_wp_error( $result ) ) {
+                        return $result;
+                }
+
+                $this->download_verification_result = true;
+
+                /*
+                 * Download the package (Note, This just returns the filename
+                 * of the file if the package is a local file)
+                 */
+                $result = $this->upgrader->download_package( $this->options['package'], true );
+
+                if ( ! is_wp_error( $result ) ) {
+                        $this->downloaded = true;
+                        $this->download   = $result;
+                } else {
+                        $filename = $result->get_error_data( 'softfail-filename' );
+                        if ( $filename ) {
+                                $this->download_verification_result = $result;
+
+                                $result = $filename;
+
+                                $this->downloaded = true;
+                                $this->download   = $result;
+                        }
+                }
+
+                return $result;
+        }
+
+        /**
+         * Unpacks this element.
+         *
+         * @return bool|string|WP_Error
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function unpack() {
+                if ( ! $this->is_downloaded() ) {
+                        return false;
+                }
+
+                // Do not delete a "local" file
+                $delete_package = ( $this->download !== $this->options['package'] );
+
+                // Unzips the file into a temporary directory.
+                $result = $this->upgrader->unpack_package( $this->download, $delete_package );
+                if ( ! is_wp_error( $result ) ) {
+                        $this->unpacked    = true;
+                        $this->working_dir = $result;
+                }
+
+                return $result;
+        }
+
+        /**
+         * Installs this element.
+         *
+         * @return array|bool|WP_Error
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function install() {
+                if ( ! $this->is_unpacked() ) {
+                        return false;
+                }
+
+                // With the given options, this installs it to the destination directory.
+                $result = $this->upgrader->install_package( array(
+                        'source'                      => $this->working_dir,
+                        'destination'                 => $this->options['destination'],
+                        'clear_destination'           => $this->options['clear_destination'],
+                        'abort_if_destination_exists' => $this->options['abort_if_destination_exists'],
+                        'clear_working'               => $this->options['clear_working'],
+                        'hook_extra'                  => $this->options['hook_extra']
+                ) );
+
+                $this->result = $this->upgrader->result;
+
+                return $result;
+        }
+
+        /**
+         * Retrieves the verification result status.
+         *
+         * @return bool|WP_Error
+         *
+         * @since  5.5.0
+         * @access public
+         */
+        public function get_verification_result() {
+                return $this->download_verification_result;
+        }
+}
+ No newline at end of file

new file src/wp-admin/includes/class-bulk-upgrade-repository-element-base.php

@@ +1 @@
+<?php
+
+/**
+ * Abstract base class for Bulk Upgrade Elements that are formatted as Plugin/Theme.
+ *
+ * @since 5.5.0
+ */
+abstract class WP_Bulk_Upgrade_Repository_Element_Base extends WP_Bulk_Upgrade_Element_Base {
+        /**
+         * Cache for current element type information.
+         *
+         * @var object
+         */
+        protected static $current;
+
+        /**
+         * Current element response information from repository.
+         *
+         * @var object
+         */
+        protected $response;
+
+        /**
+         * Retrieves the result index for the current item.
+         *
+         * @return mixed
+         *
+         * @since  5.5.0
+         * @access public
+         */
+        public function get_result_index() {
+                return $this->name;
+        }
+
+        /**
+         * Retrieves the current item.
+         *
+         * @return mixed
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        abstract protected function get_current();
+
+        /**
+         * Retrieves plugin repository response.
+         *
+         * @return bool|object Response from the respository as stdClass
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_response() {
+                $current = $this->get_current();
+
+                if ( is_object( $current ) && is_array( $current->response ) ) {
+                        return $this->response = isset( $current->response[ $this->name ] ) ? $current->response[ $this->name ] : false;
+                }
+
+                return false;
+        }
+}
+ No newline at end of file

new file src/wp-admin/includes/class-bulk-upgrader-base.php

@@ +1 @@
+<?php
+
+/**
+ * Abstract base class for Bulk Upgrades.
+ *
+ * @since 5.5.0
+ */
+abstract class WP_Bulk_Upgrader_Base {
+        /**
+         * Upgrader to use.
+         *
+         * @var WP_Upgrader
+         */
+        protected $upgrader;
+
+        /**
+         * Elements to upgrade.
+         *
+         * @var WP_Bulk_Upgrade_Element_Base[]
+         */
+        protected $elements = array();
+
+        /**
+         * Current element offset used to show total progression.
+         *
+         * @var int
+         */
+        protected $current_element_offset = 0;
+
+        /**
+         * WP_Bulk_Upgrader_Composite constructor.
+         *
+         * @param WP_Upgrader $upgrader     Upgrader to report back to
+         * @param array       $elements     List of elements to be bulked.
+         * @param string      $elementClass Class name to wrap elements in. Extended of WP_Bulk_Upgrader_Element.
+         *
+         * @since  5.5.0
+         * @access public
+         */
+        public function __construct( WP_Upgrader $upgrader, array $elements, $elementClass ) {
+                if ( ! is_string( $elementClass ) ) {
+                        throw new InvalidArgumentException( 'Expected element class to be string, got ' . gettype( $elementClass ) );
+                }
+
+                if ( ! class_exists( $elementClass ) ) {
+                        throw new InvalidArgumentException( sprintf( 'Element class "%s" does not exist.', $elementClass ) );
+                }
+
+                $this->upgrader = $upgrader;
+
+                if ( array() !== $elements ) {
+                        foreach ( $elements as $element ) {
+                                $this->elements[] = new $elementClass( $element, $upgrader );
+                        }
+                }
+
+                $this->upgrader->update_count   = count( $this->elements );
+                $this->upgrader->update_current = false;
+        }
+
+        /**
+         * Runs the bulk upgrade.
+         *
+         * @return array List of results.
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function run() {
+                $this->upgrader->clean_upgrade_folder();
+
+                $this->check_up_to_date( $this->elements );
+
+                // Get all elements that have an upgrade.
+                $upgradable_elements = $this->get_upgradable_elements( $this->elements );
+
+                $this->upgrader->update_count = count( $upgradable_elements );
+
+                // Download and unpack all items with upgrades.
+                $this->prepare_upgrade( $upgradable_elements );
+
+                // On multisite it is hard to determine if a plugin is active on a sub-site or not - assume all are active.
+                if ( is_multisite() ) {
+                        $this->upgrade( $upgradable_elements, true );
+                } else {
+                        // Get all non-active elements - these don't need maintenance mode enabled.
+                        $inactive_elements = $this->get_inactive_elements( $upgradable_elements );
+                        if ( $inactive_elements ) {
+                                $this->upgrade( $inactive_elements, false );
+                        }
+
+                        // Get all active elements - these need maintenance mode enabled.
+                        $active_elements = $this->get_active_elements( $upgradable_elements );
+                        if ( $active_elements ) {
+                                $this->upgrade( $active_elements, true );
+                        }
+                }
+
+                $this->upgrader->update_current = false;
+
+                return $this->get_results();
+        }
+
+        /**
+         * Prepare download and unpack before installing.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements List of elements to prepare.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function prepare_upgrade( $elements ) {
+                $skin = $this->get_skin();
+
+                $skin->before( 'bulk_download' );
+                $this->download( $elements );
+                $skin->set_result(true);
+                $skin->after( 'bulk_download' );
+
+                $skin->before( 'bulk_unpack' );
+                $this->unpack( $elements );
+                $skin->after( 'bulk_unpack' );
+        }
+
+        /**
+         * Upgrades a list of elements.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements         Elements to upgrade.
+         * @param boolean                        $maintenance_mode Enable maintenance mode.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function upgrade( $elements, $maintenance_mode ) {
+                if ( $maintenance_mode ) {
+                        $this->upgrader->maintenance_mode( true );
+                }
+
+                $this->install( $elements );
+
+                if ( $maintenance_mode ) {
+                        $this->upgrader->maintenance_mode( false );
+                }
+
+                $this->current_element_offset += count( $elements );
+        }
+
+        /**
+         * Downloads all the elements.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function download( array $elements ) {
+                /** @var $element WP_Bulk_Upgrade_Element_Base */
+                foreach ( $elements as $element ) {
+                        $this->set_current_element( $element, $elements );
+
+                        $result = $element->download();
+                        if ( is_wp_error( $result ) ) {
+                                $this->show_error( $result, $element );
+                                break;
+                        }
+
+                        if ( is_wp_error( $element->get_verification_result() ) ) {
+                                $this->show_warning( $element->get_verification_result(), $element );
+                        }
+                }
+        }
+
+        /**
+         * Unpacks downloaded elements.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to unpack.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function unpack( array $elements ) {
+                /** @var $element WP_Bulk_Upgrade_Element_Base */
+                foreach ( $elements as $element ) {
+                        $this->set_current_element( $element, $elements );
+
+                        $result = $element->unpack();
+                        if ( is_wp_error( $result ) ) {
+                                $this->show_error( $result, $element );
+                        }
+                }
+        }
+
+        /**
+         * Installs elements.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to install.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function install( array $elements ) {
+                foreach ( $elements as $element ) {
+                        $this->set_current_element( $element, $elements );
+
+                        $skin = $this->get_skin();
+                        $skin->before();
+
+                        $result = $element->install();
+
+                        $skin->set_result( $result );
+                        if ( is_wp_error( $result ) ) {
+                                $skin->error( $result );
+                                $skin->feedback( 'process_failed' );
+                        } else {
+                                // Install succeeded.
+                                $skin->feedback( 'process_success' );
+                        }
+                        $skin->after();
+
+                        if ( is_wp_error( $result ) && $this->abort_on_error() ) {
+                                break;
+                        }
+                }
+
+                $this->clear_current_element();
+        }
+
+        /**
+         * Retrieves the elements that have an upgrade available.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements List of elements to filter.
+         *
+         * @return array Filtered list of elements with an upgrade.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_upgradable_elements( array $elements ) {
+                return array_values( array_filter( $elements, array( $this, 'is_upgradable' ) ) );
+        }
+
+        /**
+         * Determines if an element has an update.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element Element to check.
+         *
+         * @return bool True if an upgrade is available, otherwise False.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function is_upgradable( WP_Bulk_Upgrade_Element_Base $element ) {
+                return ! $element->is_up_to_date();
+        }
+
+        /**
+         * Retrieves the elements that are not active.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to check.
+         *
+         * @return array Filtered list of elements that are not active.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_inactive_elements( array $elements ) {
+                return array_values( array_filter( $elements, array( $this, 'is_inactive') ) );
+        }
+
+        /**
+         * Determines if an element is active.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element Element to check.
+         *
+         * @return bool True if the element is not active, False otherwise.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function is_inactive( WP_Bulk_Upgrade_Element_Base $element ) {
+                return ! $element->is_active();
+        }
+
+        /**
+         * Retrieves a list of active elements.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to check.
+         *
+         * @return array Filtered list of elements that are active.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_active_elements( array $elements ) {
+                return array_values( array_filter( $elements, array( $this, 'is_active' ) ) );
+        }
+
+        /**
+         * Determines if an element is active.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element Element to check.
+         *
+         * @return bool True if the element is active, False otherwise.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function is_active( WP_Bulk_Upgrade_Element_Base $element ) {
+                return $element->is_active();
+        }
+
+        /**
+         * Set the current element as active on the upgrader
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element  Element to set index of.
+         * @param array                        $elements List to search in.
+         *
+         * @return int|bool Current index. False if $element not found.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function set_current_element( $element, $elements ) {
+                $index = array_search( $element, $elements, true );
+
+                if ( false === $index ) {
+                        $this->upgrader->update_current = false;
+                } else {
+                        $this->upgrader->update_current = $index + 1 + $this->current_element_offset;
+                }
+
+                return $this->upgrader->update_current;
+        }
+
+        /**
+         * Removes the current element.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function clear_current_element() {
+                $this->upgrader->update_current = false;
+        }
+
+        /**
+         * Checks if any of the elements is already up to date.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to check.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function check_up_to_date( array $elements ) {
+                /** @var $element WP_Bulk_Upgrade_Element_Base */
+                foreach ( $elements as $element ) {
+                        if ( $element->is_up_to_date() ) {
+                                $this->set_current_element( $element, $elements );
+
+                                $this->handle_up_to_date( $element );
+
+                                $skin = $this->get_skin();
+                                $skin->feedback( 'up_to_date' );
+                                $skin->after();
+                        }
+                }
+        }
+
+        /**
+         * Handles what to do when an element is already up to date.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element Relevant element.
+         *
+         * @return void
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        abstract protected function handle_up_to_date( WP_Bulk_Upgrade_Element_Base $element );
+
+        /**
+         * Retrieves the results of the upgrade process.
+         *
+         * @return array List of results.
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_results() {
+                $results = array();
+
+                /** @var $element WP_Bulk_Upgrade_Element_Base */
+                foreach ( $this->elements as $element ) {
+                        $index = $element->get_result_index();
+                        if ( false === $index ) {
+                                $results[] = $element->get_result();
+                        } else {
+                                $results[ $index ] = $element->get_result();
+                        }
+                }
+
+                return $results;
+        }
+
+        /**
+         * Passes an error to the skin.
+         *
+         * @param string                       $error
+         * @param WP_Bulk_Upgrade_Element_Base $element
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function show_error( $error, WP_Bulk_Upgrade_Element_Base $element ) {
+                $skin = $this->get_skin();
+                if ( $skin ) {
+                        $skin->error( $error );
+                        $skin->after();
+                }
+        }
+
+        /**
+         * Passes a warning to the skin.
+         *
+         * @param WP_Error                     $warning Warning to show.
+         * @param WP_Bulk_Upgrade_Element_Base $element Relevant element.
+         *
+         * @return void
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function show_warning( WP_Error $warning, WP_Bulk_Upgrade_Element_Base $element ) {
+                $skin = $this->get_skin();
+                if ( $skin ) {
+                        foreach ( $warning->get_error_messages() as $message ) {
+                                if ( $warning->get_error_data() && is_string( $warning->get_error_data() ) ) {
+                                        $skin->feedback( $message . ' ' . esc_html( strip_tags( $warning->get_error_data() ) ) );
+                                } else {
+                                        $skin->feedback( $message );
+                                }
+                        }
+                }
+        }
+
+        /**
+         * Determines if we should abort when encountering an error.
+         *
+         * @return bool
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function abort_on_error() {
+                // Prevent credentials auth screen from displaying multiple times.
+                return true;
+        }
+
+        /**
+         * Shorthand retrieval of upgrader skin.
+         *
+         * @return WP_Upgrader_Skin
+         *
+         * @since  5.5.0
+         * @access protected
+         */
+        protected function get_skin() {
+                return $this->upgrader->get_skin();
+        }
+}
+ No newline at end of file

src/wp-admin/includes/class-bulk-upgrader-skin.php

@@ -16 +16 @@
  * @see WP_Upgrader_Skin
  */
 class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
+        /**
+         * Are we in an install/upgrade loop.
+         *
+         * @var bool
+         */
         public $in_loop = false;
+        
         /**
+         * Did we encounter an error while installing/upgrading.
+         *
          * @var string|false
          */
         public $error = false;
 
         /**
-         * @param array $args
+         * @param array $args Arguments used for this skin.
          */
         public function __construct( $args = array() ) {
                 $defaults = array(
@@ -36 +44 @@
         }
 
         /**
+         * Register the strings that we need.
+         *
+         * @return void
          */
         public function add_strings() {
                 $this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
@@ -46 +57 @@
                 /* translators: %s: Title of an update. */
                 $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
                 $this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
+                $this->upgrader->strings['bulk_download']          = __( 'Downloading items.' );
+                $this->upgrader->strings['bulk_unpack']            = __( 'Unpacking downloaded installers.' );
         }
 
         /**
-         * @param string $string
+         * Outputs feedback.
+         *
+         * @param string $string Text to show.
          * @param mixed  ...$args Optional text replacements.
+         *
+         * @return void
          */
         public function feedback( $string, ...$args ) {
+                $original_string = $string;
+
                 if ( isset( $this->upgrader->strings[ $string ] ) ) {
                         $string = $this->upgrader->strings[ $string ];
                 }
@@ -64 +83 @@
                                 $string = vsprintf( $string, $args );
                         }
                 }
+
                 if ( empty( $string ) ) {
                         return;
                 }
-                if ( $this->in_loop ) {
-                        echo "$string<br />\n";
+                
+                if ( 'maintenance_start' === $original_string ) {
+                        printf( '<p class="update-maintenance-start"><strong>%s</strong></p><div class="update-maintenance-content">', $string );
+                } elseif( 'maintenance_end' === $original_string ) {
+                        printf( '</div><p class="update-maintenance-end"><strong>%s</strong></p>', $string );
                 } else {
-                        echo "<p>$string</p>\n";
+                        if ( $this->in_loop ) {
+                                echo "$string<br />\n";
+                        } else {
+                                echo "<p>$string</p>\n";
+                        }
                 }
+
+                $this->flush_output();
         }
 
         /**
+         * Outputs nothing, this will be displayed within a iframe.
+         *
+         * @return void
          */
         public function header() {
                 // Nothing, This will be displayed within a iframe.
         }
 
         /**
+         * Outputs nothing, this will be displayed within a iframe.
+         *
+         * @return void
          */
         public function footer() {
                 // Nothing, This will be displayed within a iframe.
         }
 
         /**
-         * @param string|WP_Error $error
+         * Shows an error.
+         *
+         * @param string|WP_Error $error Error that will be shown.
          */
         public function error( $error ) {
                 if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) {
@@ -109 +146 @@
         }
 
         /**
+         * Shows the bulk header copy.
+         *
+         * @return void
          */
         public function bulk_header() {
                 $this->feedback( 'skin_upgrade_start' );
         }
 
         /**
+         * Shows the bulk footer copy.
+         *
+         * @return void
          */
         public function bulk_footer() {
                 $this->feedback( 'skin_upgrade_end' );
         }
 
         /**
-         * @param string $title
+         * Shows a header for an element.
+         * side-effect: Flushes the output buffer.
+         *
+         * @param string $title Copy or string identifier to use.
+         *
+         * @return void
          */
         public function before( $title = '' ) {
                 $this->in_loop = true;
-                printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
+
+                $format = $this->upgrader->strings['skin_before_update_header'];
+
+                $identifier = $this->upgrader->update_current;
+                if ( isset( $this->upgrader->strings[ $title ] ) ) {
+                        $identifier = $title;
+                        $format = $this->upgrader->strings [ $title ];
+                }
+
+                printf(
+                        '<h2>' . $format . ' <span class="' . esc_attr( 'spinner waiting-' . $identifier ) . '"></span></h2>',
+                        $title,
+                        $this->upgrader->update_current,
+                        $this->upgrader->update_count
+                );
+                
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $identifier ) . '\').css("display", "inline-block");</script>';
+                
                 // This progress messages div gets moved via JavaScript when clicking on "Show details.".
-                echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
+                echo '<div class="update-messages hide-if-js" id="' . esc_attr( 'progress-' . $identifier ) . '"><p>';
                 $this->flush_output();
         }
 
         /**
-         * @param string $title
+         * Shows a footer for an element.
+         * side-effect: Flushes the output buffer.
+         *
+         * @param string $title Copy or string identifier to use.
+         *
+         * @return void
          */
         public function after( $title = '' ) {
+                $success_format = $this->upgrader->strings['skin_update_successful'];
+                $error_format = $this->upgrader->strings['skin_update_failed_error'];
+                $failed_format = $this->upgrader->strings['skin_update_failed'];
+
+                $identifier = $this->upgrader->update_current;
+                if ( isset( $this->upgrader->strings['title'] ) ) {
+                        $identifier = $title;
+                        $title = $this->upgrader->strings['title'];
+
+                        $success_format = '';
+                        // Remove title, just keep error message
+                        $error_format = '%2$s';
+                        $failed_format = '%s';
+                }
+
                 echo '</p></div>';
+
                 if ( $this->error || ! $this->result ) {
                         if ( $this->error ) {
-                                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+                                echo '<div class="error"><p>' . sprintf( $error_format, $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
                         } else {
-                                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
+                                echo '<div class="error"><p>' . sprintf( $failed_format, $title ) . '</p></div>';
                         }
 
-                        echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
+                        echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $identifier ) . '\').show();</script>';
                 }
+                
                 if ( $this->result && ! is_wp_error( $this->result ) ) {
                         if ( ! $this->error ) {
-                                echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
-                                        '<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
+                                echo '<div class="updated js-update-details" data-update-details="' . esc_attr( 'progress-' . $identifier ) . '">' .
+                                        '<p>' . sprintf( $success_format, $title ) .
                                         ' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
                                         '</p></div>';
                         }
@@ -162 +248 @@
         }
 
         /**
+         * Resets the state of this class.
+         *
+         * @return void
          */
         public function reset() {
                 $this->in_loop = false;
@@ -169 +258 @@
         }
 
         /**
+         * Flushes the output buffer.
+         *
+         * @return void
          */
         public function flush_output() {
                 wp_ob_end_flush_all();

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

@@ -32 +32 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package']   = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']        = __( 'Unpacking the update&#8230;' );
+                /* translators: %1$d: Current update counter, %2$d: Total amount of updates. */
+                $this->strings['unpack_package_bulk']   = __( 'Unpacking the update&#8230; (%1$d/%2$d)' );
                 $this->strings['copy_failed']           = __( 'Could not copy files.' );
                 $this->strings['copy_failed_space']     = __( 'Could not copy files. You may have run out of disk space.' );
                 $this->strings['start_rollback']        = __( 'Attempting to roll back to previous version.' );

src/wp-admin/includes/class-language-pack-upgrader.php

@@ -116 +116 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading translation from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
+                /* translators: %1$d: Current update counter, %2$d: Total amount of updates. */
+                $this->strings['unpack_package_bulk'] = __( 'Unpacking the update&#8230; (%1$d/%2$d)' );
                 $this->strings['process_failed']      = __( 'Translation update failed.' );
                 $this->strings['process_success']     = __( 'Translation updated successfully.' );
                 $this->strings['remove_old']          = __( 'Removing the old version of the translation&#8230;' );

new file src/wp-admin/includes/class-plugin-bulk-upgrade-element.php

@@ +1 @@
+<?php
+
+/**
+ * Plugin implementation of the Bulk Upgrade Element.
+ *
+ * @since 5.5.0
+ */
+class WP_Plugin_Bulk_Upgrade_Element extends WP_Bulk_Upgrade_Repository_Element_Base {
+        /**
+         * WP_Bulk_Upgrader_Plugin_Element constructor.
+         *
+         * @param string          $plugin   Current plugin
+         * @param Plugin_Upgrader $upgrader Upgrader to use.
+         *
+         * @since  5.5.0
+         * @access public
+         */
+        public function __construct( $plugin, Plugin_Upgrader $upgrader ) {
+                parent::__construct( $plugin, $upgrader );
+
+                $this->info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true );
+
+                $response = $this->get_response();
+                if ( false === $response ) {
+                        $this->up_to_date = true;
+
+                        return;
+                }
+
+                $options = array(
+                        'package'           => $response->package,
+                        'destination'       => WP_PLUGIN_DIR,
+                        'clear_destination' => true,
+                        'clear_working'     => true,
+                        'is_multi'          => true,
+                        'hook_extra'        => array(
+                                'plugin' => $plugin
+                        )
+                );
+
+                $this->set_options( $options );
+        }
+
+        /**
+         * Determines if this plugin is activated.
+         *
+         * @return bool
+         *
+         * @since  5.5.0
+         * @access public
+         */
+        public function is_active() {
+                return is_plugin_active( $this->name );
+        }
+
+        /**
+         * Retrieves information for the plugin from the `update_plugins` transient.
+         *
+         * @return mixed
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        protected function get_current() {
+                if ( ! isset( self::$current ) ) {
+                        self::$current = get_site_transient( 'update_plugins' );
+                }
+
+                return self::$current;
+        }
+}
+ No newline at end of file

new file src/wp-admin/includes/class-plugin-bulk-upgrader.php

@@ +1 @@
+<?php
+
+/**
+ * Plugin Bulk Upgrader implementation.
+ *
+ * @since 5.5.0
+ */
+class WP_Plugin_Bulk_Upgrader extends WP_Bulk_Upgrader_Base {
+        /**
+         * WP_Plugin_Bulk_Upgrader constructor.
+         *
+         * @param Plugin_Upgrader $upgrader Upgrader to use.
+         * @param array           $elements Elements to use.
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function __construct( Plugin_Upgrader $upgrader, array $elements = array() ) {
+                parent::__construct( $upgrader, $elements, 'WP_Plugin_Bulk_Upgrade_Element' );
+        }
+
+        /**
+         * Communicates result to skin.
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element Relevant element.
+         *
+         * @return void
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function handle_up_to_date( WP_Bulk_Upgrade_Element_Base $element ) {
+                $skin = $this->get_skin();
+                if ( $skin instanceof WP_Upgrader_Skin ) {
+                        $skin->set_result( 'up_to_date' );
+                }
+        }
+
+        /**
+         * Communicate plugin info to skin
+         *
+         * @param WP_Bulk_Upgrade_Element_Base $element  Element to set as current.
+         * @param array                        $elements List to search in.
+         *
+         * @return void
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        protected function set_current_element( $element, $elements ) {
+                parent::set_current_element( $element, $elements );
+
+                if ( ! $this->upgrader->update_current ) {
+                        return;
+                }
+
+                $skin = $this->get_skin();
+                $skin->plugin_info = $element->get_info();
+        }
+}
+ No newline at end of file

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

@@ -49 +49 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']       = __( 'Unpacking the update&#8230;' );
+                /* translators: %1$d: Current update counter, %2$d: Total amount of updates. */
+                $this->strings['unpack_package_bulk']  = __( 'Unpacking the update&#8230; (%1$d/%2$d)' );
                 $this->strings['remove_old']           = __( 'Removing the old version of the plugin&#8230;' );
                 $this->strings['remove_old_failed']    = __( 'Could not remove the old plugin.' );
                 $this->strings['process_failed']       = __( 'Plugin update failed.' );
@@ -66 +68 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+                /* translators: %1$d: Current package counter, %2$d: Total number of packages. */
+                $this->strings['unpack_package_bulk'] = __( 'Unpacking the package&#8230; (%1$d/%2$d)' );
                 $this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
                 $this->strings['no_files']            = __( 'The plugin contains no files.' );
                 $this->strings['process_failed']      = __( 'Plugin installation failed.' );
@@ -233 +237 @@
                 $this->bulk = true;
                 $this->upgrade_strings();
 
-                $current = get_site_transient( 'update_plugins' );
-
                 add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
 
                 $this->skin->header();
@@ -248 +250 @@
 
                 $this->skin->bulk_header();
 
-                /*
-                 * Only start maintenance mode if:
-                 * - running Multisite and there are one or more plugins specified, OR
-                 * - a plugin with an update available is currently active.
-                 * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.
-                 */
-                $maintenance = ( is_multisite() && ! empty( $plugins ) );
-                foreach ( $plugins as $plugin ) {
-                        $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin ] ) );
-                }
-                if ( $maintenance ) {
-                        $this->maintenance_mode( true );
-                }
-
-                $results = array();
-
-                $this->update_count   = count( $plugins );
-                $this->update_current = 0;
-                foreach ( $plugins as $plugin ) {
-                        $this->update_current++;
-                        $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true );
-
-                        if ( ! isset( $current->response[ $plugin ] ) ) {
-                                $this->skin->set_result( 'up_to_date' );
-                                $this->skin->before();
-                                $this->skin->feedback( 'up_to_date' );
-                                $this->skin->after();
-                                $results[ $plugin ] = true;
-                                continue;
-                        }
-
-                        // Get the URL to the zip file.
-                        $r = $current->response[ $plugin ];
-
-                        $this->skin->plugin_active = is_plugin_active( $plugin );
-
-                        $result = $this->run(
-                                array(
-                                        'package'           => $r->package,
-                                        'destination'       => WP_PLUGIN_DIR,
-                                        'clear_destination' => true,
-                                        'clear_working'     => true,
-                                        'is_multi'          => true,
-                                        'hook_extra'        => array(
-                                                'plugin' => $plugin,
-                                        ),
-                                )
-                        );
-
-                        $results[ $plugin ] = $this->result;
-
-                        // Prevent credentials auth screen from displaying multiple times.
-                        if ( false === $result ) {
-                                break;
-                        }
-                } // End foreach $plugins.
-
-                $this->maintenance_mode( false );
+                $plugin_bulk_upgrader = new WP_Plugin_Bulk_Upgrader( $this, $plugins );
+                $results = $plugin_bulk_upgrader->run();
 
                 // Force refresh of plugin update information.
                 wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );

new file src/wp-admin/includes/class-theme-bulk-upgrade-element.php

@@ +1 @@
+<?php
+
+/**
+ * Theme implementation of the Bulk Upgrade Element.
+ *
+ * @since 5.5.0
+ */
+class WP_Theme_Bulk_Upgrade_Element extends WP_Bulk_Upgrade_Repository_Element_Base {
+        /**
+         * WP_Bulk_Upgrader_Theme_Element constructor.
+         *
+         * @param string         $theme    Theme to use.
+         * @param Theme_Upgrader $upgrader Upgrader to use.
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function __construct( $theme, Theme_Upgrader $upgrader ) {
+                parent::__construct( $theme, $upgrader );
+
+                $this->info = $upgrader->theme_info( $theme );
+
+                $response = $this->get_response();
+                if ( false === $response ) {
+                        $this->up_to_date = true;
+
+                        return;
+                }
+
+                $options = array(
+                        'package'           => $this->response['package'],
+                        'destination'       => get_theme_root( $theme ),
+                        'clear_destination' => true,
+                        'clear_working'     => true,
+                        'is_multi'          => true,
+                        'hook_extra'        => array(
+                                        'theme' => $theme
+                        )
+                );
+
+                $this->set_options( $options );
+        }
+
+        /**
+         * Determines if this theme is active.
+         *
+         * @return bool
+         *
+         * @since 5.5.0
+         * @access public
+         */
+        public function is_active() {
+                return $this->name === get_stylesheet() || $this->name === get_template();
+        }
+
+        /**
+         * Retrieves information about the theme from the `update_themes` transient.
+         *
+         * @return mixed
+         *
+         * @since 5.5.0
+         * @access protected
+         */
+        protected function get_current() {
+                if ( ! isset( self::$current ) ) {
+                        self::$current = get_site_transient( 'update_themes' );
+                }
+
+                return self::$current;
+        }
+}
+ No newline at end of file

new file src/wp-admin/includes/class-theme-bulk-upgrader.php

@@ +1 @@
+<?php
+
+/**
+ * Theme Bulk Upgrader implementation.
+ *
+ * @since 5.5.0
+ */
+class WP_Theme_Bulk_Upgrader extends WP_Bulk_Upgrader_Base {
+    /**
+     * WP_Theme_Bulk_Upgrader constructor.
+     *
+     * @param Theme_Upgrader                 $upgrader Upgrader to use.
+     * @param WP_Bulk_Upgrade_Element_Base[] $elements Elements to use.
+     *
+     * @since  5.5.0
+     * @access public
+     */
+    public function __construct( Theme_Upgrader $upgrader, array $elements = array() ) {
+        parent::__construct( $upgrader, $elements, 'WP_Theme_Bulk_Upgrade_Element' );
+    }
+
+    /**
+     * Handles what to do for an up-to-date theme.
+     *
+     * @param WP_Bulk_Upgrade_Element_Base $element Element to use.
+     *
+     * @return void
+     *
+     * @since  5.5.0
+     * @access public
+     */
+    public function handle_up_to_date( WP_Bulk_Upgrade_Element_Base $element ) {
+        $skin = $this->get_skin();
+        if ( $skin instanceof WP_Upgrader_Skin ) {
+            $skin->set_result( true );
+        }
+    }
+
+    /**
+     * Sets the current element on the skin.
+     *
+     * @param WP_Bulk_Upgrade_Element_Base $element  Element to set as current.
+     * @param array                        $elements List to search in.
+     *
+     * @return void
+     *
+     * @since  5.5.0
+     * @access protected
+     */
+    protected function set_current_element( $element, $elements ) {
+        parent::set_current_element( $element, $elements );
+
+        if ( ! $this->upgrader->update_current ) {
+            return;
+        }
+
+        $skin = $this->get_skin();
+        if ( $skin instanceof Bulk_Theme_Upgrader_Skin ) {
+            $skin->theme_info = $element->get_info();
+        }
+    }
+}
+ No newline at end of file

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

@@ -48 +48 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
+                /* translators: %1$d: Current update counter, %2$d: Total amount of updates. */
+                $this->strings['unpack_package_bulk'] = __( 'Unpacking the update&#8230; (%1$d/%2$d)' );
                 $this->strings['remove_old']          = __( 'Removing the old version of the theme&#8230;' );
                 $this->strings['remove_old_failed']   = __( 'Could not remove the old theme.' );
                 $this->strings['process_failed']      = __( 'Theme update failed.' );
@@ -64 +66 @@
                 /* translators: %s: Package URL. */
                 $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
                 $this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+                /* translators: %1$d: Current package counter, %2$d: Total number of plugins. */
+                $this->strings['unpack_package_bulk'] = __( 'Unpacking the package&#8230; (%1$d/%2$d)' );
                 $this->strings['installing_package']  = __( 'Installing the theme&#8230;' );
                 $this->strings['no_files']            = __( 'The theme contains no files.' );
                 $this->strings['process_failed']      = __( 'Theme installation failed.' );
@@ -359 +363 @@
 
                 $this->skin->bulk_header();
 
-                /*
-                 * Only start maintenance mode if:
-                 * - running Multisite and there are one or more themes specified, OR
-                 * - a theme with an update available is currently in use.
-                 * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.
-                 */
-                $maintenance = ( is_multisite() && ! empty( $themes ) );
-                foreach ( $themes as $theme ) {
-                        $maintenance = $maintenance || get_stylesheet() === $theme || get_template() === $theme;
-                }
-                if ( $maintenance ) {
-                        $this->maintenance_mode( true );
-                }
-
-                $results = array();
-
-                $this->update_count   = count( $themes );
-                $this->update_current = 0;
-                foreach ( $themes as $theme ) {
-                        $this->update_current++;
-
-                        $this->skin->theme_info = $this->theme_info( $theme );
-
-                        if ( ! isset( $current->response[ $theme ] ) ) {
-                                $this->skin->set_result( true );
-                                $this->skin->before();
-                                $this->skin->feedback( 'up_to_date' );
-                                $this->skin->after();
-                                $results[ $theme ] = true;
-                                continue;
-                        }
-
-                        // Get the URL to the zip file.
-                        $r = $current->response[ $theme ];
-
-                        $result = $this->run(
-                                array(
-                                        'package'           => $r['package'],
-                                        'destination'       => get_theme_root( $theme ),
-                                        'clear_destination' => true,
-                                        'clear_working'     => true,
-                                        'is_multi'          => true,
-                                        'hook_extra'        => array(
-                                                'theme' => $theme,
-                                        ),
-                                )
-                        );
-
-                        $results[ $theme ] = $this->result;
-
-                        // Prevent credentials auth screen from displaying multiple times.
-                        if ( false === $result ) {
-                                break;
-                        }
-                } // End foreach $themes.
-
-                $this->maintenance_mode( false );
+                $theme_bulk_upgrader = new WP_Theme_Bulk_Upgrader( $this, $themes );
+                $results = $theme_bulk_upgrader->run();
 
                 // Refresh the Theme Update information.
                 wp_clean_themes_cache( $parsed_args['clear_update_cache'] );

new file src/wp-admin/includes/class-wp-upgrader-bulk.php

@@ +1 @@
+<?php
+/**
+ * The Bulk handlers for the WordPress Upgrader.
+ *
+ * @package    WordPress
+ * @subpackage Upgrader
+ * @since      5.5.0
+ */
+
+require_once 'class-bulk-upgrade-element-base.php';
+require_once 'class-bulk-upgrade-repository-element-base.php';
+
+require_once 'class-bulk-upgrader-base.php';
+
+require_once 'class-plugin-bulk-upgrade-element.php';
+require_once 'class-plugin-bulk-upgrader.php';
+
+require_once 'class-theme-bulk-upgrade-element.php';
+require_once 'class-theme-bulk-upgrader.php';

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

@@ -15 +15 @@
  */
 class WP_Upgrader_Skin {
 
+        /**
+         * Holds the Upgrader to use.
+         *
+         * @var WP_Upgrader
+         */
         public $upgrader;
         public $done_header = false;
         public $done_footer = false;
@@ -42 +47 @@
         }
 
         /**
-         * @param WP_Upgrader $upgrader
+         * Sets the upgrader to use internally.
+         *
+         * @param WP_Upgrader $upgrader Upgrader to use.
          */
         public function set_upgrader( &$upgrader ) {
                 if ( is_object( $upgrader ) ) {

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

@@ -9 +9 @@
  * @since 2.8.0
  */
 
+/** WP_Upgrader_Bulk class */
+require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-bulk.php';
+
 /** WP_Upgrader_Skin class */
 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
 
@@ -120 +123 @@
          *                               instance.
          */
         public function __construct( $skin = null ) {
-                if ( null == $skin ) {
+                if ( $skin === null ) {
                         $this->skin = new WP_Upgrader_Skin();
                 } else {
                         $this->skin = $skin;
@@ -301 +304 @@
         public function unpack_package( $package, $delete_package = true ) {
                 global $wp_filesystem;
 
-                $this->skin->feedback( 'unpack_package' );
+                if ( $this->update_count > 1 ) {
+                        $this->skin->feedback( 'unpack_package_bulk', $this->update_current, $this->update_count );
+                } else {
+                        $this->skin->feedback( 'unpack_package' );
+                }
 
                 $upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
 
-                // Clean up contents of upgrade directory beforehand.
-                $upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );
-                if ( ! empty( $upgrade_files ) ) {
-                        foreach ( $upgrade_files as $file ) {
-                                $wp_filesystem->delete( $upgrade_folder . $file['name'], true );
-                        }
-                }
-
                 // We need a working directory - strip off any .tmp or .zip suffixes.
                 $working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );
 
@@ -708 +707 @@
                  */
                 $options = apply_filters( 'upgrader_package_options', $options );
 
-                if ( ! $options['is_multi'] ) { // Call $this->header separately if running multiple times.
-                        $this->skin->header();
-                }
+                $this->skin->header();
 
                 // Connect to the filesystem first.
                 $res = $this->fs_connect( array( WP_CONTENT_DIR, $options['destination'] ) );
+
                 // Mainly for non-connected filesystem.
                 if ( ! $res ) {
                         if ( ! $options['is_multi'] ) {
@@ -733 +731 @@
                         return $res;
                 }
 
+                $this->clean_upgrade_folder();
+
                 /*
                  * Download the package (Note, This just returns the filename
                  * of the file if the package is a local file)
@@ -931 +931 @@
                 return delete_option( $lock_name . '.lock' );
         }
 
+        /**
+        * Clears optional remnants of previous upgrades.
+        *
+        * @since 5.5.0
+        * @access public
+        *
+        * @global WP_Filesystem_Base $wp_filesystem Subclass
+        */
+        public function clean_upgrade_folder() {
+                /** @var WP_Filesystem_Base $wp_filesystem */
+                global $wp_filesystem;
+
+                // Clean up contents of upgrade directory.
+                $upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
+                $upgrade_files  = $wp_filesystem->dirlist( $upgrade_folder );
+                if ( ! empty( $upgrade_files ) ) {
+                        foreach ( $upgrade_files as $file ) {
+                                $wp_filesystem->delete( $upgrade_folder . $file['name'], true );
+                        }
+                }
+        }
+
+        /**
+        * Retrieves the used skin.
+        *
+        * @return WP_Upgrader_Skin The used skin.
+        *
+        * @since  5.5.0
+        * @access public
+        */
+        public function get_skin() {
+                return $this->skin;
+        }
+
 }
 
 /** Plugin_Upgrader class */

src/wp-admin/menu.php

@@ -9 +9 @@
 /**
  * Constructs the admin menu.
  *
- * The elements in the array are :
- *     0: Menu item name
+ * The elements in the array are:
+ *     0: Menu item name.
  *     1: Minimum level or capability required.
- *     2: The URL of the item's file
- *     3: Class
- *     4: ID
- *     5: Icon for top level menu
+ *     2: The URL of the item's file.
+ *     3: Page title.
+ *     4: Classes.
+ *     5: ID.
+ *     6: Icon for top level menu.
  *
  * @global array $menu
  */

src/wp-content/themes/twentytwenty/style-rtl.css

@@ -3511 +3511 @@
         letter-spacing: normal;
 }
 
+.entry-content h1,
+.entry-content h2,
+.entry-content h3,
+.entry-content h4,
+.entry-content h5,
+.entry-content h6,
 .entry-content cite,
 .entry-content figcaption,
-.entry-content .wp-caption-text {
+.entry-content table,
+.entry-content address,
+.entry-content .wp-caption-text,
+.entry-content .wp-block-file {
         font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
 }
 
 @supports ( font-variation-settings: normal ) {
 
+        .entry-content h1,
+        .entry-content h2,
+        .entry-content h3,
+        .entry-content h4,
+        .entry-content h5,
+        .entry-content h6,
         .entry-content cite,
         .entry-content figcaption,
-        .entry-content .wp-caption-text {
+        .entry-content table,
+        .entry-content address,
+        .entry-content .wp-caption-text,
+        .entry-content .wp-block-file {
                 font-family: "Inter var", -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
         }
 }

src/wp-content/themes/twentytwenty/style.css

@@ -3533 +3533 @@
         letter-spacing: normal;
 }
 
+.entry-content h1,
+.entry-content h2,
+.entry-content h3,
+.entry-content h4,
+.entry-content h5,
+.entry-content h6,
 .entry-content cite,
 .entry-content figcaption,
-.entry-content .wp-caption-text {
+.entry-content table,
+.entry-content address,
+.entry-content .wp-caption-text,
+.entry-content .wp-block-file {
         font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
 }
 
 @supports ( font-variation-settings: normal ) {
 
+        .entry-content h1,
+        .entry-content h2,
+        .entry-content h3,
+        .entry-content h4,
+        .entry-content h5,
+        .entry-content h6,
         .entry-content cite,
         .entry-content figcaption,
-        .entry-content .wp-caption-text {
+        .entry-content table,
+        .entry-content address,
+        .entry-content .wp-caption-text,
+        .entry-content .wp-block-file {
                 font-family: "Inter var", -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
         }
 }

src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

@@ -349 +349 @@
                                                         'type'        => 'boolean',
                                                 ),
                                                 'disable-custom-gradients'  => array(
-                                                        'description' => __( 'Whether the theme disables custom graidients.' ),
+                                                        'description' => __( 'Whether the theme disables custom gradients.' ),
                                                         'type'        => 'boolean',
                                                 ),
                                                 'editor-color-palette'      => array(

tests/phpunit/tests/post.php

@@ -1004 +1004 @@
          */
         function test_utf8mb3_post_saves_with_emoji() {
                 global $wpdb;
-                $_wpdb = new WpdbExposedMethodsForTesting();
 
-                if ( 'utf8' !== $_wpdb->get_col_charset( $wpdb->posts, 'post_title' ) ) {
+                if ( 'utf8' !== $wpdb->get_col_charset( $wpdb->posts, 'post_title' ) ) {
                         $this->markTestSkipped( 'This test is only useful with the utf8 character set' );
                 }