Changeset 50604 for branches/5.4

Timestamp:

03/26/2021 06:20:24 PM (5 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport GitHub Action and build improvements to the 5.4 branch.

This backports several build and test tool improvements to the 5.4 branch. Most notably, this includes:

• The changes required to allow each workflow to be triggered by the workflow_dispatch event so that tests can be run on a schedule [50590].
• The ability to run PHPUnit tests from src instead of build [50441-50443].
• Splitting single site and multisite tests into parallel jobs [50379].
• Split slow tests into separate, parallel jobs for PHP 5.6 [50444].
• Better branch and path scoping for GitHub Action workflows when running on pull_request [50432,50479].
• Several devDependency updates.

Merges [50267,50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598] to the 5.4 branch.
See #50401, #51734, #51801, #51802, #52548, #52608, #52612, #52623, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• .github/workflows/coding-standards.yml (modified) (8 diffs)
• .github/workflows/javascript-tests.yml (modified) (6 diffs)
• .github/workflows/php-compatibility.yml (modified) (4 diffs)
• .github/workflows/phpunit-tests.yml (modified) (12 diffs)
• .github/workflows/test-npm.yml (added)
• .github/workflows/test-old-branches.yml (added)
• .github/workflows/verify-npm-on-windows.yml (deleted)
• .github/workflows/welcome-new-contributors.yml (modified) (1 diff)
• Gruntfile.js (modified) (3 diffs)
• package-lock.json (modified) (10 diffs)
• package.json (modified) (3 diffs)
• tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)
• tests/phpunit/tests/admin/includesPlugin.php (modified) (10 diffs)
• tests/phpunit/tests/admin/includesUpdateCore.php (deleted)
• tests/phpunit/tests/dependencies/jquery.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/mediaelementjs.php (deleted)
• tests/phpunit/tests/dependencies/scripts.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/Emoji.php (modified) (3 diffs)
• tests/phpunit/tests/oembed/controller.php (modified) (1 diff)
• tests/phpunit/tests/oembed/getResponseData.php (modified) (1 diff)
• tests/phpunit/tests/oembed/template.php (modified) (3 diffs)
• tests/phpunit/tests/oembed/wpOembed.php (modified) (1 diff)
• tests/phpunit/tests/shortcode.php (modified) (1 diff)
• wp-tests-config-sample.php (modified) (1 diff)

branches/5.4/.github/workflows/coding-standards.yml

@@ -2 +2 @@
 
 on:
+  # JSHint was introduced in WordPress 3.8.
+  # PHPCS checking was introduced in WordPress 5.1.
   push:
     branches:
       - master
-      # JSHint was introduced in WordPress 3.8.
-      # PHPCS checking was introduced in WordPress 5.1.
+      - trunk
       - '3.[89]'
       - '[4-9].[0-9]'
@@ -13 +14 @@
       - '[4-9].[0-9]*'
   pull_request:
+    branches:
+      - master
+      - trunk
+      - '3.[89]'
+      - '[4-9].[0-9]'
+    paths:
+      # Any change to a PHP or JavaScript file should run checks.
+      - '**.js'
+      - '**.php'
+      # These files configure NPM. Changes could affect the outcome.
+      - 'package*.json'
+      # These files configure Composer. Changes could affect the outcome.
+      - 'composer.*'
+      # This file configures JSHint. Changes could affect the outcome.
+      - '.jshintrc'
+      # This file configures PHPCS. Changes could affect the outcome.
+      - 'phpcs.xml.dist'
+      # Changes to workflow files should always verify all workflows are successful.
+      - '.github/workflows/*.yml'
+  workflow_dispatch:
 
 jobs:
@@ -36 +57 @@
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
         with:
           php-version: '7.3'
@@ -51 +72 @@
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
         with:
           composer-options: "--no-progress --no-ansi --no-interaction"
@@ -92 +113 @@
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Log debug information
@@ -102 +123 @@
 
       - name: Install NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
         with:
           node-version: 14
 
       - name: Cache NodeJS modules
-        uses: actions/cache@v2
+        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
         env:
           cache-name: cache-node-modules
@@ -114 +135 @@
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
 
       - name: Log debug information
@@ -123 +142 @@
 
       - name: Install Dependencies
-        run: npx install-changed --install-command="npm ci"
+        run: npm ci
 
       - name: Run JSHint

branches/5.4/.github/workflows/javascript-tests.yml

@@ -2 +2 @@
 
 on:
+  # JavaScript testing was introduced in WordPress 3.8.
   push:
     branches:
       - master
-      # JavaScript testing was introduced in WordPress 3.8.
+      - trunk
       - '3.[89]'
       - '[4-9].[0-9]'
@@ -12 +13 @@
       - '[4-9].[0-9]*'
   pull_request:
+    branches:
+      - master
+      - trunk
+      - '3.[89]'
+      - '[4-9].[0-9]'
+    paths:
+      # Any change to a JavaScript file should run tests.
+      - '**.js'
+      # These files configure NPM. Changes could affect the outcome.
+      - 'package*.json'
+      # This file configures ESLint. Changes could affect the outcome.
+      - '.eslintignore'
+      # This file configures JSHint. Changes could affect the outcome.
+      - '.jshintrc'
+      # Any change to the QUnit directory should run tests.
+      - 'tests/qunit/**'
+      # Changes to workflow files should always verify all workflows are successful.
+      - '.github/workflows/*.yml'
+  workflow_dispatch:
 
 jobs:
@@ -34 +54 @@
       - name: Cancel previous runs of this workflow (pull requests only)
         if: ${{ github.event_name == 'pull_request' }}
