Merge branch 'develop'

Author: afragen

CHANGES.md

@@ -1,5 +1,13 @@
 #### [unreleased]
 
+#### 12.18.0 / 2025-08-04
+* update cache delete and don't use `wp_cache_flush`
+* always show download link in REST endpoint
+* improved reverse sort for branch/tag versions
+* get all release assets from GitHub API and pick release asset download from release assets array, other APIs get latest release asset only
+* update `parse_tag()` and `sort_tags()`
+* update branch switching tags
+
 #### 12.17.3 / 2025-07-31
 * add new `Security` header with value of email or URI
 

composer.lock

@@ -13,7 +13,7 @@
  * Plugin ID:         did:plc:afjf7gsjzsqmgc7dlhb553mv
  * Plugin URI:        https://git-updater.com
  * Description:       A plugin to automatically update GitHub hosted plugins, themes, and language packs. Additional API plugins available for Bitbucket, GitLab, Gitea, and Gist.
- * Version:           12.17.3
+ * Version:           12.18.0
  * Author:            Andy Fragen
  * Author URI:        https://thefragens.com
  * Security:          [email protected]

git-updater.php

@@ -34,8 +34,14 @@
 }
 
 global $wpdb;
-$table         = is_multisite() ? $wpdb->base_prefix . 'sitemeta' : $wpdb->base_prefix . 'options';
-$column        = is_multisite() ? 'meta_key' : 'option_name';
-$delete_string = 'DELETE FROM ' . $table . ' WHERE ' . $column . ' LIKE %s LIMIT 1000';
+$table              = is_multisite() ? $wpdb->base_prefix . 'sitemeta' : $wpdb->base_prefix . 'options';
+$column             = is_multisite() ? 'meta_key' : 'option_name';
+$delete_string      = 'DELETE FROM ' . $table . ' WHERE ' . $column . ' LIKE %s LIMIT 1000';
+$get_options_string = 'SELECT * FROM ' . $table . ' WHERE ' . $column . ' LIKE %s';
+
+$ghu_options = $wpdb->get_results( $wpdb->prepare( $get_options_string, [ '%ghu-%' ] ) ); // phpcs:ignore
+foreach ( $ghu_options as $option ) {
+	delete_site_option( $option->option_name );
+}
 
 $wpdb->query( $wpdb->prepare( $delete_string, [ '%ghu-%' ] ) ); // phpcs:ignore

gu-uninstall.php

@@ -9,7 +9,7 @@
 
     <!-- Only check PHP files. -->
     <arg name="extensions" value="php"/>
-    
+
     <file>.</file>
 
     <!-- Exclude these -->

phpcs.xml

