Merge pull request #276 from mrsdizzie/trailing-zero

swissspidy · web-flow · commit 4bb39ec3d131 · 2024-12-18T09:15:06.000+01:00
Allow installing major version with trailing zero
diff --git a/features/core-download.feature b/features/core-download.feature
@@ -54,7 +54,7 @@ Feature: Download WordPress
   Scenario: Catch download of non-existent WP version
     Given an empty directory
 
-    When I try `wp core download --version=4.1.0 --force`
+    When I try `wp core download --version=1.0.3 --force`
     Then STDERR should contain:
       """
       Error: Release not found.
@@ -473,3 +473,13 @@ Feature: Download WordPress
       Error: Cannot use both --skip-content and --no-extract at the same time.
       """
     And the return code should be 1
+
+    Scenario: Allow installing major version with trailing zero
+    Given an empty directory
+
+    When I run `wp core download --version=6.7.0`
+    Then STDOUT should contain:
+    """
+    Success:
+    """
+
diff --git a/features/core-update.feature b/features/core-update.feature
@@ -347,3 +347,14 @@ Feature: Update WordPress core
       """
       Using cached
       """
+
+  Scenario: Allow installing major version with trailing zero
+    Given a WP install
+
+    When I run `wp core update --version=6.2.0 --force`
+    Then STDOUT should contain:
+    """
+    Success:
+    """
+
+
diff --git a/src/Core_Command.php b/src/Core_Command.php
@@ -1349,6 +1349,10 @@ private function get_download_url( $version, $locale = 'en_US', $file_type = 'zi
 
 		$locale_subdomain = 'en_US' === $locale ? '' : substr( $locale, 0, 2 ) . '.';
 		$locale_suffix    = 'en_US' === $locale ? '' : "-{$locale}";
+		// Match 6.7.0 but not 6.0
+		if ( substr_count( $version, '.' ) > 1 && substr( $version, -2 ) === '.0' ) {
+			$version = substr( $version, 0, -2 );
+		}
 
 		return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}{$locale_suffix}.{$file_type}";
 	}

Original file line number	Diff line number	Diff line change
`@@ -1349,6 +1349,10 @@ private function get_download_url( $version, $locale = 'en_US', $file_type = 'zi`
`1349`	`1349`
`1350`	`1350`	`$locale_subdomain = 'en_US' === $locale ? '' : substr( $locale, 0, 2 ) . '.';`
`1351`	`1351`	`$locale_suffix = 'en_US' === $locale ? '' : "-{$locale}";`
	`1352`	`+ // Match 6.7.0 but not 6.0`
	`1353`	`+ if ( substr_count( $version, '.' ) > 1 && substr( $version, -2 ) === '.0' ) {`
	`1354`	`+ $version = substr( $version, 0, -2 );`
	`1355`	`+ }`
`1352`	`1356`
`1353`	`1357`	`return "https://{$locale_subdomain}wordpress.org/wordpress-{$version}{$locale_suffix}.{$file_type}";`
`1354`	`1358`	`}`