Merge pull request #212 from wp-cli/fix/remove-only-plugins-themes-folders

Author: schlessera

features/core-download.feature

@@ -340,7 +340,7 @@ Feature: Download WordPress
     """
     And the return code should be 1
 
-  Scenario: Core download without the wp-content dir
+  Scenario: Core download without the wp-content/plugins dir
     Given an empty directory
 
     When I run `wp core download --skip-content`
@@ -349,9 +349,31 @@ Feature: Download WordPress
       Success: WordPress downloaded.
       """
     And the wp-includes directory should exist
-    And the wp-content directory should not exist
+    And the wp-content/plugins directory should not exist
 
-  Scenario: Core download without the wp-content dir should work non US locale
+  Scenario: Core download without the wp-content/themes dir
+    Given an empty directory
+
+    When I run `wp core download --skip-content`
+    Then STDOUT should contain:
+      """
+      Success: WordPress downloaded.
+      """
+    And the wp-includes directory should exist
+    And the wp-content/themes directory should not exist
+
+  Scenario: Core download without the wp-content/plugins dir should work non US locale
+    Given an empty directory
+
+    When I run `wp core download --skip-content --version=4.9.11 --locale=nl_NL`
+    Then STDOUT should contain:
+      """
+      Success: WordPress downloaded.
+      """
+    And the wp-includes directory should exist
+    And the wp-content/plugins directory should not exist
+
+  Scenario: Core download without the wp-content/themes dir should work non US locale
     Given an empty directory
 
     When I run `wp core download --skip-content --version=4.9.11 --locale=nl_NL`
@@ -360,9 +382,9 @@ Feature: Download WordPress
       Success: WordPress downloaded.
       """
     And the wp-includes directory should exist
-    And the wp-content directory should not exist
+    And the wp-content/themes directory should not exist
 
-  Scenario: Core download without the wp-content dir should work if a version is set
+  Scenario: Core download without the wp-content/plugins dir should work if a version is set
     Given an empty directory
 
     When I try `wp core download --skip-content --version=4.7`
@@ -371,7 +393,8 @@ Feature: Download WordPress
       Success: WordPress downloaded.
       """
     And the wp-includes directory should exist
-    And the wp-content directory should not exist
+    And the wp-content/plugins directory should not exist
+    And the wp-content/themes directory should not exist
 
   Scenario: Core download with extract parameter should unzip the download file
     Given an empty directory

src/Core_Command.php

@@ -1517,7 +1517,7 @@ function () use ( $new_zip_file ) {
 			// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			for ( $i = 0; $i < $zip->numFiles; $i++ ) {
 				$info = $zip->statIndex( $i );
-				if ( false !== stripos( $info['name'], 'wp-content/' ) ) {
+				if ( false !== stripos( $info['name'], 'themes/' ) || false !== stripos( $info['name'], 'plugins/' ) ) {
 					$zip->deleteIndex( $i );
 				}
 			}