Revert "Remove hard-coded reference to embed-optimizer"

This reverts commit b012d8d.
WordPress · Nov 11, 2024 · 70f90b6 · 70f90b6
1 parent b012d8d
commit 70f90b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/plugins/performance-lab/includes/admin/plugins.php b/plugins/performance-lab/includes/admin/plugins.php
@@ -325,12 +325,8 @@ function perflab_install_and_activate_plugin( string $plugin_slug, array &$proce
 	}
 
 	// Add recommended plugins (soft dependencies) to the list of plugins installed and activated.
-	$standalone_plugin_data = perflab_get_standalone_plugin_data();
-	if ( isset( $standalone_plugin_data[ $plugin_slug ]['suggest'] ) ) {
-		$plugin_data['requires_plugins'] = array_merge(
-			$plugin_data['requires_plugins'],
-			$standalone_plugin_data[ $plugin_slug ]['suggest']
-		);
+	if ( 'embed-optimizer' === $plugin_slug ) {
+		$plugin_data['requires_plugins'][] = 'optimization-detective';
 	}
 
 	// Install and activate plugin dependencies first.

diff --git a/plugins/performance-lab/load.php b/plugins/performance-lab/load.php
@@ -83,15 +83,14 @@ function perflab_render_generator(): void {
  *
  * @since 3.0.0
  *
- * @return array<string, array{'constant': string, 'experimental'?: bool, 'suggest'?: string[]}> Associative array of $plugin_slug => $plugin_data pairs.
+ * @return array<string, array{'constant': string, 'experimental'?: bool}> Associative array of $plugin_slug => $plugin_data pairs.
  */
 function perflab_get_standalone_plugin_data(): array {
 	/*
 	 * Alphabetically sorted list of plugin slugs and their data.
 	 * Supported keys per plugin are:
 	 * - 'constant' (string, required)
 	 * - 'experimental' (boolean, optional)
-	 * - 'suggest' (string[], optional)
 	 */
 	return array(
 		'auto-sizes'              => array(
@@ -104,7 +103,6 @@ function perflab_get_standalone_plugin_data(): array {
 		'embed-optimizer'         => array(
 			'constant'     => 'EMBED_OPTIMIZER_VERSION',
 			'experimental' => true,
-			'suggest'      => array( 'optimization-detective' ),
 		),
 		'image-prioritizer'       => array(
 			'constant'     => 'IMAGE_PRIORITIZER_VERSION',