Remaining fixes

Author: swissspidy

features/core-update.feature

@@ -21,7 +21,6 @@ Feature: Update WordPress core
       """
       Starting update...
       Unpacking the update...
-      Cleaning up files...
       Success: WordPress updated successfully.
       """
 

src/Core_Command.php

@@ -851,7 +851,7 @@ private static function modify_wp_config( $content ) {
 		$wp_config_path = Utils\locate_wp_config();
 
 		$token           = "/* That's all, stop editing!";
-		$config_contents = file_get_contents( $wp_config_path );
+		$config_contents = (string) file_get_contents( $wp_config_path );
 		if ( false === strpos( $config_contents, $token ) ) {
 			return false;
 		}
@@ -1121,6 +1121,10 @@ public function update( $args, $assoc_args ) {
 
 			// Update to next release
 			wp_version_check();
+
+			/**
+			 * @var object{updates: array<object{version: string, locale: string}>} $from_api
+			 */
 			$from_api = get_site_transient( 'update_core' );
 
 			if ( Utils\get_flag_value( $assoc_args, 'minor' ) ) {
@@ -1185,7 +1189,12 @@ public function update( $args, $assoc_args ) {
 			$insecure     = (bool) Utils\get_flag_value( $assoc_args, 'insecure', false );
 
 			$GLOBALS['wpcli_core_update_obj'] = $update;
-			$result                           = Utils\get_upgrader( $upgrader, $insecure )->upgrade( $update );
+
+			/**
+			 * @var \WP_CLI\Core\CoreUpgrader $wp_upgrader
+			 */
+			$wp_upgrader = Utils\get_upgrader( $upgrader, $insecure );
+			$result      = $wp_upgrader->upgrade( $update );
 			unset( $GLOBALS['wpcli_core_update_obj'] );
 
 			if ( is_wp_error( $result ) ) {
@@ -1379,6 +1388,10 @@ private function get_download_url( $version, $locale = 'en_US', $file_type = 'zi
 	private function get_updates( $assoc_args ) {
 		$force_check = (bool) Utils\get_flag_value( $assoc_args, 'force-check' );
 		wp_version_check( [], $force_check );
+
+		/**
+		 * @var object{updates: array<object{version: string, locale: string, packages: object{partial?: string, full: string}}>}|false $from_api
+		 */
 		$from_api = get_site_transient( 'update_core' );
 		if ( ! $from_api ) {
 			return [];

src/WP_CLI/Core/CoreUpgrader.php

@@ -66,6 +66,11 @@ public function download_package( $package, $check_signatures = false, $hook_ext
 			$this,
 			$hook_extra
 		);
+
+		/**
+		 * @var false|string|\WP_Error $reply
+		 */
+
 		if ( false !== $reply ) {
 			return $reply;
 		}
@@ -91,9 +96,13 @@ function () use ( $temp ) {
 			}
 		);
 
-		$cache      = WP_CLI::get_cache();
-		$update     = $GLOBALS['wpcli_core_update_obj'];
-		$cache_key  = "core/{$filename}-{$update->locale}.{$extension}";
+		$cache     = WP_CLI::get_cache();
+		$update    = $GLOBALS['wpcli_core_update_obj'];
+		$cache_key = "core/{$filename}-{$update->locale}.{$extension}";
+
+		/**
+		 * @var false|string $cache_file
+		 */
 		$cache_file = $cache->has( $cache_key );
 
 		if ( $cache_file && false === stripos( $package, 'https://wordpress.org/nightly-builds/' )
@@ -154,7 +163,7 @@ function () use ( $temp ) {
 	 *        @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 = [] ) {
 		set_error_handler( [ __CLASS__, 'error_handler' ], E_USER_WARNING | E_USER_NOTICE );