Closes #7294: Update banner for 3.19 (PR #7381)

Co-authored-by: WordPressFan <[email protected]>

Author: Miraeld

inc/Engine/Admin/Beacon/Beacon.php

@@ -821,16 +821,6 @@ public function get_suggest( $doc_id ) {
 					'url' => 'https://fr.docs.wp-rocket.me/article/1833-impossible-creer-table-rucssusedcss/?utm_source=wp_plugin&utm_medium=wp_rocket',
 				],
 			],
-			'lazy_render_content'        => [
-				'en' => [
-					'id'  => '66b11e26a62a7505fcf339e7',
-					'url' => 'https://docs.wp-rocket.me/article/1835-lazy-render-content/?utm_source=wp_plugin&utm_medium=wp_rocket',
-				],
-				'fr' => [
-					'id'  => '66ba0e8e082392452a0773ea',
-					'url' => 'https://fr.docs.wp-rocket.me/article/1836-rendu-differe-automatique/?utm_source=wp_plugin&utm_medium=wp_rocket',
-				],
-			],
 			'host_fonts_locally'         => [
 				'en' => [
 					'id'  => '673358b02ddbd952f6241b38',
@@ -841,6 +831,16 @@ public function get_suggest( $doc_id ) {
 					'url' => 'https://fr.docs.wp-rocket.me/article/1852-auto-heberger-google-fonts?utm_source=wp_plugin&utm_medium=wp_rocket',
 				],
 			],
+			'preconnect_domains'         => [
+				'en' => [
+					'id'  => '681b61d889bd957cd04bd2d9',
+					'url' => 'https://docs.wp-rocket.me/article/1869-preconnect-to-external-domains',
+				],
+				'fr' => [
+					'id'  => '681da5ae11561a04f5de356e',
+					'url' => 'https://fr.docs.wp-rocket.me/article/1870-preconnexion-aux-domaines-externes',
+				],
+			],
 		];
 
 		return isset( $suggest[ $doc_id ][ $this->get_user_locale() ] )

inc/Engine/Admin/Settings/Page.php

@@ -2255,29 +2255,24 @@ public function display_update_notice() {
 
 		$previous_version = $this->options->get( 'previous_version' );
 
-		// Bail-out for fresh install.
-		if ( empty( $previous_version ) ) {
+		// Bail-out if previous version is greater than or equal to 3.19.
+		if ( version_compare( $previous_version, '3.19', '>=' ) ) {
 			return;
 		}
 
-		// Bail-out if previous version is greater than 3.17.
-		if ( $previous_version > '3.17' ) {
-			return;
-		}
-
-		$lazy_render_content = $this->beacon->get_suggest( 'lazy_render_content' );
+		$preconnect_content = $this->beacon->get_suggest( 'preconnect_domains' );
 
 		rocket_notice_html(
 			[
 				'status'         => 'info',
 				'dismissible'    => '',
 				'message'        => sprintf(
-					// translators: %1$s: opening strong tag, %2$s: closing strong tag, %3$s: opening a tag, %4$s: opening a tag.
-					__( '%1$sWP Rocket:%2$s the plugin has been updated to the 3.17 version. New feature: %3$sAutomatic Lazy Rendering%4$s. Check out our documentation to learn more about it.', 'rocket' ),
-					'<strong>',
-					'</strong>',
-					'<a href="' . esc_url( $lazy_render_content['url'] ) . '" data-beacon-article="' . esc_attr( $lazy_render_content['id'] ) . '" target="_blank" rel="noopener noreferrer">',
-					'</a>'
+						// translators: %1$s: opening strong tag, %2$s: closing strong tag, %3$s: opening a tag, %4$s: closing a tag.
+						__( '%1$sWP Rocket:%2$s the plugin has been updated to the 3.19 version. New feature: %3$sPreconnect to external domains%4$s. Check out our documentation to learn more about it.', 'rocket' ),
+						'<strong>',
+						'</strong>',
+						'<a href="' . esc_url( $preconnect_content['url'] ) . '" data-beacon-article="' . esc_attr( $preconnect_content['id'] ) . '" target="_blank" rel="noopener noreferrer">',
+						'</a>'
 				),
 				'dismiss_button' => 'rocket_update_notice',
 			]

inc/Engine/Admin/Settings/Subscriber.php

@@ -70,7 +70,21 @@ public static function get_subscribed_events() {
 			'admin_notices'                        => 'display_update_notice',
 		];
 
-		return array_merge( $events, PluginFamily::get_subscribed_events() );
+		foreach ( PluginFamily::get_subscribed_events() as $hook => $callback ) {
+			if ( isset( $events[ $hook ] ) ) {
+				// Make sure it's an array of callbacks.
+				if ( ! is_array( $events[ $hook ][0] ) ) {
+					$events[ $hook ] = [ $events[ $hook ] ];
+				}
+
+				// Wrap single callback in array if needed.
+				$events[ $hook ][] = is_array( $callback ) ? $callback : [ $callback ];
+			} else {
+				$events[ $hook ] = is_array( $callback ) ? $callback : [ [ $callback ] ];
+			}
+		}
+
+		return $events;
 	}
 
 	/**

tests/Fixtures/inc/Engine/Admin/Settings/Page/displayUpdateNotice.php

@@ -48,7 +48,7 @@
 		],
 		'expected' => null,
 	],
-	'testShouldDoNothingWhenFirstInstall' => [
+	'testShouldShowNoticeWhenFirstInstall' => [
 		'config' => [
 			'capability' => true,
 			'screen'     => (object) [
@@ -61,7 +61,12 @@
 				'url' => 'http://example.org',
 			],
 		],
-		'expected' => null,
+		'expected' => [
+			'status'         => 'info',
+			'dismissible'    => '',
+			'message'        => '<strong>WP Rocket:</strong> the plugin has been updated to the 3.19 version. New feature: <a href="http://example.org" data-beacon-article="123" target="_blank" rel="noopener noreferrer">Preconnect to external domains</a>. Check out our documentation to learn more about it.',
+			'dismiss_button' => 'rocket_update_notice',
+		],
 	],
 	'testShouldDoNothingWhenVersionGT317' => [
 		'config' => [
@@ -70,7 +75,7 @@
 				'id' => 'settings_page_wprocket',
 			],
 			'boxes'            => [],
-			'previous_version' => '3.17.1',
+			'previous_version' => '3.19.1',
 			'beacon'           => null,
 		],
 		'expected' => null,
@@ -91,7 +96,7 @@
 		'expected' => [
 			'status'         => 'info',
 			'dismissible'    => '',
-			'message'        => '<strong>WP Rocket:</strong> the plugin has been updated to the 3.17 version. New feature: <a href="http://example.org" data-beacon-article="123" target="_blank" rel="noopener noreferrer">Automatic Lazy Rendering</a>. Check out our documentation to learn more about it.',
+			'message'        => '<strong>WP Rocket:</strong> the plugin has been updated to the 3.19 version. New feature: <a href="http://example.org" data-beacon-article="123" target="_blank" rel="noopener noreferrer">Preconnect to external domains</a>. Check out our documentation to learn more about it.',
 			'dismiss_button' => 'rocket_update_notice',
 		],
 	],