-        uses: styfle/cancel-workflow-action@0.5.0
-        with:
-          access_token: ${{ github.token }}
+        uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Log debug information
@@ -49 +67 @@
 
       - name: Install NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
         with:
           node-version: 14
 
       - name: Cache NodeJS modules
-        uses: actions/cache@v2
+        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
         env:
           cache-name: cache-node-modules
@@ -61 +79 @@
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
 
       - name: Log debug information
@@ -70 +86 @@
 
       - name: Install Dependencies
-        run: npx install-changed --install-command="npm ci"
+        run: npm ci
 
       - name: Run QUnit tests

branches/5.4/.github/workflows/php-compatibility.yml

@@ -2 +2 @@
 
 on:
+  # PHP compatibility testing was introduced in WordPress 5.5.
   push:
     branches:
       - master
-      # The PHP compatibility testing was introduced in WordPress 5.5.
+      - trunk
       - '5.[5-9]'
       - '[6-9].[0-9]'
@@ -12 +13 @@
       - '[6-9].[0-9]*'
   pull_request:
+    branches:
+      - master
+      - trunk
+      - '5.[5-9]'
+      - '[6-9].[0-9]'
+    paths:
+      # This workflow only scans PHP files.
+      - '**.php'
+      # These files configure Composer. Changes could affect the outcome.
+      - 'composer.*'
+      # This file configures PHP Compatibility scanning. Changes could affect the outcome.
+      - 'phpcompat.xml.dist'
+      # Changes to workflow files should always verify all workflows are successful.
+      - '.github/workflows/*.yml'
+  workflow_dispatch:
 
 jobs:
@@ -35 +51 @@
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
         with:
           php-version: '7.4'
@@ -50 +66 @@
 
       - name: Install Composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
         with:
           composer-options: "--no-progress --no-ansi --no-interaction"

branches/5.4/.github/workflows/phpunit-tests.yml

@@ -5 +5 @@
     branches:
       - master
+      - trunk
       - '3.[7-9]'
       - '[4-9].[0-9]'
@@ -11 +12 @@
       - '[4-9].[0-9]*'
   pull_request:
+    branches:
+      - master
+      - trunk
+      - '3.[7-9]'
+      - '[4-9].[0-9]'
+  workflow_dispatch:
   # Once weekly On Sundays at 00:00 UTC.
   schedule:
@@ -16 +23 @@
 
 env:
-  LOCAL_DIR: build
   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
   COMPOSER_INSTALL: ${{ false }}
@@ -22 +28 @@
   PHPUNIT_SCRIPT: php
   LOCAL_PHP_MEMCACHED: ${{ false }}
+  SLOW_TESTS: 'external-http,media,restapi'
 
 jobs:
-  # Sets up WordPress for testing or development use.
+  # Sets up the workflow for testing.
   #
   # Performs the following steps:
   # - Cancels all previous workflow runs for pull requests that have not completed.
-  # - Checks out the repository.
-  # - Logs debug information about the runner container.
-  # - Installs NodeJS 14.
-  # - Sets up caching for NPM.
-  # _ Installs NPM dependencies using install-changed to hash the `package.json` file.
-  # - Builds WordPress to run from the `build` directory.
-  # - Creates a ZIP file of compiled WordPress.
-  # - Uploads ZIP file as an artifact.
-  setup-wordpress:
-    name: Setup WordPress
+  setup-workflow:
+    name: Setup Workflow
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -44 +43 @@
       - name: Cancel previous runs of this workflow (pull requests only)
         if: ${{ github.event_name == 'pull_request' }}
-        uses: styfle/cancel-workflow-action@0.5.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Log debug information
-        run: |
-          echo "$GITHUB_REF"
-          echo "$GITHUB_EVENT_NAME"
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-          php --version
-          php -i
-          locale -a
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14
-
-      - name: Cache NodeJS modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
-
-      - name: Install Dependencies
-        run: npx install-changed --install-command="npm ci"
-
-      - name: Build WordPress
-        run: npm run build
-
-      - name: Create ZIP artifact
-        uses: thedoctor0/zip-release@0.4.1
-        with:
-          filename: built-wp-${{ github.sha }}.zip
-          exclusions: '*.git* /*node_modules/* packagehash.txt'
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: built-wp-${{ github.sha }}
-          path: built-wp-${{ github.sha }}.zip
-          if-no-files-found: error
+        uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
 
   # Runs the PHPUnit tests for WordPress.
@@ -104 +50 @@
   # - Set environment variables.
   # - Sets up the environment variables needed for testing with memcached (if desired).
-  # - Downloads the built WordPress artifact from the previous job.
-  # - Unzips the artifact.
   # - Installs NodeJS 14.
   # - Sets up caching for NPM.
-  # _ Installs NPM dependencies using install-changed to hash the `package.json` file.
+  # - Installs NPM dependencies
   # - Configures caching for Composer.
-  # _ Installs Composer dependencies (if desired).
+  # - Installs Composer dependencies (if desired).
   # - Logs Docker debug information (about both the Docker installation within the runner).
   # - Starts the WordPress Docker container.
@@ -125 +69 @@
   # - todo: Configure Slack notifications for failing tests.
   test-php:
