Merge pull request #970 from WordPress/trunk

Merge trunk into auto-sizes

.eslintrc.js

@@ -9,6 +9,10 @@ const config = {
 		...( wpConfig?.rules || {} ),
 		'jsdoc/valid-types': 'off',
 	},
+	env: {
+		browser: true,
+	},
+	ignorePatterns: [ '/vendor', '/node_modules' ],
 };
 
 module.exports = config;

.github/workflows/php-test-standalone-plugins.yml

@@ -42,16 +42,38 @@ jobs:
     name: PHP Integration Tests for Standalone Plugins
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0' ]
+        wp: [ 'latest' ]
+        include:
+        - php: '7.4'
+          wp: '6.3'
+        - php: '8.3'
+          wp: 'trunk'
+    env:
+      WP_ENV_PHP_VERSION: ${{ matrix.php }}
+      WP_ENV_CORE: ${{ matrix.wp == 'trunk' && 'WordPress/WordPress' || format( 'https://wordpress.org/wordpress-{0}.zip', matrix.wp ) }}
     steps:
       - uses: styfle/[email protected]
       - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
       - name: Setup Node.js (.nvmrc)
         uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: npm
       - name: npm install
         run: npm ci
+      - name: General debug information
+        run: |
+          npm --version
+          node --version
+          composer --version
+          php -v
       - name: Building standalone plugins
         run: npm run build-plugins
       - name: Running single site standalone plugin integration tests

.github/workflows/php-test.yml

@@ -39,9 +39,22 @@ on:
 
 jobs:
   php-test:
-    name: PHP
+    name: "PHP ${{ matrix.php }} / WP ${{ matrix.wp }}"
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0']
+        wp: [ 'latest' ]
+        include:
+          - php: '7.4'
+            wp: '6.3'
+          - php: '8.3'
+            wp: 'trunk'
+    env:
+      WP_ENV_PHP_VERSION: ${{ matrix.php }}
+      WP_ENV_CORE: ${{ matrix.wp == 'trunk' && 'WordPress/WordPress' || format( 'https://wordpress.org/wordpress-{0}.zip', matrix.wp ) }}
     steps:
       - uses: styfle/[email protected]
       - uses: actions/checkout@v3
@@ -54,6 +67,11 @@ jobs:
         run: npm ci
       - name: Install WordPress
         run: npm run wp-env start
+        # Note that `composer update` is required instead of `composer install`
+        # for the sake of PHP versions older than 8.1, which is the version of
+        # PHP that the composer.lock was created for.
+      - name: Composer update
+        run: npm run wp-env run tests-cli -- --env-cwd="wp-content/plugins/$(basename $(pwd))" composer update --no-interaction
       - name: Running single site unit tests
         run: npm run test-php
       - name: Running multisite unit tests

.github/workflows/props-bot.yml

@@ -0,0 +1,88 @@
+name: Props Bot
+
+on:
+  # This event runs anytime a PR is (re)opened, updated, marked ready for review, or labeled.
+  # GitHub does not allow filtering the `labeled` event by a specific label.
+  # However, the logic below will short-circuit the workflow when the `props-bot` label is not the one being added.
+  # Note: The pull_request_target event is used instead of pull_request because this workflow needs permission to comment
+  # on the pull request. Because this event grants extra permissions to `GITHUB_TOKEN`, any code changes within the PR
+  # should be considered untrusted. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/.
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - ready_for_review
+  # This event runs anytime a comment is added or deleted.
+  # You cannot filter this event for PR comments only.
+  # However, the logic below does short-circuit the workflow for issues.
+  issue_comment:
+    type:
+      - created
+  # This event will run everytime a new PR review is initially submitted.
+  pull_request_review:
+    types:
+      - submitted
+  # This event runs anytime a PR review comment is created or deleted.
+  pull_request_review_comment:
+    types:
+      - created
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for pull requests
+  # or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ contains( fromJSON( '["pull_request_target", "pull_request_review", "pull_request_review_comment"]' ), github.event_name ) && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+  # Compiles a list of props for a pull request.
+  #
+  # Performs the following steps:
+  # - Collects a list of contributor props and leaves a comment.
+  # - Removes the props-bot label, if necessary.
+  props-bot:
+    name: Generate a list of props
+    runs-on: ubuntu-latest
+    permissions:
+      # The action needs permission `write` permission for PRs in order to add a comment.
+      pull-requests: write
+      contents: read
+    timeout-minutes: 20
+    # The job will run when pull requests are open, ready for review and:
+    #
+    # - A comment is added to the pull request.
+    # - A review is created or commented on.
+    # - The pull request is opened, synchronized, marked ready for review, or reopened.
+    # - The `props-bot` label is added to the pull request.
+    if: |
+      (
+        github.event_name == 'issue_comment' && github.event.issue.pull_request ||
+        contains( fromJSON( '["pull_request_review", "pull_request_review_comment"]' ), github.event_name ) ||
+        github.event_name == 'pull_request_target' && github.event.action != 'labeled' ||
+        'props-bot' == github.event.label.name
+      ) &&
+      ( ! github.event.pull_request.draft && github.event.pull_request.state == 'open' || ! github.event.issue.draft && github.event.issue.state == 'open' )
+
+    steps:
+      - name: Gather a list of contributors
+        uses: WordPress/props-bot-action@trunk
+
+      - name: Remove the props-bot label
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        if: ${{ github.event.action == 'labeled' && 'props-bot' == github.event.label.name }}
+        with:
+          retries: 2
+          retry-exempt-status-codes: 418
+          script: |
+            github.rest.issues.removeLabel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: '${{ github.event.number }}',
+              name: 'props-bot'
+            });

