Merge pull request #1693 from ShyamGadde/fix/download-link-plugin-version

Fix latest plugin version not being downloaded consistently

Author: westonruter

plugins/performance-lab/includes/admin/plugins.php

@@ -16,7 +16,7 @@
  * @since 2.8.0
  *
  * @param string $plugin_slug The string identifier for the plugin in questions slug.
- * @return array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], download_link: string, version: string}|WP_Error Array of plugin data or WP_Error if failed.
+ * @return array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], version: string}|WP_Error Array of plugin data or WP_Error if failed.
  */
 function perflab_query_plugin_info( string $plugin_slug ) {
 	$transient_key = 'perflab_plugins_info';
@@ -40,7 +40,6 @@ function perflab_query_plugin_info( string $plugin_slug ) {
 		'requires',
 		'requires_php',
 		'requires_plugins',
-		'download_link',
 		'version', // Needed by install_plugin_install_status().
 	);
 
@@ -113,7 +112,7 @@ function perflab_query_plugin_info( string $plugin_slug ) {
 	/**
 	 * Validated (mostly) plugin data.
 	 *
-	 * @var array<string, array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], download_link: string, version: string}> $plugins
+	 * @var array<string, array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], version: string}> $plugins
 	 */
 	return $plugins[ $plugin_slug ];
 }
@@ -343,11 +342,27 @@ function perflab_install_and_activate_plugin( string $plugin_slug, array &$proce
 	}
 	$processed_plugins[] = $plugin_slug;
 
-	$plugin_data = perflab_query_plugin_info( $plugin_slug );
+	// Get the freshest data (including the most recent download_link) as opposed what is cached by perflab_query_plugin_info().
+	$plugin_data = plugins_api(
+		'plugin_information',
+		array(
+			'slug'   => $plugin_slug,
+			'fields' => array(
+				'download_link'    => true,
+				'requires_plugins' => true,
+				'sections'         => false, // Omit the bulk of the response which we don't need.
+			),
+		)
+	);
+
 	if ( $plugin_data instanceof WP_Error ) {
 		return $plugin_data;
 	}
 
+	if ( is_object( $plugin_data ) ) {
+		$plugin_data = (array) $plugin_data;
+	}
+
 	// Add recommended plugins (soft dependencies) to the list of plugins installed and activated.
 	if ( 'embed-optimizer' === $plugin_slug ) {
 		$plugin_data['requires_plugins'][] = 'optimization-detective';