-    name: ${{ matrix.php }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
-    needs: setup-wordpress
+    name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }} ${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        php: [ '7.4', '7.3', '7.2', '7.1', '7.0', '5.6' ]
+        php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4' ]
         os: [ ubuntu-latest ]
         memcached: [ false ]
+        split_slow: [ false ]
+        multisite: [ false, true ]
         include:
-          # Include job for PHP 7.4 with memcached.
+          # Additional "slow" jobs for PHP 5.6.
+          - php: '5.6.20'
+            os: ubuntu-latest
+            memcached: false
+            multisite: false
+            split_slow: true
+          - php: '5.6.20'
+            os: ubuntu-latest
+            memcached: false
+            multisite: true
+            split_slow: true
+          # Include jobs for PHP 7.4 with memcached.
           - php: '7.4'
             os: ubuntu-latest
             memcached: true
+            multisite: false
+          - php: '7.4'
+            os: ubuntu-latest
+            memcached: true
+            multisite: true
           # Report the results of the PHP 7.4 without memcached job.
           - php: '7.4'
             os: ubuntu-latest
             memcached: false
+            multisite: false
             report: true
     env:
       LOCAL_PHP: ${{ matrix.php }}-fpm
       LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
+      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
 
     steps:
@@ -153 +117 @@
           echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
 
-      - name: Download the built WordPress artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: built-wp-${{ github.sha }}
-
-      - name: Unzip built artifact
-        run: unzip built-wp-${{ github.sha }}.zip
+      - name: Checkout repository
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
 
       - name: Install NodeJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
         with:
           node-version: 14
 
       - name: Use cached Node modules
-        uses: actions/cache@v2
+        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
         env:
           cache-name: cache-node-modules
@@ -174 +133 @@
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
 
       - name: Install Dependencies
-        run: npx install-changed --install-command="npm ci"
+        run: npm ci
+
+      - name: Get composer cache directory
+        id: composer-cache
+        if: ${{ env.COMPOSER_INSTALL == true }}
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache Composer dependencies
         if: ${{ env.COMPOSER_INSTALL == true }}
-        uses: actions/cache@v2
+        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
         env:
           cache-name: cache-composer-dependencies
@@ -188 +150 @@
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
       - name: Install Composer dependencies
@@ -210 +170 @@
         if: ${{ matrix.memcached }}
         run: |
-          cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
+          cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
           docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
 
@@ -235 +195 @@
         run: npm run env:install
 
+      - name: Run slow PHPUnit tests
+        if: ${{ matrix.split_slow }}
+        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
+
+      - name: Run PHPUnit tests for single site excluding slow tests
+        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
+        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
+
+      - name: Run PHPUnit tests for Multisite excluding slow tests
+        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
+        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
+
       - name: Run PHPUnit tests
-        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist
+        if: ${{ matrix.php >= '7.0' }}
+        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
 
       - name: Run AJAX tests
-        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax
-
-      - name: Run tests as a multisite install
-        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
+        if: ${{ ! matrix.split_slow && ! matrix.multisite }}
+        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
 
       - name: Run ms-files tests as a multisite install
+        if: ${{ matrix.multisite && ! matrix.split_slow }}
         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files
 
       - name: Run external HTTP tests
+        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
-
-      - name: Run REST API tests
-        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group restapi-jsclient
 
       # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
       - name: Run (xDebug) tests
-        run: LOCAL_PHP_XDEBUG=true npm run test:php -- -v --group xdebug --exclude-group __fakegroup__
+        if: ${{ ! matrix.split_slow }}
+        run: LOCAL_PHP_XDEBUG=true npm run test:${{ env.PHPUNIT_SCRIPT }} -- -v --group xdebug --exclude-group __fakegroup__
 
       - name: Checkout the WordPress Test Reporter
         if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
         with:
           repository: 'WordPress/phpunit-test-runner'
           path: 'test-runner'
-
-      - name: Set up the Git repository
-        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
-        run: |
-          git init
-          git remote add origin https://github.com/WordPress/wordpress-develop.git
-          git fetch
-          git reset origin/master
 
       - name: Submit test results to the WordPress.org host test results

branches/5.4/.github/workflows/welcome-new-contributors.yml

@@ -12 +12 @@
 
     steps:
-      - uses: bubkoo/welcome-action@v1
+      - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.3
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

branches/5.4/Gruntfile.js

@@ -7 +7 @@
         var path = require('path'),
                 fs = require( 'fs' ),
+                glob = require( 'glob' ),
+                assert = require( 'assert' ).strict,
                 spawn = require( 'child_process' ).spawnSync,
                 SOURCE_DIR = 'src/',
@@ -1401 +1403 @@
         ] );
 
