Merge pull request #204 from xyulex/master

Author: schlessera

features/core-download.feature

@@ -372,3 +372,15 @@ Feature: Download WordPress
       """
     And the wp-includes directory should exist
     And the wp-content directory should not exist
+
+  Scenario: Core download with extract parameter should unzip the download file
+    Given an empty directory
+
+    When I run `wp core download --extract`
+    Then the wp-content directory should exist
+
+  Scenario: Core download with no-extract should not unzip the download file
+    Given an empty directory
+
+    When I run `wp core download --no-extract`
+    Then the wp-content directory should not exist

src/Core_Command.php

@@ -120,6 +120,9 @@ public function check_update( $_, $assoc_args ) {
 	 * [--insecure]
 	 * : Retry download without certificate validation if TLS handshake fails. Note: This makes the request vulnerable to a MITM attack.
 	 *
+	 * [--extract]
+	 * : Whether to extract the downloaded file. Defaults to true.
+	 *
 	 * ## EXAMPLES
 	 *
 	 *     $ wp core download --locale=nl_NL
@@ -130,7 +133,6 @@ public function check_update( $_, $assoc_args ) {
 	 * @when before_wp_load
 	 */
 	public function download( $args, $assoc_args ) {
-
 		$download_dir = ! empty( $assoc_args['path'] )
 			? ( rtrim( $assoc_args['path'], '/\\' ) . '/' )
 			: ABSPATH;
@@ -239,14 +241,19 @@ public function download( $args, $assoc_args ) {
 		}
 
 		$bad_cache = false;
+		$extract   = (bool) Utils\get_flag_value( $assoc_args, 'extract', true );
+
 		if ( $cache_file ) {
 			WP_CLI::log( "Using cached file '{$cache_file}'..." );
 			$skip_content_cache_file = $skip_content ? self::strip_content_dir( $cache_file ) : null;
-			try {
-				Extractor::extract( $skip_content_cache_file ?: $cache_file, $download_dir );
-			} catch ( Exception $exception ) {
-				WP_CLI::warning( 'Extraction failed, downloading a new copy...' );
-				$bad_cache = true;
+			if ( $extract ) {
+				try {
+					Extractor::extract( $skip_content_cache_file ?: $cache_file, $download_dir );
+
+				} catch ( Exception $exception ) {
+					WP_CLI::warning( 'Extraction failed, downloading a new copy...' );
+					$bad_cache = true;
+				}
 			}
 		}
 
@@ -296,11 +303,12 @@ function () use ( $temp ) {
 			}
 
 			$skip_content_temp = $skip_content ? self::strip_content_dir( $temp ) : null;
-
-			try {
-				Extractor::extract( $skip_content_temp ?: $temp, $download_dir );
-			} catch ( Exception $exception ) {
-				WP_CLI::error( "Couldn't extract WordPress archive. {$exception->getMessage()}" );
+			if ( $extract ) {
+				try {
+					Extractor::extract( $skip_content_temp ?: $temp, $download_dir );
+				} catch ( Exception $exception ) {
+					WP_CLI::error( "Couldn't extract WordPress archive. {$exception->getMessage()}" );
+				}
 			}
 
 			// Do not use the cache for nightly builds or for downloaded URLs