From 6dcb192c06ee551ca635069896236c6e3d1462ea Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:14:46 -0700
Subject: [PATCH 1/9] Use wp_json_encode() instead of esc_js()

---
 admin/load.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/load.php b/admin/load.php
index 3b89a6db8d..bf2d1d826f 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -132,7 +132,7 @@ function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args =
 		jQuery( function() {
 			// Pointer Options.
 			var options = {
-				content: '<h3><?php echo esc_js( $args['heading'] ); ?></h3><p><?php echo wp_kses( $args['content'], $wp_kses_options ); ?></p>',
+				content: <?php echo wp_json_encode( '<h3>' . esc_html( $args['heading'] ) . '</h3><p>' . wp_kses( $args['content'], $wp_kses_options ) . '</p>' ); ?>,
 				position: {
 					edge:  'left',
 					align: 'right',
@@ -143,7 +143,7 @@ function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args =
 					jQuery.post(
 						window.ajaxurl,
 						{
-							pointer: '<?php echo esc_js( $pointer_id ); ?>',
+							pointer: <?php echo wp_json_encode( $pointer_id ); ?>,
 							action:  'dismiss-wp-pointer',
 							_wpnonce: <?php echo wp_json_encode( wp_create_nonce( 'dismiss_pointer' ) ); ?>,
 						}

From 5e6284b99bbc6473a036e5f27b844323fd3bb5f9 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:29:57 -0700
Subject: [PATCH 2/9] Use const instead of var in PerfLab JS

---
 admin/js/perflab-plugin-management.js | 14 +++++++-------
 admin/load.php                        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/js/perflab-plugin-management.js b/admin/js/perflab-plugin-management.js
index 45200150e8..677d5584fb 100644
--- a/admin/js/perflab-plugin-management.js
+++ b/admin/js/perflab-plugin-management.js
@@ -9,15 +9,15 @@
 			typeof settings.data === 'string' &&
 			settings.data.includes( 'action=install-plugin' )
 		) {
-			var params = new URLSearchParams( settings.data );
-			var slug = params.get( 'slug' );
+			const params = new URLSearchParams( settings.data );
+			const slug = params.get( 'slug' );
 
 			// Check if 'slug' was found and output the value.
 			if ( ! slug ) {
 				return;
 			}
 
-			var target_element = $(
+			const target_element = $(
 				'.wpp-standalone-plugins a[data-slug="' + slug + '"]'
 			);
 			if ( ! target_element ) {
@@ -30,15 +30,15 @@
 			 * the core changes have taken place.
 			 */
 			setTimeout( function () {
-				var plugin_url = target_element.attr( 'href' );
+				const plugin_url = target_element.attr( 'href' );
 				if ( ! plugin_url ) {
 					return;
 				}
-				var nonce = target_element.attr(
+				const nonce = target_element.attr(
 					'data-plugin-activation-nonce'
 				);
-				var plugin_slug = target_element.attr( 'data-slug' );
-				var url = new URL( plugin_url );
+				const plugin_slug = target_element.attr( 'data-slug' );
+				const url = new URL( plugin_url );
 				url.searchParams.set( 'action', 'perflab_activate_plugin' );
 				url.searchParams.set( '_wpnonce', nonce );
 				url.searchParams.set( 'plugin', plugin_slug );
diff --git a/admin/load.php b/admin/load.php
index bf2d1d826f..8d739d3a72 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -131,7 +131,7 @@ function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args =
 	<script id="<?php echo esc_attr( $pointer_id ); ?>" type="text/javascript">
 		jQuery( function() {
 			// Pointer Options.
-			var options = {
+			const options = {
 				content: <?php echo wp_json_encode( '<h3>' . esc_html( $args['heading'] ) . '</h3><p>' . wp_kses( $args['content'], $wp_kses_options ) . '</p>' ); ?>,
 				position: {
 					edge:  'left',

From ac0ecdadb3046d8393ee5423a8bee4d7f0467b9b Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:31:37 -0700
Subject: [PATCH 3/9] Add PERFLAB_OBJECT_CACHE_DROPIN_VERSION to
 dynamicConstantNames

---
 phpstan.neon.dist | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 13084b48f0..d76ac4f8ed 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -11,3 +11,5 @@ parameters:
 		- uninstall.php
 	scanDirectories:
 		- vendor/wp-phpunit/wp-phpunit/
+	dynamicConstantNames:
+		- PERFLAB_OBJECT_CACHE_DROPIN_VERSION

From d5bbf170923b6d2a48d4fc51f8d042af6abccce6 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:39:44 -0700
Subject: [PATCH 4/9] Add PHP7 typing

---
 admin/load.php | 6 +++---
 load.php       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/load.php b/admin/load.php
index 8d739d3a72..31fa9efa0d 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -73,7 +73,7 @@ function perflab_render_settings_page() {
  *
  * @param string $hook_suffix The current admin page.
  */
-function perflab_admin_pointer( $hook_suffix ) {
+function perflab_admin_pointer( string $hook_suffix ) {
 	if ( ! in_array( $hook_suffix, array( 'index.php', 'plugins.php' ), true ) ) {
 		return;
 	}
@@ -109,7 +109,7 @@ function perflab_admin_pointer( $hook_suffix ) {
  * @param array  $args       Optional. Pointer arguments. Supports 'heading' and 'content' entries.
  *                           Defaults are the heading and content for the 'perflab-admin-pointer'.
  */
-function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args = array() ) {
+function perflab_render_pointer( string $pointer_id = 'perflab-admin-pointer', array $args = array() ) {
 	if ( ! isset( $args['heading'] ) ) {
 		$args['heading'] = __( 'Performance Lab', 'performance-lab' );
 	}
@@ -169,7 +169,7 @@ function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args =
  * @param array $links List of plugin action links HTML.
  * @return array Modified list of plugin action links HTML.
  */
-function perflab_plugin_action_links_add_settings( $links ) {
+function perflab_plugin_action_links_add_settings( array $links ): array {
 	// Add link as the first plugin action link.
 	$settings_link = sprintf(
 		'<a href="%s">%s</a>',
diff --git a/load.php b/load.php
index 45d7cab1ab..22ca78a9fb 100644
--- a/load.php
+++ b/load.php
@@ -48,7 +48,7 @@
  * @since 2.9.0 The generator tag now includes the active standalone plugin slugs.
  * @since n.e.x.t The generator tag no longer includes module slugs.
  */
-function perflab_get_generator_content() {
+function perflab_get_generator_content(): string {
 	$active_plugins = array();
 	foreach ( perflab_get_standalone_plugin_version_constants() as $plugin_slug => $constant_name ) {
 		if ( defined( $constant_name ) && ! str_starts_with( constant( $constant_name ), 'Performance Lab ' ) ) {
@@ -85,7 +85,7 @@ function perflab_render_generator() {
  *
  * @return array<string, string> Map of plugin slug / module path and the version constant used.
  */
-function perflab_get_standalone_plugin_version_constants() {
+function perflab_get_standalone_plugin_version_constants(): array {
 	/*
 	 * This list includes all standalone plugins that are part of the Performance Lab project,
 	 * as `$plugin_slug => $version_constant` pairs.

From da107e56ea06c940bc4c4de5d80b024d6463da9a Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:40:34 -0700
Subject: [PATCH 5/9] Fix LanguageTool gripes

---
 load.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/load.php b/load.php
index 22ca78a9fb..8f343bbeb8 100644
--- a/load.php
+++ b/load.php
@@ -176,7 +176,7 @@ function perflab_maybe_set_object_cache_dropin() {
 		 * Previous versions of the Performance Lab plugin were renaming the
 		 * original object-cache.php file and then loading both. However, due
 		 * to other plugins eagerly checking file headers, this caused too many
-		 * problems across sites so it was decided to remove this layer.
+		 * problems across sites, so it was decided to remove this layer.
 		 * Only placing the drop-in file if no other one exists yet is the
 		 * safest solution.
 		 */
@@ -248,7 +248,7 @@ function perflab_maybe_remove_object_cache_dropin() {
 		 * override the Performance Lab file. This is only relevant for
 		 * backward-compatibility with previous Performance Lab versions
 		 * which were backing up the file and then loading both.
-		 * Otherwise just delete the Performance Lab file.
+		 * Otherwise, just delete the Performance Lab file.
 		 */
 		if ( $wp_filesystem->exists( $dropin_backup_path ) ) {
 			$wp_filesystem->move( $dropin_backup_path, $dropin_path, true );

From f399739197460b8fabb24b03465a438d714b8227 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 09:47:36 -0700
Subject: [PATCH 6/9] Eliminate use of void return value

---
 admin/load.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/admin/load.php b/admin/load.php
index 31fa9efa0d..23e397fa04 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -305,17 +305,13 @@ function perflab_deactivate_plugin() {
 	}
 
 	// Deactivate the plugin in question and return to prior screen.
-	$do_plugin_deactivation = deactivate_plugins( $plugin );
-	$referer                = wp_get_referer();
-	if ( ! is_wp_error( $do_plugin_deactivation ) ) {
-		$referer = add_query_arg(
-			array(
-				'deactivate' => true,
-			),
-			$referer
-		);
-	}
-
+	deactivate_plugins( $plugin );
+	$referer = add_query_arg(
+		array(
+			'deactivate' => true,
+		),
+		wp_get_referer()
+	);
 	if ( wp_safe_redirect( $referer ) ) {
 		exit;
 	}

From c9e7e8ac14554f46870558522ea0f2b6e1e36e5f Mon Sep 17 00:00:00 2001
From: Felix Arntz <felixarntz@google.com>
Date: Thu, 21 Mar 2024 10:16:30 -0700
Subject: [PATCH 7/9] Enhance readme CLI command to support standalone plugins.

---
 bin/plugin/commands/readme.js | 52 +++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/bin/plugin/commands/readme.js b/bin/plugin/commands/readme.js
index 12f44b0df9..de0350d69c 100644
--- a/bin/plugin/commands/readme.js
+++ b/bin/plugin/commands/readme.js
@@ -15,6 +15,7 @@ const { getChangelog } = require( './changelog' );
  * @typedef WPReadmeCommandOptions
  *
  * @property {string=} milestone Optional milestone title, to update the changelog in the readme.
+ * @property {string=} path      Optional path to the readme.txt file to update. If omitted, it will be detected via --milestone.
  * @property {string=} token     Optional personal GitHub access token, only relevant for changelog updates.
  */
 
@@ -24,6 +25,7 @@ const { getChangelog } = require( './changelog' );
  * @property {string}  owner     GitHub repository owner.
  * @property {string}  repo      GitHub repository name.
  * @property {string=} milestone Optional milestone title, to update the changelog in the readme.
+ * @property {string=} path      Optional path to the readme.txt file to update.
  * @property {string=} token     Optional personal GitHub access token, only relevant for changelog updates.
  */
 
@@ -32,6 +34,11 @@ exports.options = [
 		argname: '-m, --milestone <milestone>',
 		description: 'Milestone title, to update the changelog',
 	},
+	{
+		argname: '-p, --path <path>',
+		description:
+			'Path to the readme.txt file to update; if omitted, it will be detected via --milestone',
+	},
 	{
 		argname: '-t, --token <token>',
 		description: 'GitHub token',
@@ -48,10 +55,33 @@ exports.handler = async ( opt ) => {
 		owner: config.githubRepositoryOwner,
 		repo: config.githubRepositoryName,
 		milestone: opt.milestone,
+		path: opt.path,
 		token: opt.token,
 	} );
 };
 
+/**
+ * Detects the path to the readme.txt file to update based on the milestone title.
+ *
+ * @param {string} milestone Milestone title.
+ *
+ * @return {string} Detected readme.txt path.
+ */
+function detectReadmePath( milestone ) {
+	const slug = milestone.match( /^([a-z0-9-]+) / );
+	if ( ! slug ) {
+		throw new Error(
+			`The ${ milestone } milestone does not start with a valid plugin slug.`
+		);
+	}
+
+	if ( 'performance-lab' === slug[ 1 ] ) {
+		return 'readme.txt';
+	}
+
+	return `plugins/${ slug[ 1 ] }/readme.txt`;
+}
+
 /**
  * Updates the `readme.txt` file with the given changelog.
  *
@@ -59,9 +89,19 @@ exports.handler = async ( opt ) => {
  * @param {WPReadmeSettings} settings  Readme settings.
  */
 function updateReadmeChangelog( changelog, settings ) {
-	const regex = new RegExp( `= ${ settings.milestone } =[^=]+` );
+	// Detect the version number to replace it in readme changelog, if already present.
+	const version = settings.milestone.match(
+		/\d+\.\d+(\.\d+)?(-[A-Za-z0-9.]+)?$/
+	);
+	if ( ! version ) {
+		throw new Error(
+			`The ${ settings.milestone } milestone does not end with a version number.`
+		);
+	}
 
-	const readmeFile = path.join( '.', 'readme.txt' );
+	const regex = new RegExp( `= ${ version[ 0 ] } =[^=]+` );
+
+	const readmeFile = path.join( '.', settings.path );
 	const fileContent = fs.readFileSync( readmeFile, 'utf8' );
 
 	let newContent;
@@ -95,6 +135,10 @@ async function updateReadme( settings ) {
 		);
 
 		try {
+			if ( ! settings.path ) {
+				settings.path = detectReadmePath( settings.milestone );
+			}
+
 			const changelog = await getChangelog( {
 				owner: settings.owner,
 				repo: settings.repo,
@@ -108,6 +152,8 @@ async function updateReadme( settings ) {
 				return;
 			}
 		}
-		log( formats.success( `\n💃readme.txt successfully updated\n\n` ) );
+		log(
+			formats.success( `\n💃${ settings.path } successfully updated\n\n` )
+		);
 	}
 }

From 2269c6017335c995800d28c0a8948e5c921e8559 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 21 Mar 2024 11:17:55 -0700
Subject: [PATCH 8/9] Revert "Add PHP7 typing"

This reverts commit d5bbf170923b6d2a48d4fc51f8d042af6abccce6.
---
 admin/load.php | 6 +++---
 load.php       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/load.php b/admin/load.php
index 23e397fa04..0684adea70 100644
--- a/admin/load.php
+++ b/admin/load.php
@@ -73,7 +73,7 @@ function perflab_render_settings_page() {
  *
  * @param string $hook_suffix The current admin page.
  */
-function perflab_admin_pointer( string $hook_suffix ) {
+function perflab_admin_pointer( $hook_suffix ) {
 	if ( ! in_array( $hook_suffix, array( 'index.php', 'plugins.php' ), true ) ) {
 		return;
 	}
@@ -109,7 +109,7 @@ function perflab_admin_pointer( string $hook_suffix ) {
  * @param array  $args       Optional. Pointer arguments. Supports 'heading' and 'content' entries.
  *                           Defaults are the heading and content for the 'perflab-admin-pointer'.
  */
-function perflab_render_pointer( string $pointer_id = 'perflab-admin-pointer', array $args = array() ) {
+function perflab_render_pointer( $pointer_id = 'perflab-admin-pointer', $args = array() ) {
 	if ( ! isset( $args['heading'] ) ) {
 		$args['heading'] = __( 'Performance Lab', 'performance-lab' );
 	}
@@ -169,7 +169,7 @@ function perflab_render_pointer( string $pointer_id = 'perflab-admin-pointer', a
  * @param array $links List of plugin action links HTML.
  * @return array Modified list of plugin action links HTML.
  */
-function perflab_plugin_action_links_add_settings( array $links ): array {
+function perflab_plugin_action_links_add_settings( $links ) {
 	// Add link as the first plugin action link.
 	$settings_link = sprintf(
 		'<a href="%s">%s</a>',
diff --git a/load.php b/load.php
index 8f343bbeb8..1f5254ff4f 100644
--- a/load.php
+++ b/load.php
@@ -48,7 +48,7 @@
  * @since 2.9.0 The generator tag now includes the active standalone plugin slugs.
  * @since n.e.x.t The generator tag no longer includes module slugs.
  */
-function perflab_get_generator_content(): string {
+function perflab_get_generator_content() {
 	$active_plugins = array();
 	foreach ( perflab_get_standalone_plugin_version_constants() as $plugin_slug => $constant_name ) {
 		if ( defined( $constant_name ) && ! str_starts_with( constant( $constant_name ), 'Performance Lab ' ) ) {
@@ -85,7 +85,7 @@ function perflab_render_generator() {
  *
  * @return array<string, string> Map of plugin slug / module path and the version constant used.
  */
-function perflab_get_standalone_plugin_version_constants(): array {
+function perflab_get_standalone_plugin_version_constants() {
 	/*
 	 * This list includes all standalone plugins that are part of the Performance Lab project,
 	 * as `$plugin_slug => $version_constant` pairs.

From fcd1af2288118b9c4211b2b7602d6ee48251348d Mon Sep 17 00:00:00 2001
From: Felix Arntz <felixarntz@google.com>
Date: Thu, 21 Mar 2024 12:07:07 -0700
Subject: [PATCH 9/9] Check whether plugin slug points to an actual plugin
 folder.

---
 bin/plugin/commands/readme.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/plugin/commands/readme.js b/bin/plugin/commands/readme.js
index de0350d69c..8b4cd0d3fb 100644
--- a/bin/plugin/commands/readme.js
+++ b/bin/plugin/commands/readme.js
@@ -79,6 +79,10 @@ function detectReadmePath( milestone ) {
 		return 'readme.txt';
 	}
 
+	if ( ! fs.existsSync( path.join( '.', `plugins/${ slug[ 1 ] }` ) ) ) {
+		throw new Error( `Unknown plugin with slug '${ slug[ 1 ] }'` );
+	}
+
 	return `plugins/${ slug[ 1 ] }/readme.txt`;
 }