+        /**
+         * Build verification tasks.
+         */
+        grunt.registerTask( 'verify:build', [
+                'verify:wp-embed',
+                'verify:old-files',
+                'verify:source-maps',
+        ] );
+
+        /**
+         * Build assertions for wp-embed.min.js.
+         *
+         * @ticket 34698
+         */
+        grunt.registerTask( 'verify:wp-embed', function() {
+                const file = `${ BUILD_DIR }/wp-includes/js/wp-embed.min.js`;
+
+                assert(
+                        fs.existsSync( file ),
+                        'The build/wp-includes/js/wp-embed.min.js file does not exist.'
+                );
+
+                const contents = fs.readFileSync( file, {
+                        encoding: 'utf8',
+                } );
+
+                assert(
+                        contents.length > 0,
+                        'The build/wp-includes/js/wp-embed.min.js file must not be empty.'
+                );
+                assert(
+                        false === contents.includes( '&' ),
+                        'The build/wp-includes/js/wp-embed.min.js file must not contain ampersands.'
+                );
+        } );
+
+        /**
+         * Build assertions to ensure no project files are inside `$_old_files` in the build directory.
+         *
+         * @ticket 36083
+         */
+        grunt.registerTask( 'verify:old-files', function() {
+                const file = `${ BUILD_DIR }wp-admin/includes/update-core.php`;
+
+                assert(
+                        fs.existsSync( file ),
+                        'The build/wp-admin/includes/update-core.php file does not exist.'
+                );
+
+                const contents = fs.readFileSync( file, {
+                        encoding: 'utf8',
+                } );
+
+                assert(
+                        contents.length > 0,
+                        'The build/wp-admin/includes/update-core.php file must not be empty.'
+                );
+
+                const match = contents.match( /\$_old_files = array\(([^\)]+)\);/ );
+
+                assert(
+                        match.length > 0,
+                        'The build/wp-admin/includes/update-core.php file does not include an `$_old_files` array.'
+                );
+
+                const files = match[1].split( '\n\t' ).filter( function( file ) {
+                        // Filter out empty lines
+                        if ( '' === file ) {
+                                return false;
+                        }
+
+                        // Filter out commented out lines
+                        if ( 0 === file.indexOf( '/' ) ) {
+                                return false;
+                        }
+
+                        return true;
+                } ).map( function( file ) {
+                        // Strip leading and trailing single quotes and commas
+                        return file.replace( /^\'|\',$/g, '' );
+                } );
+
+                files.forEach(function( file ){
+                        const search = `${ BUILD_DIR }${ file }`;
+                        assert(
+                                false === fs.existsSync( search ),
+                                `${ search } should not be present in the $_old_files array.`
+                        );
+                });
+        } );
+
+        /**
+         * Build assertions for the lack of source maps in JavaScript files.
+         *
+         * @ticket 24994
+         * @ticket 46218
+         */
+        grunt.registerTask( 'verify:source-maps', function() {
+                const path = `${ BUILD_DIR }**/*.js`;
+                const files = glob.sync( path );
+
+                assert(
+                        files.length > 0,
+                        'No JavaScript files found in the build directory.'
+                );
+
+                files.forEach( function( file ) {
+                        const contents = fs.readFileSync( file, {
+                                encoding: 'utf8',
+                        } );
+                        // `data:` URLs are allowed:
+                        const match = contents.match( /sourceMappingURL=((?!data:).)/ );
+
+                        assert(
+                                match === null,
+                                `The ${ file } file must not contain a sourceMappingURL.`
+                        );
+                } );
+        } );
+
         grunt.registerTask( 'build', function() {
                 if ( grunt.option( 'dev' ) ) {
@@ -1414 +1536 @@
                                 'includes:emoji',
                                 'includes:embed',
+                                'verify:build'
                         ] );
                 }

branches/5.4/package-lock.json

