Merge branch 'master' into issue/doc-verbs

Author: danielbachhuber

src/Plugin_Command.php

@@ -501,8 +501,14 @@ protected function install_from_repo( $slug, $assoc_args ) {
 		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'version' ) != 'dev' ) {
 			WP_CLI::get_http_cache_manager()->whitelist_package( $api->download_link, $this->item_type, $api->slug, $api->version );
 		}
+
+		// Ignore failures on accessing SSL "https://api.wordpress.org/plugins/update-check/1.1/" in `wp_update_plugins()` which seem to occur intermittently.
+		set_error_handler( array( __CLASS__, 'error_handler' ), E_USER_WARNING | E_USER_NOTICE );
+
 		$result = $this->get_upgrader( $assoc_args )->install( $api->download_link );
 
+		restore_error_handler();
+
 		return $result;
 	}
 
@@ -622,7 +628,7 @@ protected function get_item_list() {
 				'version' => $details['Version'],
 				'update_id' => $file,
 				'title' => $details['Name'],
-				'description' => $details['Description'],
+				'description' => wordwrap( $details['Description'] ),
 			);
 		}
 

src/Theme_Command.php

@@ -411,8 +411,14 @@ protected function install_from_repo( $slug, $assoc_args ) {
 		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'version' ) != 'dev' ) {
 			WP_CLI::get_http_cache_manager()->whitelist_package( $api->download_link, $this->item_type, $api->slug, $api->version );
 		}
+
+		// Ignore failures on accessing SSL "https://api.wordpress.org/themes/update-check/1.1/" in `wp_update_themes()` which seem to occur intermittently.
+		set_error_handler( array( __CLASS__, 'error_handler' ), E_USER_WARNING | E_USER_NOTICE );
+
 		$result = $this->get_upgrader( $assoc_args )->install( $api->download_link );
 
+		restore_error_handler();
+
 		return $result;
 	}
 
@@ -442,7 +448,7 @@ protected function get_item_list() {
 				'version' => $theme->get('Version'),
 				'update_id' => $theme->get_stylesheet(),
 				'title' => $theme->get('Name'),
-				'description' => $theme->get('Description'),
+				'description' => wordwrap( $theme->get('Description') ),
 				'author' => $theme->get('Author'),
 			);
 

src/WP_CLI/CommandWithUpgrade.php

@@ -626,5 +626,23 @@ protected function get_formatter( &$assoc_args ) {
 		return new \WP_CLI\Formatter( $assoc_args, $this->obj_fields, $this->item_type );
 	}
 
+	/**
+	 * Error handler to ignore failures on accessing SSL "https://api.wordpress.org/themes/update-check/1.1/" in `wp_update_themes()`
+	 * and "https://api.wordpress.org/plugins/update-check/1.1/" in `wp_update_plugins()` which seem to occur intermittently.
+	 */
+	public static function error_handler( $errno, $errstr, $errfile, $errline, $errcontext = null ) {
+		// If ignoring E_USER_WARNING | E_USER_NOTICE, default.
+		if ( ! ( error_reporting() & $errno ) ) {
+			return false;
+		}
+		// If not in "wp-includes/update.php", default.
+		$update_php = 'wp-includes/update.php';
+		if ( 0 !== substr_compare( $errfile, $update_php, -strlen( $update_php ) ) ) {
+			return false;
+		}
+		// Else assume it's in `wp_update_themes()` or `wp_update_plugins()` and just ignore it.
+		return true;
+	}
+
 }