@@ -453,26 +453,20 @@ protected function local_file_exists( $filename ) {
 	/**
 	 * Sort tags and set object data.
 	 *
-	 * @param array $parsed_tags Array of tags.
+	 * @param array $tags Associative array of tags[ tag ].
 	 *
 	 * @return bool
 	 */
-	protected function sort_tags( $parsed_tags ) {
-		if ( empty( $parsed_tags ) ) {
+	protected function sort_tags( $tags ) {
+		if ( empty( $tags ) ) {
 			return false;
 		}
 
-		list($tags, $rollback) = $parsed_tags;
-		usort( $tags, 'version_compare' );
-		uksort( $rollback, 'version_compare' );
+		uksort( $tags, fn ( $a, $b ) => version_compare( trim( $b, 'v' ), trim( $a, 'v' ) ) );
 
-		$newest_tag     = array_slice( $tags, -1, 1, true );
-		$newest_tag_key = key( $newest_tag );
-		$newest_tag     = $tags[ $newest_tag_key ];
-
-		$this->type->newest_tag = $newest_tag;
+		$tag_keys               = array_keys( $tags );
+		$this->type->newest_tag = reset( $tag_keys );
 		$this->type->tags       = $tags;
-		$this->type->rollback   = $rollback;
 
 		return true;
 	}

src/Git_Updater/API/API.php

@@ -103,10 +103,10 @@ public function get_remote_branches() {
 	/**
 	 * Return the latest GitHub release asset URL.
 	 *
-	 * @return string|bool
+	 * @return string|bool|void
 	 */
 	public function get_release_asset() {
-		return $this->get_api_release_asset( 'github', '/repos/:owner/:repo/releases/latest' );
+		// return $this->get_api_release_asset( 'github', '/repos/:owner/:repo/releases/latest' );
 	}
 
 	/**
@@ -152,12 +152,11 @@ public function construct_download_link( $branch_switch = false ) {
 
 		// Release asset.
 		if ( $this->use_release_asset( $branch_switch ) ) {
-			$this->get_release_assets();
-			$release_asset = $this->get_release_asset();
+			$release_assets = $this->get_release_assets();
+			$release_asset  = reset( $release_assets );
 
 			if ( empty( $this->response['release_asset_download'] ) ) {
-				$response = $this->api( $release_asset );
-				$this->parse_release_asset_response( $response );
+				$this->set_repo_cache( 'release_asset_download', $release_asset );
 			}
 			if ( ! empty( $this->response['release_asset_download'] ) ) {
 				return $this->response['release_asset_download'];
@@ -375,11 +374,10 @@ public function parse_release_asset_response( $response ) {
 	 * @return array
 	 */
 	protected function parse_tags( $response, $repo_type ) {
-		$tags     = [];
-		$rollback = [];
+		$tags = [];
 
 		foreach ( (array) $response as $tag ) {
-			$download_base    = implode(
+			$download_base = implode(
 				'/',
 				[
 					$repo_type['base_uri'],
@@ -389,11 +387,15 @@ protected function parse_tags( $response, $repo_type ) {
 					'zipball/',
 				]
 			);
-			$tags[]           = $tag;
-			$rollback[ $tag ] = $download_base . $tag;
+
+			// Ignore leading 'v' and skip anything with dash or words.
+			if ( ! preg_match( '/[^v]+[-a-z]+/', $tag ) ) {
+				$tags[ $tag ] = $download_base . $tag;
+			}
+			uksort( $tags, fn ( $a, $b ) => version_compare( ltrim( $b, 'v' ), ltrim( $a, 'v' ) ) );
 		}
 
-		return [ $tags, $rollback ];
+		return $tags;
 	}
 
 	/**

src/Git_Updater/API/GitHub_API.php

@@ -367,7 +367,6 @@ protected function set_defaults( $type ) {
 		$this->$type->newest_tag     = '0.0.0';
 		$this->$type->download_link  = '';
 		$this->$type->tags           = [];
-		$this->$type->rollback       = [];
 		$this->$type->branches       = [];
 		$this->$type->requires       = '';
 		$this->$type->tested         = '';

src/Git_Updater/Base.php

@@ -329,10 +329,8 @@ public function single_install_switcher( $theme ) {
 					echo '<option>' . esc_attr( $branch ) . '</option>';
 				}
 			}
-			if ( ! empty( $theme->rollback ) ) {
-				$rollback = array_keys( $theme->rollback );
-				usort( $rollback, 'version_compare' );
-				krsort( $rollback );
+			if ( ! empty( $theme->tags ) ) {
+				uksort( $theme->tags, fn ( $a, $b ) => version_compare( ltrim( $b, 'v' ), trim( $a, 'v' ) ) );
 
 				/**
 				 * Filter to return the number of tagged releases (rollbacks) in branch switching.
@@ -342,16 +340,16 @@ public function single_install_switcher( $theme ) {
 				 */
 				$num_rollbacks = absint( apply_filters( 'gu_number_rollbacks', 0 ) );
 
-				// Still only return last tag if using release assets.
-				$rollback = 0 === $num_rollbacks || $theme->release_asset
-					? array_slice( $rollback, 0, 1 )
-					: array_splice( $rollback, 0, $num_rollbacks, true );
+				$tag_keys = array_keys( $theme->tags );
+				$rollback = 0 === $num_rollbacks
+					? array_slice( $tag_keys, 0, 1 )
+					: array_splice( $tag_keys, 0, $num_rollbacks );
 
 				foreach ( $rollback as $tag ) {
 					echo '<option>' . esc_attr( $tag ) . '</option>';
 				}
 			}
-			if ( empty( $theme->rollback ) ) {
+			if ( empty( $theme->tags ) ) {
 				echo '<option>' . esc_html__( 'No previous tags to rollback to.', 'git-updater' ) . '</option></select></label>';
 			}
 			?>
@@ -373,7 +371,7 @@ public function single_install_switcher( $theme ) {
 	 * @return void
 	 */
 	public function make_branch_switch_row( $data, $config ) {
-		$rollback = empty( $config[ $data['slug'] ]->rollback ) ? [] : $config[ $data['slug'] ]->rollback;
+		$rollback = empty( $config[ $data['slug'] ]->tags ) ? [] : $config[ $data['slug'] ]->tags;
 
 		// Make the branch switch row visually appear as if it is contained with the plugin/theme's row.
 		// We have to use JS for this because of the way:
@@ -441,9 +439,7 @@ public function make_branch_switch_row( $data, $config ) {
 		}
 
 		if ( ! empty( $rollback ) ) {
-			$rollback = array_keys( $rollback );
-			usort( $rollback, 'version_compare' );
-			krsort( $rollback );
+			uksort( $rollback, fn ( $a, $b ) => version_compare( trim( $b, 'v' ), trim( $a, 'v' ) ) );
 
 			/**
 			 * Filter to return the number of tagged releases (rollbacks) in branch switching.
@@ -453,10 +449,10 @@ public function make_branch_switch_row( $data, $config ) {
 			 */
 			$num_rollbacks = absint( apply_filters( 'gu_number_rollbacks', 0 ) );
 
-			// Still only return last tag if using release assets.
-			$rollback = 0 === $num_rollbacks || $data['release_asset']
-				? array_slice( $rollback, 0, 1 )
-				: array_splice( $rollback, 0, $num_rollbacks, true );
+			$rollback_keys = array_keys( $rollback );
+			$rollback      = 0 === $num_rollbacks
+				? array_slice( $rollback_keys, 0, 1 )
+				: array_splice( $rollback_keys, 0, $num_rollbacks );
 
 			if ( $data['release_asset'] ) {
 				/**

src/Git_Updater/Branch.php

@@ -74,7 +74,6 @@ private function save_db_version( $options ) {
 	 * Flush caches and delete cached options.
 	 */
 	private function delete_flush_cache() {
-		wp_cache_flush();
 		$this->delete_all_cached_data();
 	}