Remove hard-coded reference to embed-optimizer

westonruter · westonruter · commit b012d8d9683e · 2024-11-11T09:13:20.000-08:00
diff --git a/plugins/performance-lab/includes/admin/plugins.php b/plugins/performance-lab/includes/admin/plugins.php
@@ -325,8 +325,12 @@ function perflab_install_and_activate_plugin( string $plugin_slug, array &$proce
 	}
 
 	// Add recommended plugins (soft dependencies) to the list of plugins installed and activated.
-	if ( 'embed-optimizer' === $plugin_slug ) {
-		$plugin_data['requires_plugins'][] = 'optimization-detective';
+	$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']
+		);
 	}
 
 	// Install and activate plugin dependencies first.
diff --git a/plugins/performance-lab/load.php b/plugins/performance-lab/load.php
@@ -83,14 +83,15 @@ function perflab_render_generator(): void {
  *
  * @since 3.0.0
  *
- * @return array<string, array{'constant': string, 'experimental'?: bool}> Associative array of $plugin_slug => $plugin_data pairs.
+ * @return array<string, array{'constant': string, 'experimental'?: bool, 'suggest'?: string[]}> 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(
@@ -103,6 +104,7 @@ 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',

Original file line number	Diff line number	Diff line change
`@@ -325,8 +325,12 @@ function perflab_install_and_activate_plugin( string $plugin_slug, array &$proce`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`// Add recommended plugins (soft dependencies) to the list of plugins installed and activated.`
`328`		`- if ( 'embed-optimizer' === $plugin_slug ) {`
`329`		`- $plugin_data['requires_plugins'][] = 'optimization-detective';`
	`328`	`+ $standalone_plugin_data = perflab_get_standalone_plugin_data();`
	`329`	`+ if ( isset( $standalone_plugin_data[ $plugin_slug ]['suggest'] ) ) {`
	`330`	`+ $plugin_data['requires_plugins'] = array_merge(`
	`331`	`+ $plugin_data['requires_plugins'],`
	`332`	`+ $standalone_plugin_data[ $plugin_slug ]['suggest']`
	`333`	`+ );`
`330`	`334`	`}`
`331`	`335`
`332`	`336`	`// Install and activate plugin dependencies first.`