.gitignore

@@ -23,6 +23,8 @@ nbproject/
 
 build
 .wp-env.override.json
+build-cs/vendor/
+build-cs/composer.lock
 
 ############
 ## Vendor

.wp-env.json

@@ -5,8 +5,7 @@
     "tests": {
       "config": {
         "FS_METHOD": "direct"
-      },
-      "phpVersion": "7.4"
+      }
     }
   }
 }

admin/js/perflab-module-migration-notice.js

@@ -1,3 +1,6 @@
+/* eslint camelcase: "off", no-alert: "off" */
+/* global perflab_module_migration_notice:false */
+
 ( function ( document ) {
 	document.addEventListener( 'DOMContentLoaded', function () {
 		document.addEventListener( 'click', function ( event ) {
@@ -26,7 +29,10 @@
 					.then( function ( response ) {
 						if ( ! response.ok ) {
 							throw new Error(
-								wp.i18n.__( 'Network response was not ok.', 'performance-lab' )
+								wp.i18n.__(
+									'Network response was not ok.',
+									'performance-lab'
+								)
 							);
 						}
 						return response.json();

admin/js/perflab-plugin-management.js

@@ -1,16 +1,25 @@
+/* eslint no-var: "off", camelcase: "off" */
+/* global jQuery:false */
+
 ( function ( $, document ) {
-	$( document ).ajaxComplete( function( event, xhr, settings ) {
+	$( document ).ajaxComplete( function ( event, xhr, settings ) {
 		// Check if this is the 'install-plugin' request.
-		if ( settings.data && typeof settings.data === 'string' && settings.data.includes( 'action=install-plugin' ) ) {
+		if (
+			settings.data &&
+			typeof settings.data === 'string' &&
+			settings.data.includes( 'action=install-plugin' )
+		) {
 			var params = new URLSearchParams( settings.data );
-			var slug = params.get('slug');
+			var slug = params.get( 'slug' );
 
 			// Check if 'slug' was found and output the value.
 			if ( ! slug ) {
 				return;
 			}
 
-			var target_element = $( '.wpp-standalone-plugins a[data-slug="' + slug + '"]' );
+			var target_element = $(
+				'.wpp-standalone-plugins a[data-slug="' + slug + '"]'
+			);
 			if ( ! target_element ) {
 				return;
 			}
@@ -20,12 +29,14 @@
 			 * so we set a 1.5 timeout here to ensure our changes get updated after
 			 * the core changes have taken place.
 			 */
-			setTimeout( function() {
+			setTimeout( function () {
 				var plugin_url = target_element.attr( 'href' );
 				if ( ! plugin_url ) {
 					return;
 				}
-				var nonce = target_element.attr( 'data-plugin-activation-nonce' );
+				var nonce = target_element.attr(
+					'data-plugin-activation-nonce'
+				);
 				var plugin_slug = target_element.attr( 'data-slug' );
 				var url = new URL( plugin_url );
 				url.searchParams.set( 'action', 'perflab_activate_plugin' );