Replace set_up in data provider with initial_wp_pointers

Author: westonruter

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

@@ -131,10 +131,8 @@ function perflab_get_admin_pointers(): array {
  *                                 ensure that `$hook_suffix` is a string when it calls `do_action( 'admin_enqueue_scripts', $hook_suffix )`.
  */
 function perflab_admin_pointer( ?string $hook_suffix = '' ): void {
-	$is_performance_screen = (
-		'options-general.php' === $hook_suffix &&
-		( isset( $_GET['page'] ) && PERFLAB_SCREEN === $_GET['page'] ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-	);
+	// See get_plugin_page_hookname().
+	$is_performance_screen = 'settings_page_' . PERFLAB_SCREEN === $hook_suffix;
 
 	// Do not show admin pointer in multisite Network admin, User admin UI, dashboard, or plugins list table. However,
 	// do proceed on the Performance screen so that all pointers can be auto-dismissed.

plugins/performance-lab/tests/includes/admin/test-load.php

@@ -118,74 +118,68 @@ public function test_perflab_get_admin_pointers(): void {
 	}
 
 	/**
-	 * @return array<string, array{ hook_suffix: string|null, expected: bool }>
+	 * @return array<string, array{
+	 *     initial_wp_pointers: string,
+	 *     hook_suffix: string|null,
+	 *     expected: bool,
+	 *     dismissed_wp_pointers: string,
+	 * }>
 	 */
 	public function data_provider_test_perflab_admin_pointer(): array {
 		return array(
 			'null'                       => array(
-				'set_up'                => null,
+				'initial_wp_pointers'   => '',
 				'hook_suffix'           => null,
 				'expected'              => false,
 				'dismissed_wp_pointers' => '',
 			),
 			'edit.php'                   => array(
-				'set_up'                => null,
+				'initial_wp_pointers'   => '',
 				'hook_suffix'           => 'edit.php',
 				'expected'              => false,
 				'dismissed_wp_pointers' => '',
 			),
 			'dashboard_not_dismissed'    => array(
-				'set_up'                => null,
+				'initial_wp_pointers'   => '',
 				'hook_suffix'           => 'index.php',
 				'expected'              => true,
 				'dismissed_wp_pointers' => 'perflab-feature-view-transitions',
 			),
 			'plugins_not_dismissed'      => array(
-				'set_up'                => null,
+				'initial_wp_pointers'   => '',
 				'hook_suffix'           => 'plugins.php',
 				'expected'              => true,
 				'dismissed_wp_pointers' => 'perflab-feature-view-transitions',
 			),
 			'dashboard_new_dismissed'    => array(
-				'set_up'                => static function (): void {
-					// Note: If the No-cache BFCache plugin (not part of the monorepo) is installed, then this test will likely fail and it should be skipped.
-					update_user_meta( wp_get_current_user()->ID, 'dismissed_wp_pointers', 'perflab-admin-pointer' );
-				},
+				// Note: If the No-cache BFCache plugin (not part of the monorepo) is installed, then this test will likely fail and it should be skipped.
+				'initial_wp_pointers'   => 'perflab-admin-pointer',
 				'hook_suffix'           => 'index.php',
 				'expected'              => true,
 				'dismissed_wp_pointers' => 'perflab-admin-pointer,perflab-feature-view-transitions',
 			),
 			'dashboard_one_dismissed'    => array(
-				'set_up'                => static function (): void {
-					// Note: The No-cache BFCache plugin is not part of the monorepo, so it is not automatically installed in the dev environment.
-					update_user_meta( wp_get_current_user()->ID, 'dismissed_wp_pointers', 'perflab-admin-pointer,perflab-feature-nocache-bfcache' );
-				},
+				// Note: The No-cache BFCache plugin is not part of the monorepo, so it is not automatically installed in the dev environment.
+				'initial_wp_pointers'   => 'perflab-admin-pointer,perflab-feature-nocache-bfcache',
 				'hook_suffix'           => 'index.php',
 				'expected'              => false,
 				'dismissed_wp_pointers' => 'perflab-admin-pointer,perflab-feature-nocache-bfcache,perflab-feature-view-transitions',
 			),
 			'dashboard_all_dismissed'    => array(
-				'set_up'                => static function (): void {
-					update_user_meta( wp_get_current_user()->ID, 'dismissed_wp_pointers', implode( ',', array_keys( perflab_get_admin_pointers() ) ) );
-				},
+				'initial_wp_pointers'   => implode( ',', array_keys( perflab_get_admin_pointers() ) ),
 				'hook_suffix'           => 'index.php',
 				'expected'              => false,
 				'dismissed_wp_pointers' => implode( ',', array_keys( perflab_get_admin_pointers() ) ),
 			),
 			'perflab_screen_first_time'  => array(
-				'set_up'                => static function (): void {
-					$_GET['page'] = PERFLAB_SCREEN;
-				},
-				'hook_suffix'           => 'options-general.php',
+				'initial_wp_pointers'   => '',
+				'hook_suffix'           => 'settings_page_' . PERFLAB_SCREEN,
 				'expected'              => false,
 				'dismissed_wp_pointers' => implode( ',', array_keys( perflab_get_admin_pointers() ) ),
 			),
 			'perflab_screen_second_time' => array(
-				'set_up'                => static function (): void {
-					$_GET['page'] = PERFLAB_SCREEN;
-					update_user_meta( wp_get_current_user()->ID, 'dismissed_wp_pointers', 'perflab-admin-pointer' );
-				},
-				'hook_suffix'           => 'options-general.php',
+				'initial_wp_pointers'   => 'perflab-admin-pointer',
+				'hook_suffix'           => 'settings_page_' . PERFLAB_SCREEN,
 				'expected'              => false,
 				'dismissed_wp_pointers' => implode( ',', array_keys( perflab_get_admin_pointers() ) ),
 			),
@@ -196,17 +190,15 @@ public function data_provider_test_perflab_admin_pointer(): array {
 	 * @covers ::perflab_admin_pointer
 	 * @dataProvider data_provider_test_perflab_admin_pointer
 	 *
-	 * @param Closure|null $set_up      Set up.
-	 * @param string|null  $hook_suffix Hook suffix.
-	 * @param bool         $expected    Expected.
-	 * @param string       $dismissed_wp_pointers Dismissed admin pointers.
+	 * @param string      $initial_wp_pointers   Set up.
+	 * @param string|null $hook_suffix           Hook suffix.
+	 * @param bool        $expected              Expected.
+	 * @param string      $dismissed_wp_pointers Dismissed admin pointers.
 	 */
-	public function test_perflab_admin_pointer( ?Closure $set_up, ?string $hook_suffix, bool $expected, string $dismissed_wp_pointers ): void {
+	public function test_perflab_admin_pointer( string $initial_wp_pointers, ?string $hook_suffix, bool $expected, string $dismissed_wp_pointers ): void {
 		$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 		wp_set_current_user( $user_id );
-		if ( $set_up instanceof Closure ) {
-			$set_up();
-		}
+		update_user_meta( wp_get_current_user()->ID, 'dismissed_wp_pointers', $initial_wp_pointers );
 		$this->assertFalse( is_network_admin() || is_user_admin() );
 		perflab_admin_pointer( $hook_suffix );
 

plugins/speculation-rules/load.php

@@ -5,7 +5,7 @@
  * Description: Enables browsers to speculatively prerender or prefetch pages to achieve near-instant loads based on user interaction.
  * Requires at least: 6.6
  * Requires PHP: 7.2
- * Version: 1.5.0
+ * Version: 1.6.0
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -65,7 +65,7 @@ static function ( string $global_var_name, string $version, Closure $load ): voi
 	}
 )(
 	'plsr_pending_plugin_info',
-	'1.5.0',
+	'1.6.0',
 	static function ( string $version ): void {
 
 		// Define the constant.

plugins/speculation-rules/readme.txt

@@ -2,7 +2,7 @@
 
 Contributors: wordpressdotorg
 Tested up to: 6.8
-Stable tag:   1.5.0
+Stable tag:   1.6.0
 License:      GPLv2 or later
 License URI:  https://www.gnu.org/licenses/gpl-2.0.html
 Tags:         performance, javascript, speculation rules, prerender, prefetch
@@ -122,6 +122,8 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
+= 1.6.0 =
+
 = 1.5.0 =
 
 **Enhancements**