Merge pull request #44 from wp-cli/43-skip-cache-http

Skip cache also when ZIP URL is 'http://' to nightly build

Author: gitlost

features/core-update.feature

@@ -260,3 +260,26 @@ Feature: Update WordPress core
     | version    |
     | trunk      |
     | nightly    |
+
+  Scenario: Installing latest nightly build should skip cache
+    Given a WP install
+
+    When I run `wp core upgrade --force http://wordpress.org/nightly-builds/wordpress-4.9-latest.zip`
+    Then STDOUT should contain:
+      """
+      Success:
+      """
+    And STDOUT should not contain:
+      """
+      Using cached
+      """
+
+    When I run `wp core upgrade --force http://wordpress.org/nightly-builds/wordpress-4.9-latest.zip`
+    Then STDOUT should contain:
+      """
+      Success:
+      """
+    And STDOUT should not contain:
+      """
+      Using cached
+      """

src/WP_CLI/CoreUpgrader.php

@@ -55,7 +55,8 @@ public function download_package( $package ) {
 		$cache_key = "core/{$filename}-{$update->locale}.{$ext}";
 		$cache_file = $cache->has( $cache_key );
 
-		if ( $cache_file && false === stripos( $package, 'https://wordpress.org/nightly-builds/' ) ) {
+		if ( $cache_file && false === stripos( $package, 'https://wordpress.org/nightly-builds/' )
+			&& false === stripos( $package, 'http://wordpress.org/nightly-builds/' ) ) {
 			WP_CLI::log( "Using cached file '$cache_file'..." );
 			copy( $cache_file, $temp );
 			return $temp;