Merge branch 'develop'

.github/workflows/generate-pot.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: WordPress POT Generator
-        uses: varunsridharan/action-wp-pot-generator@2.0
+        uses: afragen/action-wp-pot-generator@main
         with:
           save_path: "./languages"
           item_slug: "${{ github.event.repository.name }}"

CHANGES.md

@@ -1,5 +1,10 @@
 #### [unreleased]
 
+#### 12.8.0 / 2024-12-21
+* update GitHub release asset parsing
+* update `REST_API` for Bitbucket update link
+* update `REST_API` for `update-api` route
+
 #### 12.7.2 / 2024-12-18
 * update `freemius/wordpress-sdk`
 * use `mcaskill/composer-exclude-files` to exclude autoloading `start.php` from Freemius, issues arise

git-updater.php

@@ -12,7 +12,7 @@
  * Plugin Name:       Git Updater
  * 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.7.2
+ * Version:           12.8.0
  * Author:            Andy Fragen
  * License:           MIT
  * Domain Path:       /languages

src/Git_Updater/API/API.php

@@ -327,7 +327,10 @@ public function get_api_url( $endpoint, $download_link = false ) {
 		 */
 		$type = apply_filters( 'gu_api_url_type', $type, $this->type, $download_link, $endpoint );
 
-		$base     = $download_link ? $type['base_download'] : $type['base_uri'];
+		$base = $download_link ? $type['base_download'] : $type['base_uri'];
+		if ( is_string( $base ) && str_starts_with( $endpoint, $base ) ) {
+			return $endpoint;
+		}
 		$endpoint = $repo_api->add_endpoints( $this, $endpoint );
 
 		return $base . $endpoint;

src/Git_Updater/API/GitHub_API.php

@@ -126,6 +126,14 @@ public function construct_download_link( $branch_switch = false ) {
 		if ( $this->use_release_asset( $branch_switch ) ) {
 			$release_asset = $this->get_release_asset();
 
+			if ( empty( $this->response['release_asset_download'] ) ) {
+				$response = $this->api( $release_asset );
+				$this->parse_release_asset_response( $response );
+			}
+			if ( ! empty( $this->response['release_asset_download'] ) ) {
+				return $this->response['release_asset_download'];
+			}
+
 			return $this->get_release_asset_redirect( $release_asset, true );
 		}
 
@@ -310,6 +318,22 @@ public function parse_branch_response( $response ) {
 		return $branches;
 	}
 
+	/**
+	 * Parse release asset API response.
+	 *
+	 * @param \stdClass $response API response.
+	 *
+	 * @return void
+	 */
+	public function parse_release_asset_response( $response ) {
+		if ( $this->validate_response( $response ) ) {
+			return;
+		}
+		if ( property_exists( $response, 'browser_download_url' ) ) {
+			$this->set_repo_cache( 'release_asset_download', $response->browser_download_url );
+		}
+	}
+
 	/**
 	 * Parse tags and create download links.
 	 *

src/Git_Updater/REST/REST_API.php

@@ -100,41 +100,25 @@ public function register_endpoints() {
 			]
 		);
 
-		register_rest_route(
-			self::$namespace,
-			'plugins-api',
-			[
-				'show_in_index'       => true,
-				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => [ $this, 'get_api_data' ],
-				'permission_callback' => '__return_true',
-				'args'                => [
-					'slug' => [
-						'default'           => false,
-						'required'          => true,
-						'validate_callback' => 'sanitize_title_with_dashes',
-					],
-				],
-			]
-		);
-
-		register_rest_route(
-			self::$namespace,
-			'themes-api',
-			[
-				'show_in_index'       => true,
-				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => [ $this, 'get_api_data' ],
-				'permission_callback' => '__return_true',
-				'args'                => [
-					'slug' => [
-						'default'           => false,
-						'required'          => true,
-						'validate_callback' => 'sanitize_title_with_dashes',
+		foreach ( [ 'plugins-api', 'themes-api', 'update-api' ] as $route ) {
+			register_rest_route(
+				self::$namespace,
+				$route,
+				[
+					'show_in_index'       => true,
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => [ $this, 'get_api_data' ],
+					'permission_callback' => '__return_true',
+					'args'                => [
+						'slug' => [
+							'default'           => false,
+							'required'          => true,
+							'validate_callback' => 'sanitize_title_with_dashes',
+						],
 					],
-				],
-			]
-		);
+				]
+			);
+		}
 
 		$update_args = [
 			'key'        => [
@@ -404,16 +388,20 @@ public function get_api_data( \WP_REST_Request $request ) {
 		];
 
 		$repo_cache = $this->get_repo_cache( $slug );
+		Singleton::get_instance( 'Fragen\Git_Updater\API\API', $this )->response = $repo_cache;
 
-		if ( $repo_api_data['download_link'] && $repo_api_data['is_private'] || in_array( $repo_api_data['git'], [ 'gitlab', 'gitea' ], true )
+		if ( $repo_api_data['download_link']
+			&& ( $repo_api_data['is_private'] || in_array( $repo_api_data['git'], [ 'gitlab', 'gitea' ], true ) )
 		) {
 			$repo_api_data['auth_header'] = Singleton::get_instance( 'Fragen\Git_Updater\API\API', $this )->add_auth_header( [], $repo_api_data['download_link'] );
 			$repo_api_data['auth_header'] = Singleton::get_instance( 'Fragen\Git_Updater\API\API', $this )->unset_release_asset_auth( $repo_api_data['auth_header'], $repo_api_data['download_link'] );
 		}
 
 		if ( $download && $repo_data->release_asset ) {
-			if ( isset( $repo_cache['release_asset_redirect'] ) ) {
-				$repo_api_data['download_link'] = $repo_cache['release_asset_redirect'];
+			if ( isset( $repo_cache['release_asset_download'] )
+				&& 'bitbucket' !== $repo_api_data['git']
+			) {
+				$repo_api_data['download_link'] = $repo_cache['release_asset_download'];
 			} elseif ( $repo_cache['release_asset'] ) {
 				$_REQUEST['override']           = true;
 				$repo_api_data['download_link'] = Singleton::get_instance( 'Fragen\Git_Updater\API\API', $this )->get_release_asset_redirect( $repo_cache['release_asset'], true );

src/Git_Updater/Traits/API_Common.php

@@ -342,7 +342,7 @@ final public function get_api_release_asset( $git, $request ) {
 			}
 		}
 
-		if ( $response && ( ! isset( $this->response['release_asset'] ) || ! $this->response['release_asset'] ) ) {
+		if ( $response && ! isset( $this->response['release_asset'] ) ) {
 			$this->set_repo_cache( 'release_asset', $response );
 		}
 

vendor/composer/autoload_real.php

@@ -33,18 +33,6 @@ public static function getLoader()
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInita27e6a3df8c435e2b136f961f0442be2::$files;
-        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
-            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
-                require $file;
-            }
-        }, null, null);
-        foreach ($filesToLoad as $fileIdentifier => $file) {
-            $requireFile($fileIdentifier, $file);
-        }
-
         return $loader;
     }
 }

vendor/composer/autoload_static.php

@@ -6,10 +6,6 @@
 
 class ComposerStaticInita27e6a3df8c435e2b136f961f0442be2
 {
-    public static $files = array (
-        '8d50dc88e56bace65e1e72f6017983ed' => __DIR__ . '/..' . '/freemius/wordpress-sdk/start.php',
-    );
-
     public static $prefixLengthsPsr4 = array (
         'P' => 
         array (

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'afragen/git-updater',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '19c0943a1677aa478ba1fa0996d45a4269cee99c',
+        'reference' => 'c18b9a2172809b787403f0aa29980a9cb5b1fd85',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'afragen/git-updater' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '19c0943a1677aa478ba1fa0996d45a4269cee99c',
+            'reference' => 'c18b9a2172809b787403f0aa29980a9cb5b1fd85',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),