enmi-conf.org: comparison wp/wp-admin/includes/class-core-upgrader.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 	 */
 	public function upgrade_strings() {
 		$this->strings['up_to_date'] = __( 'WordPress is at the latest version.' );
 		$this->strings['locked']     = __( 'Another update is currently in progress.' );
 		$this->strings['no_package'] = __( 'Update package not available.' );
-		/* translators: %s: package URL */
+		/* 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;' );
 		$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.' );
 	 *        @type bool $attempt_rollback Whether to attempt to rollback the chances if
 	 *                                     there is a problem. Default false.
 	 *        @type bool $do_rollback      Whether to perform this "upgrade" as a rollback.
 	 *                                     Default false.
 	 * }
-	 * @return null|false|WP_Error False or WP_Error on failure, null on success.
+	 * @return string|false|WP_Error New WordPress version on success, false or WP_Error on failure.
 	 */
 	public function upgrade( $current, $args = array() ) {
 		global $wp_filesystem;
-		include( ABSPATH . WPINC . '/version.php' ); // $wp_version;
+		require ABSPATH . WPINC . '/version.php'; // $wp_version;
 		$start_time = time();
 		$defaults    = array(
 			'pre_check_md5'                => true,
 		$this->init();
 		$this->upgrade_strings();
 		// Is an update available?
-		if ( ! isset( $current->response ) || $current->response == 'latest' ) {
+		if ( ! isset( $current->response ) || 'latest' === $current->response ) {
 			return new WP_Error( 'up_to_date', $this->strings['up_to_date'] );
 		}
 		$res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
 		if ( ! $res || is_wp_error( $res ) ) {
 		 * the new_bundled zip. Don't though if the constant is set to skip bundled items.
 		 * If the API returns a no_content zip, go with it. Finally, default to the full zip.
 		 */
 		if ( $parsed_args['do_rollback'] && $current->packages->rollback ) {
 			$to_download = 'rollback';
-		} elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) {
+		} elseif ( $current->packages->partial && 'reinstall' !== $current->response && $wp_version == $current->partial_version && $partial ) {
 			$to_download = 'partial';
 		} elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
 			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
 			$to_download = 'new_bundled';
 		} elseif ( $current->packages->no_content ) {
 			$to_download = 'no_content';
 		} else {
 			$to_download = 'full';
 		}
-		// Lock to prevent multiple Core Updates occurring
+		// Lock to prevent multiple Core Updates occurring.
 		$lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
 		if ( ! $lock ) {
 			return new WP_Error( 'locked', $this->strings['locked'] );
 		}
 		// Allow for signature soft-fail.
 		// WARNING: This may be removed in the future.
 		if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
 			// Outout the failure error as a normal feedback, and not as an error:
+			/** This filter is documented in wp-admin/includes/update-core.php */
 			apply_filters( 'update_feedback', $download->get_error_message() );
 			// Report this failure back to WordPress.org for debugging purposes.
 			wp_version_check(
 				array(
 			WP_Upgrader::release_lock( 'core_updater' );
 			return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
 		}
 		$wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE );
-		require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
+		wp_opcache_invalidate( ABSPATH . 'wp-admin/includes/update-core.php' );
+		require_once ABSPATH . 'wp-admin/includes/update-core.php';
 		if ( ! function_exists( 'update_core' ) ) {
 			WP_Upgrader::release_lock( 'core_updater' );
 			return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
 		}
 				'action' => 'update',
 				'type'   => 'core',
 			)
 		);
-		// Clear the current updates
+		// Clear the current updates.
 		delete_site_transient( 'update_core' );
 		if ( ! $parsed_args['do_rollback'] ) {
 			$stats = array(
 				'update_type'      => $current->response,
 	 *
 	 * @param string $offered_ver The offered version, of the format x.y.z.
 	 * @return bool True if we should update to the offered version, otherwise false.
 	 */
 	public static function should_update_to_version( $offered_ver ) {
-		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
+		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
-		$current_branch                 = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
+		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
-		$new_branch                     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
+		$new_branch     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
 		$current_is_development_version = (bool) strpos( $wp_version, '-' );
 		// Defaults:
 		$upgrade_dev   = true;
 		$upgrade_minor = true;
 		$upgrade_major = false;
 		// WP_AUTO_UPDATE_CORE = true (all), 'minor', false.
 		if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
 			if ( false === WP_AUTO_UPDATE_CORE ) {
-				// Defaults to turned off, unless a filter allows it
+				// Defaults to turned off, unless a filter allows it.
-				$upgrade_dev = $upgrade_minor = $upgrade_major = false;
+				$upgrade_dev   = false;
+				$upgrade_minor = false;
+				$upgrade_major = false;
 			} elseif ( true === WP_AUTO_UPDATE_CORE ) {
-				// ALL updates for core
+				// ALL updates for core.
-				$upgrade_dev = $upgrade_minor = $upgrade_major = true;
+				$upgrade_dev   = true;
+				$upgrade_minor = true;
+				$upgrade_major = true;
 			} elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {
-				// Only minor updates for core
+				// Only minor updates for core.
-				$upgrade_dev   = $upgrade_major = false;
+				$upgrade_dev   = false;
 				$upgrade_minor = true;
+				$upgrade_major = false;
 			}
 		}
 		// 1: If we're already on that version, not much point in updating?
 		if ( $offered_ver == $wp_version ) {
 			return false;
 		}
-		// 2: If we're running a newer version, that's a nope
+		// 2: If we're running a newer version, that's a nope.
 		if ( version_compare( $wp_version, $offered_ver, '>' ) ) {
 			return false;
 		}
 		$failure_data = get_site_option( 'auto_core_update_failed' );
 			// Don't claim we can update on update-core.php if we have a non-critical failure logged.
 			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
 				return false;
 			}
-			// Cannot update if we're retrying the same A to B update that caused a non-critical failure.
+			/*
-			// Some non-critical failures do allow retries, like download_failed.
+			 * Cannot update if we're retrying the same A to B update that caused a non-critical failure.
-			// 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.
+			 * Some non-critical failures do allow retries, like download_failed.
+			 * 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.
+			 */
 			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) {
 				return false;
 			}
 		}
