Merge pull request #1009 from WordPress/merge/trunk-into-modules-to-p…

…lugins

Merge `trunk` into `feature/modules-to-plugins` with merge conflicts resolved

.gitattributes

@@ -26,7 +26,6 @@
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 
-/CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore
 /SECURITY.md export-ignore
 /README.md export-ignore

.github/workflows/php-test.yml

@@ -36,6 +36,7 @@ on:
       - opened
       - reopened
       - synchronize
+  workflow_dispatch:
 
 jobs:
   php-test:

.gitignore

@@ -42,6 +42,13 @@ vendor/
 *.DS_store
 .DS_store?
 
+############
+## Config overrides for CS tools
+############
+phpcs.xml
+phpunit.xml
+phpstan.neon
+
 ############
 ## Misc
 ############

CONTRIBUTING.md

@@ -12,7 +12,7 @@ In general, all code must follow the [WordPress Coding Standards and best practi
 
 ## Guidelines
 
-- As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](/CODE_OF_CONDUCT.md).
+- As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://make.wordpress.org/handbook/community-code-of-conduct/).
 
 - All WordPress projects are [licensed under the GPLv2+](/LICENSE), and all contributions to Gutenberg will be released under the GPLv2+ license. You maintain copyright over any contribution you make, and by submitting a pull request, you are agreeing to release that contribution under the GPLv2+ license.
 

composer.json

@@ -22,10 +22,10 @@
   "scripts": {
     "post-install-cmd": "if php -r 'exit( version_compare( phpversion(), \"8.1\", \">=\" ) ? 0 : 1 );'; then composer --working-dir=build-cs install --no-interaction; else echo 'Skipping composer install for build-cs since not on PHP 8.1+. You are running: '; php -v;  fi",
     "post-update-cmd": "if php -r 'exit( version_compare( phpversion(), \"8.1\", \">=\" ) ? 0 : 1 );'; then composer --working-dir=build-cs update --no-interaction; else echo 'Skipping composer update for build-cs since not on PHP 8.1+. You are running: '; php -v; fi",
-    "phpstan": "build-cs/vendor/bin/phpstan analyse --memory-limit=2048M -c phpstan.neon.dist",
-    "format": "build-cs/vendor/bin/phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
-    "lint": "build-cs/vendor/bin/phpcs --standard=phpcs.xml.dist",
-    "test": "phpunit -c phpunit.xml.dist --verbose --testsuite performance-lab",
+    "phpstan": "build-cs/vendor/bin/phpstan analyse --memory-limit=2048M",
+    "format": "build-cs/vendor/bin/phpcbf --report-summary --report-source",
+    "lint": "build-cs/vendor/bin/phpcs",
+    "test": "phpunit --verbose --testsuite performance-lab",
     "test-multisite": "phpunit -c tests/multisite.xml --verbose --testsuite performance-lab"
   },
   "config": {

load.php

@@ -5,7 +5,7 @@
  * Description: Performance plugin from the WordPress Performance Team, which is a collection of standalone performance modules.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 2.8.0
+ * Version: 2.9.0
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -19,7 +19,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'PERFLAB_VERSION', '2.8.0' );
+define( 'PERFLAB_VERSION', '2.9.0' );
 define( 'PERFLAB_MAIN_FILE', __FILE__ );
 define( 'PERFLAB_PLUGIN_DIR_PATH', plugin_dir_path( PERFLAB_MAIN_FILE ) );
 define( 'PERFLAB_MODULES_SETTING', 'perflab_modules_settings' );
@@ -207,7 +207,7 @@ function perflab_is_valid_module( $module ) {
  * This attribute is then used in {@see perflab_render_generator()}.
  *
  * @since 1.1.0
- * @since n.e.x.t The generator tag now includes the active standalone plugin slugs.
+ * @since 2.9.0 The generator tag now includes the active standalone plugin slugs.
  */
 function perflab_get_generator_content() {
 	$active_and_valid_modules = array_filter( perflab_get_active_modules(), 'perflab_is_valid_module' );
@@ -312,7 +312,7 @@ function perflab_get_standalone_plugins_constants() {
 /**
  * Gets the standalone plugin constants used for each available standalone plugin, or module with a standalone plugin.
  *
- * @since n.e.x.t
+ * @since 2.9.0
  *
  * @param string $source Optional. Either 'plugins' or 'modules'. Default 'plugins'.
  * @return array<string, string> Map of plugin slug / module path and the version constant used.

readme.txt

@@ -4,7 +4,7 @@ Contributors:      wordpressdotorg
 Requires at least: 6.3
 Tested up to:      6.4
 Requires PHP:      7.0
-Stable tag:        2.8.0
+Stable tag:        2.9.0
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, images, javascript, site health, measurement, object caching
@@ -79,6 +79,20 @@ By default, the WebP Uploads module will only generate WebP versions of the imag
 
 == Changelog ==
 
+= 2.9.0 =
+
+**Features**
+
+* Infrastructure: Add standalone plugin version constants for auto-sizes and speculation-rules. ([958](https://github.com/WordPress/performance/pull/958))
+
+**Enhancements**
+
+* Infrastructure: Include standalone plugin slugs in generator tag. ([949](https://github.com/WordPress/performance/pull/949))
+
+**Bug Fixes**
+
+* Infrastructure: Sanitize metric name for `Server-Timing` header. ([957](https://github.com/WordPress/performance/pull/957))
+
 = 2.8.0 =
 
 **Features**