Merge trunk into feature/image-loading-optimization

[westonruter]

To be merged without review.

Merge conflicts:

diff --cc .github/workflows/php-test-standalone-plugins.yml
index b3be5bb0,410ae380..00000000
--- a/.github/workflows/php-test-standalone-plugins.yml
+++ b/.github/workflows/php-test-standalone-plugins.yml
@@@ -52,8 -68,12 +68,17 @@@ jobs
            cache: npm
        - name: npm install
          run: npm ci
++<<<<<<< HEAD
 +      - name: Build assets
 +        run: npm run build
++=======
+       - name: General debug information
+         run: |
+           npm --version
+           node --version
+           composer --version
+           php -v
++>>>>>>> 4a95c47a3a4001daa93100a5b97e0f9e444713de
        - name: Building standalone plugins
          run: npm run build-plugins
        - name: Running single site standalone plugin integration tests
diff --cc .gitignore
index 4497d896,02b66966..00000000
--- a/.gitignore
+++ b/.gitignore
@@@ -23,7 -23,8 +23,12 @@@ nbproject
  
  build
  .wp-env.override.json
++<<<<<<< HEAD
 +*.asset.php
++=======
+ build-cs/vendor/
+ build-cs/composer.lock
++>>>>>>> 4a95c47a3a4001daa93100a5b97e0f9e444713de
  
  ############
  ## Vendor
diff --cc composer.lock
index 3d552f87,b6c27e78..00000000
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,11 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
++<<<<<<< HEAD
 +    "content-hash": "343d54db29b4354eed69ae570fa85247",
++=======
+     "content-hash": "bd9b816ae7c15eb36b10d97e807a6ce2",
++>>>>>>> 4a95c47a3a4001daa93100a5b97e0f9e444713de
      "packages": [
          {
              "name": "composer/installers",
@@@ -2963,10 -2008,8 +2012,10 @@@
      "prefer-stable": false,
      "prefer-lowest": false,
      "platform": {
 -        "php": ">=7|^8"
 +        "php": ">=7|^8",
 +        "ext-dom": "*",
 +        "ext-json": "*"
      },
      "platform-dev": [],
-     "plugin-api-version": "2.2.0"
+     "plugin-api-version": "2.6.0"
  }

Resolved via composer update --lock and:

diff --cc .github/workflows/php-test-standalone-plugins.yml
index b3be5bb0,410ae380..00000000
--- a/.github/workflows/php-test-standalone-plugins.yml
+++ b/.github/workflows/php-test-standalone-plugins.yml
@@@ -50,10 -66,14 +66,16 @@@ jobs
          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: npm install
 +        run: npm ci
 +      - name: Build assets
 +        run: npm run build
        - name: Building standalone plugins
          run: npm run build-plugins
        - name: Running single site standalone plugin integration tests
diff --cc .gitignore
index 4497d896,02b66966..00000000
--- a/.gitignore
+++ b/.gitignore
@@@ -23,7 -23,8 +23,9 @@@ nbproject
  
  build
  .wp-env.override.json
 +*.asset.php
+ build-cs/vendor/
+ build-cs/composer.lock
  
  ############
  ## Vendor

The other change new in this PR is 5c70c25 to better clean up REQUEST_URI in tests.

[westonruter]

Unit tests are currently failing for trunk due to Core-60392.

[westonruter]

Test failure due to AVIF support landing in core. Fixed in #967. Pending merge to update this PR with fix.

[github-actions]

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core SVN

If you're a Core Committer, use this list when committing to wordpress-develop in SVN:

Props: mukesh27, spacedmonkey, swissspidy, westonruter, flixos90, jorbin.

GitHub Merge commits

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: mukeshpanchal27 <[email protected]>
Co-authored-by: spacedmonkey <[email protected]>
Co-authored-by: swissspidy <[email protected]>
Co-authored-by: westonruter <[email protected]>
Co-authored-by: felixarntz <[email protected]>
Co-authored-by: aaronjorbin <[email protected]>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.