-		// 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2
+		// 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2.
 		if ( $current_is_development_version ) {
 			/**
 			 * Filters whether to enable automatic core updates for development versions.
 			 *
 				return false;
 			}
 			// Else fall through to minor + major branches below.
 		}
-		// 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4)
+		// 4: Minor in-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4).
 		if ( $current_branch == $new_branch ) {
 			/**
 			 * Filters whether to enable minor automatic core updates.
 			 *
 			 * @param bool $upgrade_minor Whether to enable minor automatic core updates.
 			 */
 			return apply_filters( 'allow_minor_auto_core_updates', $upgrade_minor );
 		}
-		// 5: Major version updates (3.7.0 -> 3.8.0 -> 3.9.1)
+		// 5: Major version updates (3.7.0 -> 3.8.0 -> 3.9.1).
 		if ( version_compare( $new_branch, $current_branch, '>' ) ) {
 			/**
 			 * Filters whether to enable major automatic core updates.
 			 *
 			 * @param bool $upgrade_major Whether to enable major automatic core updates.
 			 */
 			return apply_filters( 'allow_major_auto_core_updates', $upgrade_major );
 		}
-		// If we're not sure, we don't want it
+		// If we're not sure, we don't want it.
 		return false;
 	}
 	/**
 	 * Compare the disk file checksums against the expected checksums.
 	 *
 	 * @since 3.7.0
 	 *
-	 * @global string $wp_version
+	 * @global string $wp_version       The WordPress version string.
-	 * @global string $wp_local_package
+	 * @global string $wp_local_package Locale code of the package.
 	 *
 	 * @return bool True if the checksums match, otherwise false.
 	 */
 	public function check_files() {
 		global $wp_version, $wp_local_package;
 		if ( ! is_array( $checksums ) ) {
 			return false;
 		}
 		foreach ( $checksums as $file => $checksum ) {
-			// Skip files which get updated
+			// Skip files which get updated.
-			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
+			if ( 'wp-content' === substr( $file, 0, 10 ) ) {
 				continue;
 			}
 			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {
 				return false;
 			}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a