@@ -1826 +1826 @@
                 },
                 "@sideway/address": {
-                        "version": "4.1.0",
-                        "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
-                        "integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
+                        "version": "4.1.1",
+                        "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
+                        "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
                         "dev": true,
                         "requires": {
@@ -5385 +5385 @@
                 },
                 "check-node-version": {
-                        "version": "4.0.3",
-                        "resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.0.3.tgz",
-                        "integrity": "sha512-kbnOaF7SE1uasWx3hqxzsU2yz7I+rkxSMuTW0eKoF39eUtSR/a0F4Sm35LwJNx4itOIARf9eLhWHOOh7rlZ5/g==",
+                        "version": "4.1.0",
+                        "resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.1.0.tgz",
+                        "integrity": "sha512-TSXGsyfW5/xY2QseuJn8/hleO2AU7HxVCdkc900jp1vcfzF840GkjvRT7CHl8sRtWn23n3X3k0cwH9RXeRwhfw==",
                         "dev": true,
                         "requires": {
@@ -5629 +5629 @@
                 },
                 "clean-css": {
-                        "version": "4.2.1",
-                        "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-                        "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+                        "version": "5.1.2",
+                        "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
+                        "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
                         "dev": true,
                         "requires": {
@@ -10447 +10447 @@
                 },
                 "grunt-contrib-cssmin": {
-                        "version": "3.0.0",
-                        "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
-                        "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
-                        "dev": true,
-                        "requires": {
-                                "chalk": "^2.4.1",
-                                "clean-css": "~4.2.1",
-                                "maxmin": "^2.1.0"
+                        "version": "4.0.0",
+                        "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
+                        "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
+                        "dev": true,
+                        "requires": {
+                                "chalk": "^4.1.0",
+                                "clean-css": "^5.0.1",
+                                "maxmin": "^3.0.0"
                         },
                         "dependencies": {
                                 "ansi-styles": {
-                                        "version": "3.2.1",
-                                        "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                                        "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                                        "dev": true,
-                                        "requires": {
-                                                "color-convert": "^1.9.0"
+                                        "version": "4.3.0",
+                                        "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                                        "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                                        "dev": true,
+                                        "requires": {
+                                                "color-convert": "^2.0.1"
                                         }
                                 },
                                 "chalk": {
-                                        "version": "2.4.2",
-                                        "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                                        "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                                        "dev": true,
-                                        "requires": {
-                                                "ansi-styles": "^3.2.1",
-                                                "escape-string-regexp": "^1.0.5",
-                                                "supports-color": "^5.3.0"
-                                        }
+                                        "version": "4.1.0",
+                                        "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+                                        "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+                                        "dev": true,
+                                        "requires": {
+                                                "ansi-styles": "^4.1.0",
+                                                "supports-color": "^7.1.0"
+                                        }
+                                },
+                                "color-convert": {
+                                        "version": "2.0.1",
+                                        "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+                                        "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                                        "dev": true,
+                                        "requires": {
+                                                "color-name": "~1.1.4"
+                                        }
+                                },
+                                "color-name": {
+                                        "version": "1.1.4",
+                                        "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+                                        "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                                        "dev": true
+                                },
+                                "figures": {
+                                        "version": "3.2.0",
+                                        "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+                                        "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+                                        "dev": true,
+                                        "requires": {
+                                                "escape-string-regexp": "^1.0.5"
+                                        }
+                                },
+                                "has-flag": {
+                                        "version": "4.0.0",
+                                        "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                                        "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                                        "dev": true
+                                },
+                                "maxmin": {
+                                        "version": "3.0.0",
+                                        "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
+                                        "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
+                                        "dev": true,
+                                        "requires": {
+                                                "chalk": "^4.1.0",
+                                                "figures": "^3.2.0",
+                                                "gzip-size": "^5.1.1",
+                                                "pretty-bytes": "^5.3.0"
+                                        }
+                                },
+                                "pretty-bytes": {
+                                        "version": "5.6.0",
+                                        "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+                                        "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+                                        "dev": true
                                 },
                                 "supports-color": {
-                                        "version": "5.5.0",
-                                        "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                                        "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                                        "dev": true,
-                                        "requires": {
-                                                "has-flag": "^3.0.0"
+                                        "version": "7.2.0",
+                                        "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                                        "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                                        "dev": true,
+                                        "requires": {
+                                                "has-flag": "^4.0.0"
                                         }
                                 }
@@ -14183 +14230 @@
                 },
                 "joi": {
-                        "version": "17.3.0",
-                        "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
-                        "integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
+                        "version": "17.4.0",
+                        "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
+                        "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
                         "dev": true,
                         "requires": {
@@ -19256 +19303 @@
                 },
                 "sass": {
-                        "version": "1.32.6",
-                        "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
-                        "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
+                        "version": "1.32.8",
+                        "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
+                        "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
                         "dev": true,
                         "requires": {
@@ -21831 +21878 @@
                 },
                 "uglify-js": {
-                        "version": "3.12.6",
-                        "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz",
-                        "integrity": "sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==",
+                        "version": "3.13.2",
+                        "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz",
+                        "integrity": "sha512-SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw==",
                         "dev": true
                 },
@@ -22374 +22421 @@
                 },
                 "wait-on": {
-                        "version": "5.2.1",
-                        "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
-                        "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
+                        "version": "5.3.0",
+                        "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
+                        "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
                         "dev": true,
                         "requires": {
                                 "axios": "^0.21.1",
                                 "joi": "^17.3.0",
-                                "lodash": "^4.17.20",
+                                "lodash": "^4.17.21",
                                 "minimist": "^1.2.5",
                                 "rxjs": "^6.6.3"
@@ -22387 +22434 @@
                         "dependencies": {
                                 "lodash": {
-                                        "version": "4.17.20",
-                                        "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-                                        "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+                                        "version": "4.17.21",
+                                        "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+                                        "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
                                         "dev": true
                                 },
@@ -22399 +22446 @@
                                 },
                                 "rxjs": {
-                                        "version": "6.6.3",
-                                        "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
-                                        "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+                                        "version": "6.6.6",
+                                        "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+                                        "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
                                         "dev": true,
                                         "requires": {

branches/5.4/package.json

@@ -32 +32 @@
                 "@wordpress/scripts": "6.2.0",
                 "autoprefixer": "^9.8.6",
-                "check-node-version": "4.0.3",
+                "check-node-version": "4.1.0",
                 "copy-webpack-plugin": "^5.1.2",
                 "cssnano": "4.1.10",
@@ -42 +42 @@
                 "grunt-contrib-concat": "1.0.1",
                 "grunt-contrib-copy": "~1.0.0",
-                "grunt-contrib-cssmin": "~3.0.0",
+                "grunt-contrib-cssmin": "~4.0.0",
                 "grunt-contrib-imagemin": "~4.0.0",
                 "grunt-contrib-jshint": "3.0.0",
@@ -62 +62 @@
                 "jquery-migrate": "1.4.1",
                 "matchdep": "~2.0.0",
-                "sass": "^1.32.6",
+                "sass": "^1.32.8",
                 "source-map-loader": "^1.1.3",
-                "uglify-js": "^3.12.6",
+                "uglify-js": "^3.13.2",
                 "uglifyjs-webpack-plugin": "2.2.0",
-                "wait-on": "5.2.1",
+                "wait-on": "5.3.0",
                 "webpack": "4.43.0",
                 "webpack-dev-server": "3.11.2",

branches/5.4/tests/phpunit/includes/abstract-testcase.php

@@ -1240 +1240 @@
                 );
         }
+
+        /**
+         * Touches the given file and its directory if it doesn't already exist.
+         *
+         * This can be used to ensure a file that is implictly relied on in a test exists
+         * without it having to be built.
+         *
+         * @param string $file The file name.
+         */
+        public static function touch( $file ) {
+                if ( file_exists( $file ) ) {
+                        return;
+                }
+
+                $dir = dirname( $file );
+
+                if ( ! file_exists( $dir ) ) {
+                        mkdir( $dir, 0777, true );
+                }
+
+                touch( $file );
+        }
 }

branches/5.4/tests/phpunit/tests/admin/includesPlugin.php

@@ -5 +5 @@
  */
 class Tests_Admin_includesPlugin extends WP_UnitTestCase {
+        public static function wpSetUpBeforeClass( $factory ) {
+                self::_back_up_mu_plugins();
+        }
+
+        public static function wpTearDownAfterClass() {
+                self::_restore_mu_plugins();
+        }
+
         function test_get_plugin_data() {
                 $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
@@ -370 +378 @@
                         'list_files_test_plugin/subdir/subfile.php',
                 );
-                $this->assertEquals( $expected, $plugin_files );
 
                 unlink( $sub_dir . '/subfile.php' );
@@ -376 +383 @@
                 rmdir( $sub_dir );
                 rmdir( $plugin_dir );
+
+                $this->assertSame( $expected, $plugin_files );
         }
 
@@ -382 +391 @@
          */
         public function test_get_mu_plugins_when_mu_plugins_exists_but_is_empty() {
-                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-                        $exists = true;
-                        $this->_back_up_mu_plugins();
-                } else {
-                        $exists = false;
-                        mkdir( WPMU_PLUGIN_DIR );
-                }
-
-                $this->assertEquals( array(), get_mu_plugins() );
-
-                // Clean up.
-                if ( $exists ) {
-                        $this->_restore_mu_plugins();
-                } else {
-                        rmdir( WPMU_PLUGIN_DIR );
-                }
+                mkdir( WPMU_PLUGIN_DIR );
+
+                $mu_plugins = get_mu_plugins();
+
+                rmdir( WPMU_PLUGIN_DIR );
+
+                $this->assertSame( array(), $mu_plugins );
         }
 
@@ -404 +404 @@
          */
         public function test_get_mu_plugins_when_mu_plugins_directory_does_not_exist() {
-                $exists = false;
-                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-                        $exists = true;
-                        $this->_back_up_mu_plugins();
-                        rmdir( WPMU_PLUGIN_DIR );
-                }
-
-                $this->assertEquals( array(), get_mu_plugins() );
-
-                // Clean up.
-                if ( $exists ) {
-                        mkdir( WPMU_PLUGIN_DIR );
-                        $this->_restore_mu_plugins();
-                }
+                $this->assertFileNotExists( WPMU_PLUGIN_DIR );
+                $this->assertSame( array(), get_mu_plugins() );
         }
 
@@ -424 +412 @@
          */
         public function test_get_mu_plugins_should_ignore_index_php_containing_silence_is_golden() {
-                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-                        $exists = true;
-                        $this->_back_up_mu_plugins();
-                } else {
-                        $exists = false;
-                        mkdir( WPMU_PLUGIN_DIR );
-                }
+                mkdir( WPMU_PLUGIN_DIR );
 
                 $this->_create_plugin( '<?php\n//Silence is golden.', 'index.php', WPMU_PLUGIN_DIR );
-                $this->assertEquals( array(), get_mu_plugins() );
+
+                $mu_plugins = get_mu_plugins();
+
+                unlink( WPMU_PLUGIN_DIR . '/index.php' );
+                rmdir( WPMU_PLUGIN_DIR );
+
+                $this->assertSame( array(), $mu_plugins );
+        }
+
+        /**
+         * @covers ::get_mu_plugins
+         */
+        public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
+                mkdir( WPMU_PLUGIN_DIR );
+
+                $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
+                $found = get_mu_plugins();
 
                 // Clean up.
                 unlink( WPMU_PLUGIN_DIR . '/index.php' );
-                if ( $exists ) {
-                        $this->_restore_mu_plugins();
-                } else {
-                        rmdir( WPMU_PLUGIN_DIR );
-                }
+                rmdir( WPMU_PLUGIN_DIR );
+
+                $this->assertSame( array( 'index.php' ), array_keys( $found ) );
         }
 
@@ -447 +443 @@
          * @covers ::get_mu_plugins
          */
-        public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
-                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-                        $exists = true;
-                        $this->_back_up_mu_plugins();
-                } else {
-                        $exists = false;
-                        mkdir( WPMU_PLUGIN_DIR );
-                }
-
-                $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
-                $found = get_mu_plugins();
-                $this->assertEquals( array( 'index.php' ), array_keys( $found ) );
-
-                // Clean up.
-                unlink( WPMU_PLUGIN_DIR . '/index.php' );
-                if ( $exists ) {
-                        $this->_restore_mu_plugins();
-                } else {
-                        rmdir( WPMU_PLUGIN_DIR );
-                }
-        }
-
-        /**
-         * @covers ::get_mu_plugins
-         */
         public function test_get_mu_plugins_should_ignore_files_without_php_extensions() {
-                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
-                        $exists = true;
-                        $this->_back_up_mu_plugins();
-                } else {
-                        $exists = false;
-                        mkdir( WPMU_PLUGIN_DIR );
-                }
+                mkdir( WPMU_PLUGIN_DIR );
 
                 $this->_create_plugin( '<?php\n//Test', 'foo.php', WPMU_PLUGIN_DIR );
                 $this->_create_plugin( '<?php\n//Test 2', 'bar.txt', WPMU_PLUGIN_DIR );
                 $found = get_mu_plugins();
-                $this->assertEquals( array( 'foo.php' ), array_keys( $found ) );
 
                 // Clean up.
                 unlink( WPMU_PLUGIN_DIR . '/foo.php' );
                 unlink( WPMU_PLUGIN_DIR . '/bar.txt' );
-                if ( $exists ) {
-                        $this->_restore_mu_plugins();
-                } else {
-                        rmdir( WPMU_PLUGIN_DIR );
-                }
+
+                $this->assertSame( array( 'foo.php' ), array_keys( $found ) );
         }
 
@@ -652 +613 @@
 
         /**
-         * Move existing mu-plugins to wp-content/mu-plugin/backup.
+         * Move existing mu-plugins to wp-content/mu-plugin-backup.
          *
          * @since 4.2.0
@@ -658 +619 @@
          * @access private
          */
-        private function _back_up_mu_plugins() {
+        private static function _back_up_mu_plugins() {
                 if ( is_dir( WPMU_PLUGIN_DIR ) ) {
                         $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
-                        if ( ! is_dir( $mu_bu_dir ) ) {
-                                mkdir( $mu_bu_dir );
-                        }
-
-                        $files_to_move = array();
-                        $mu_plugins    = opendir( WPMU_PLUGIN_DIR );
-                        if ( $mu_plugins ) {
-                                while ( false !== $plugin = readdir( $mu_plugins ) ) {
-                                        if ( 0 !== strpos( $plugin, '.' ) ) {
-                                                $files_to_move[] = $plugin;
-                                        }
-                                }
-                        }
-
-                        closedir( $mu_plugins );
-
-                        foreach ( $files_to_move as $file_to_move ) {
-                                $f = rename( WPMU_PLUGIN_DIR . '/' . $file_to_move, $mu_bu_dir . '/' . $file_to_move );
-                        }
+                        rename( WPMU_PLUGIN_DIR, $mu_bu_dir );
                 }
         }
@@ -690 +633 @@
          * @access private
          */
-        private function _restore_mu_plugins() {
-                $mu_bu_dir     = WP_CONTENT_DIR . '/mu-plugin-backup';
-                $files_to_move = array();
-                $mu_plugins    = @opendir( $mu_bu_dir );
-                if ( $mu_plugins ) {
-                        while ( false !== $plugin = readdir( $mu_plugins ) ) {
-                                if ( 0 !== strpos( $plugin, '.' ) ) {
-                                        $files_to_move[] = $plugin;
-                                }
-                        }
-                }
-
-                closedir( $mu_plugins );
-
-                foreach ( $files_to_move as $file_to_move ) {
-                        rename( $mu_bu_dir . '/' . $file_to_move, WPMU_PLUGIN_DIR . '/' . $file_to_move );
+        private static function _restore_mu_plugins() {
+                $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
+
+                if ( is_dir( WPMU_PLUGIN_DIR ) ) {
+                        rmdir( WPMU_PLUGIN_DIR );
                 }
 
                 if ( is_dir( $mu_bu_dir ) ) {
-                        rmdir( $mu_bu_dir );
+                        rename( $mu_bu_dir, WPMU_PLUGIN_DIR );
                 }
         }

branches/5.4/tests/phpunit/tests/dependencies/jquery.php

@@ -29 +29 @@
                         $this->assertEquals( $jquery_scripts[ $dep ], $o->src );
                 }
-        }
-
-        function test_presence_of_jquery_no_conflict() {
-                $contents   = trim( file_get_contents( ABSPATH . WPINC . '/js/jquery/jquery.js' ) );
-                $noconflict = 'jQuery.noConflict();';
-                $end        = substr( $contents, - strlen( $noconflict ) );
-                $this->assertEquals( $noconflict, $end );
         }
 

branches/5.4/tests/phpunit/tests/dependencies/scripts.php

@@ -713 +713 @@
 
                 $ver       = get_bloginfo( 'version' );
+                $suffix    = wp_scripts_get_suffix();
                 $expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
                 $expected .= "<script type='text/javascript'>\nconsole.log(\"before\");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='http://example.com'></script>\n";
-                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js'></script>\n";
+                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill{$suffix}.js'></script>\n";
                 $expected .= "<script type='text/javascript'>\n";
-                $expected .= "( 'fetch' in window ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-fetch.min.js\"></scr' + 'ipt>' );( document.contains ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-node-contains.min.js\"></scr' + 'ipt>' );( window.DOMRect ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-dom-rect.min.js\"></scr' + 'ipt>' );( window.URL && window.URL.prototype && window.URLSearchParams ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-url.min.js\"></scr' + 'ipt>' );( window.FormData && window.FormData.prototype.keys ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-formdata.min.js\"></scr' + 'ipt>' );( Element.prototype.matches && Element.prototype.closest ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-element-closest.min.js\"></scr' + 'ipt>' );\n";
+                $expected .= "( 'fetch' in window ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-fetch{$suffix}.js\"></scr' + 'ipt>' );( document.contains ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-node-contains{$suffix}.js\"></scr' + 'ipt>' );( window.DOMRect ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-dom-rect{$suffix}.js\"></scr' + 'ipt>' );( window.URL && window.URL.prototype && window.URLSearchParams ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-url{$suffix}.js\"></scr' + 'ipt>' );( window.FormData && window.FormData.prototype.keys ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-formdata{$suffix}.js\"></scr' + 'ipt>' );( Element.prototype.matches && Element.prototype.closest ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-element-closest{$suffix}.js\"></scr' + 'ipt>' );\n";
                 $expected .= "</script>\n";
-                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready.min.js'></script>\n";
-                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y.min.js'></script>\n";
+                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready{$suffix}.js'></script>\n";
+                $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y{$suffix}.js'></script>\n";
                 $expected .= "<script type='text/javascript' src='http://example2.com'></script>\n";
                 $expected .= "<script type='text/javascript'>\nconsole.log(\"after\");\n</script>\n";
@@ -1380 +1381 @@
                 );
         }
-
-        function test_no_source_mapping() {
-                $all_files = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( dirname( ABSPATH ) . '/build/' ) );
-                $js_files  = new RegexIterator( $all_files, '/\.js$/' );
-                foreach ( $js_files as $js_file ) {
-                        $contents = trim( file_get_contents( $js_file ) );
-
-                        // We allow data: URLs.
-                        $found = preg_match( '/sourceMappingURL=((?!data:).)/', $contents );
-                        $this->assertSame( $found, 0, "sourceMappingURL found in $js_file" );
-                }
-        }
 }

branches/5.4/tests/phpunit/tests/formatting/Emoji.php

@@ -14 +14 @@
          */
         public function test_unfiltered_emoji_cdns() {
+                // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
                 $output = get_echo( '_print_emoji_detection_script' );
 
@@ -32 +34 @@
                 add_filter( 'emoji_svg_url', array( $this, '_filtered_emoji_svn_cdn' ) );
 
+                // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
                 $output = get_echo( '_print_emoji_detection_script' );
 
@@ -53 +57 @@
                 add_filter( 'emoji_url', array( $this, '_filtered_emoji_png_cdn' ) );
 
+                // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
                 $output = get_echo( '_print_emoji_detection_script' );
 

branches/5.4/tests/phpunit/tests/oembed/controller.php

@@ -35 +35 @@
                         )
                 );
+
+                // `get_post_embed_html()` assumes `wp-includes/js/wp-embed.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
         }
 

branches/5.4/tests/phpunit/tests/oembed/getResponseData.php

@@ -5 +5 @@
  */
 class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
+        public function setUp() {
+                parent::setUp();
+
+                // `get_post_embed_html()` assumes `wp-includes/js/wp-embed.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
+        }
+
         function test_get_oembed_response_data_non_existent_post() {
                 $this->assertFalse( get_oembed_response_data( 0, 100 ) );

branches/5.4/tests/phpunit/tests/oembed/template.php

@@ -23 +23 @@
 
                 $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
+
+                // `print_embed_scripts()` assumes `wp-includes/js/wp-embed-template.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-embed-template.js' );
 
                 ob_start();
@@ -291 +294 @@
 
         /**
+         * Confirms that no ampersands exist in src/wp-includes/js/wp-embed.js.
+         *
+         * See also the `verify:wp-embed` Grunt task for verifying the built file.
+         *
          * @ticket 34698
          */
@@ -296 +303 @@
                 $this->assertNotContains( '&', file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' ) );
         }
-
-        /**
-         * @ticket 34698
-         *
-         * @depends test_js_no_ampersands
-         *
-         * The previous test confirms that no ampersands exist in src/wp-includes/js/wp-embed.js.
-         * However, we must also confirm that UglifyJS does not add ampersands during its
-         * optimizations (which we tweak to avoid, but indirectly -- understandably, there's
-         * no "don't add ampersands to my JavaScript file" option).
-         *
-         * So this test checks for ampersands in build/wp-includes/js/wp-embed.min.js.
-         * In many cases, this file will not exist; in those cases, we simply skip the test.
-         *
-         * So when would it be run? We have Travis CI run `npm run test` which then runs, in order,
-         * `qunit:compiled` (which runs the build) and then `phpunit`. Thus, this test will at least be
-         * run during continuous integration.
-         *
-         * However, we need to verify that `qunit:compiled` runs before `phpunit`. So this test also
-         * does a cheap check for a registered Grunt task called `test` that contains both
-         * `qunit:compiled` and `phpunit`, in that order.
-         *
-         * One final failsafe: The Gruntfile.js assertion takes place before checking for the existence
-         * of wp-embed.min.js. If the Grunt tasks are significantly refactored later, it could indicate
-         * that wp-embed.min.js doesn't exist anymore. We wouldn't want the test to silently become one
-         * that is always skipped, and thus useless.
-         */
-        function test_js_no_ampersands_in_compiled() {
-                $gruntfile = file_get_contents( dirname( ABSPATH ) . '/Gruntfile.js' );
-
-                // Confirm this file *should* exist, otherwise this test will always be skipped.
-                $test = '/grunt.registerTask\(\s*\'test\',.*\'qunit:compiled\'.*\'phpunit\'/';
-                $this->assertTrue( (bool) preg_match( $test, $gruntfile ) );
-
-                $file = dirname( ABSPATH ) . '/build/' . WPINC . '/js/wp-embed.min.js';
-                if ( ! file_exists( $file ) ) {
-                        return;
-                }
-                $this->assertNotContains( '&', file_get_contents( $file ) );
-        }
-
 }

branches/5.4/tests/phpunit/tests/oembed/wpOembed.php

@@ -19 +19 @@
 
                 $this->pre_oembed_result_filtered = false;
+
+                // `get_post_embed_html()` assumes `wp-includes/js/wp-embed.js` is present:
+                self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
         }
 

branches/5.4/tests/phpunit/tests/shortcode.php

@@ -747 +747 @@
         function test_php_and_js_shortcode_attribute_regexes_match() {
 
-                $file    = file_get_contents( ABSPATH . WPINC . '/js/shortcode.js' );
+                $file    = file_get_contents( ABSPATH . 'js/_enqueues/wp/shortcode.js' );
                 $matched = preg_match( '|\s+pattern = (\/.+\/)g;|', $file, $matches );
                 $php     = get_shortcode_atts_regex();

branches/5.4/wp-tests-config-sample.php

@@ -2 +2 @@
 
 /* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
-if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
-        define( 'ABSPATH', dirname( __FILE__ ) . '/build/' );
-} else {
-        define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
-}
+define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
 
 /*