<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50606] branches/5.2: Build/Test Tools: Backport GitHub Action and build improvements to the 5.2 branch.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50606">50606</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50606","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-03-26 20:02:01 +0000 (Fri, 26 Mar 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Backport GitHub Action and build improvements to the 5.2 branch.
This backports several build and test tool improvements to the 5.2 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 <a href="https://core.trac.wordpress.org/changeset/50590">[50590]</a>.
- The ability to run PHPUnit tests from `src` instead of `build` [50441-50443].
- Splitting single site and multisite tests into parallel jobs <a href="https://core.trac.wordpress.org/changeset/50379">[50379]</a>.
- Split slow tests into separate, parallel jobs for PHP 5.6 <a href="https://core.trac.wordpress.org/changeset/50444">[50444]</a>.
- 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.2 branch.
See <a href="https://core.trac.wordpress.org/ticket/50401">#50401</a>, <a href="https://core.trac.wordpress.org/ticket/51734">#51734</a>, <a href="https://core.trac.wordpress.org/ticket/51801">#51801</a>, <a href="https://core.trac.wordpress.org/ticket/51802">#51802</a>, <a href="https://core.trac.wordpress.org/ticket/52548">#52548</a>, <a href="https://core.trac.wordpress.org/ticket/52608">#52608</a>, <a href="https://core.trac.wordpress.org/ticket/52612">#52612</a>, <a href="https://core.trac.wordpress.org/ticket/52623">#52623</a>, <a href="https://core.trac.wordpress.org/ticket/52624">#52624</a>, <a href="https://core.trac.wordpress.org/ticket/52625">#52625</a>, <a href="https://core.trac.wordpress.org/ticket/52645">#52645</a>, <a href="https://core.trac.wordpress.org/ticket/52653">#52653</a>, <a href="https://core.trac.wordpress.org/ticket/52658">#52658</a>, <a href="https://core.trac.wordpress.org/ticket/52660">#52660</a>, <a href="https://core.trac.wordpress.org/ticket/52667">#
52667</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches52githubworkflowscodingstandardsyml">branches/5.2/.github/workflows/coding-standards.yml</a></li>
<li><a href="#branches52githubworkflowsendtoendtestsyml">branches/5.2/.github/workflows/end-to-end-tests.yml</a></li>
<li><a href="#branches52githubworkflowsjavascripttestsyml">branches/5.2/.github/workflows/javascript-tests.yml</a></li>
<li><a href="#branches52githubworkflowsphpcompatibilityyml">branches/5.2/.github/workflows/php-compatibility.yml</a></li>
<li><a href="#branches52githubworkflowsphpunittestsyml">branches/5.2/.github/workflows/phpunit-tests.yml</a></li>
<li><a href="#branches52githubworkflowswelcomenewcontributorsyml">branches/5.2/.github/workflows/welcome-new-contributors.yml</a></li>
<li><a href="#branches52Gruntfilejs">branches/5.2/Gruntfile.js</a></li>
<li><a href="#branches52packagelockjson">branches/5.2/package-lock.json</a></li>
<li><a href="#branches52packagejson">branches/5.2/package.json</a></li>
<li><a href="#branches52testsphpunitincludesabstracttestcasephp">branches/5.2/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#branches52testsphpunittestsadminincludesPluginphp">branches/5.2/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#branches52testsphpunittestsdependenciesjqueryphp">branches/5.2/tests/phpunit/tests/dependencies/jquery.php</a></li>
<li><a href="#branches52testsphpunittestsdependenciesscriptsphp">branches/5.2/tests/phpunit/tests/dependencies/scripts.php</a></li>
<li><a href="#branches52testsphpunittestsformattingEmojiphp">branches/5.2/tests/phpunit/tests/formatting/Emoji.php</a></li>
<li><a href="#branches52testsphpunittestsoembedcontrollerphp">branches/5.2/tests/phpunit/tests/oembed/controller.php</a></li>
<li><a href="#branches52testsphpunittestsoembedgetResponseDataphp">branches/5.2/tests/phpunit/tests/oembed/getResponseData.php</a></li>
<li><a href="#branches52testsphpunittestsoembedtemplatephp">branches/5.2/tests/phpunit/tests/oembed/template.php</a></li>
<li><a href="#branches52testsphpunittestsoembedwpOembedphp">branches/5.2/tests/phpunit/tests/oembed/wpOembed.php</a></li>
<li><a href="#branches52testsphpunittestsshortcodephp">branches/5.2/tests/phpunit/tests/shortcode.php</a></li>
<li><a href="#branches52wptestsconfigsamplephp">branches/5.2/wp-tests-config-sample.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches52githubworkflowstestnpmyml">branches/5.2/.github/workflows/test-npm.yml</a></li>
<li><a href="#branches52githubworkflowstestoldbranchesyml">branches/5.2/.github/workflows/test-old-branches.yml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches52githubworkflowsverifynpmonwindowsyml">branches/5.2/.github/workflows/verify-npm-on-windows.yml</a></li>
<li><a href="#branches52testsphpunittestsadminincludesUpdateCorephp">branches/5.2/tests/phpunit/tests/admin/includesUpdateCore.php</a></li>
<li><a href="#branches52testsphpunittestsdependenciesmediaelementjsphp">branches/5.2/tests/phpunit/tests/dependencies/mediaelementjs.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches52">branches/5.2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.2
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.2 2021-03-26 19:22:10 UTC (rev 50605)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.2 2021-03-26 20:02:01 UTC (rev 50606)
</ins><a id="branches52"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:45284-45285,45287,45289,45292,45296,45298,45300-45301,45308-45311,45316,45319,45321-45322,45324,45326,45328,45331,45334,45336,45338,45340,45342,45344-45346,45348,45350,45352,45357,45365,45367,45376,45403,45411,45416,45425,45463,45481,45488,45495,45501-45503,45506-45507,45515,45520,45522,45526-45527,45529,45551,45563-45564,45569,45572,45576,45618-45619,45626,45655-45656,45673,45684,45701,45722,45725,45727,45745,45750,45761-45762,45764-45765,45783-45784,45800,45819,45826,45861,45863,45867,45869,45875,45885,45935-45936,45971,45979,45990,45997,46019,46073,46320,46403-46404,46408-46409,46472,46474-46476,46478,46483,46485,46682,46893-46896,46996,46999,47225,47313,47318,47341,47404,47633-47638,47790,47867,47872-47873,47887,47889,47912,47948-47951,47984,48121,48213,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49306,49335,49358,49360,49362,49369,49371,49380,49382
-49388,49452,49548,49636,49779,49781-49784,49786,49836,49876,49933,49937-49940,49983,49989,50017,50126,50176,50185,50192,50268,50285,50298
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:45284-45285,45287,45289,45292,45296,45298,45300-45301,45308-45311,45316,45319,45321-45322,45324,45326,45328,45331,45334,45336,45338,45340,45342,45344-45346,45348,45350,45352,45357,45365,45367,45376,45403,45411,45416,45425,45463,45481,45488,45495,45501-45503,45506-45507,45515,45520,45522,45526-45527,45529,45551,45563-45564,45569,45572,45576,45618-45619,45626,45655-45656,45673,45684,45701,45722,45725,45727,45745,45750,45761-45762,45764-45765,45783-45784,45800,45819,45826,45861,45863,45867,45869,45875,45885,45935-45936,45971,45979,45990,45997,46019,46073,46320,46403-46404,46408-46409,46472,46474-46476,46478,46483,46485,46682,46893-46896,46996,46999,47225,47313,47318,47341,47404,47633-47638,47790,47867,47872-47873,47887,47889,47912,47948-47951,47984,48121,48213,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49306,49335,49358,49360,49362,49369,49371,49380,49382
-49388,49452,49548,49636,49779,49781-49784,49786,49836,49876,49933,49937-49940,49983,49989,50017,50126,50176,50185,50192,50267-50268,50285,50298-50299,50379,50387,50413,50416,50432,50435-50436,50441-50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches52githubworkflowscodingstandardsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/coding-standards.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/coding-standards.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/coding-standards.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: Coding Standards
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # JSHint was introduced in WordPress 3.8.
+ # PHPCS checking was introduced in WordPress 5.1.
</ins><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="cx" style="display: block; padding: 0 10px"> branches:
</span><span class="cx" style="display: block; padding: 0 10px"> - master
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # JSHint was introduced in WordPress 3.8.
- # PHPCS checking was introduced in WordPress 5.1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> - '3.[89]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> tags:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +13,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '3.[89]*'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> pull_request:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px"> # Runs PHP coding standards checks.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,10 +56,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Set up PHP
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: shivammathur/setup-php@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> php-version: '7.3'
</span><span class="cx" style="display: block; padding: 0 10px"> coverage: none
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> composer --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: ramsey/composer-install@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> composer-options: "--no-progress --no-ansi --no-interaction"
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,12 +116,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install NodeJS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/setup-node@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version: 14
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache NodeJS modules
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-node-modules
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +128,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # npm cache files are stored in `~/.npm` on Linux/macOS
</span><span class="cx" style="display: block; padding: 0 10px"> path: ~/.npm
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore-keys: |
- ${{ runner.os }}-npm-
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> node --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npx install-changed --install-command="npm ci"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: npm ci
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run JSHint
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run grunt jshint
</span></span></pre></div>
<a id="branches52githubworkflowsendtoendtestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/end-to-end-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/end-to-end-tests.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/end-to-end-tests.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: End-to-end Tests
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # The end to end test suite was introduced in WordPress 5.3.
</ins><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="cx" style="display: block; padding: 0 10px"> branches:
</span><span class="cx" style="display: block; padding: 0 10px"> - master
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # The end to end test suite was introduced in WordPress 5.3.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> - '5.[3-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[6-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> tags:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +12,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '5.[3-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[6-9].[0-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> pull_request:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ branches:
+ - master
+ - trunk
+ - '5.[3-9]'
+ - '[6-9].[0-9]'
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_DIR: build
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cancel previous runs of this workflow (pull requests only)
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.event_name == 'pull_request' }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: styfle/cancel-workflow-action@0.5.0
- with:
- access_token: ${{ github.token }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Configure environment variables
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,12 +70,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> locale -a
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install NodeJS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/setup-node@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version: 14
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache NodeJS modules
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-node-modules
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,11 +82,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # npm cache files are stored in `~/.npm` on Linux/macOS
</span><span class="cx" style="display: block; padding: 0 10px"> path: ~/.npm
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore-keys: |
- ${{ runner.os }}-npm-
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npx install-changed --install-command="npm ci"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: npm ci
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Build WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run build
</span></span></pre></div>
<a id="branches52githubworkflowsjavascripttestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/javascript-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/javascript-tests.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/javascript-tests.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: JavaScript Tests
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # JavaScript testing was introduced in WordPress 3.8.
</ins><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="cx" style="display: block; padding: 0 10px"> branches:
</span><span class="cx" style="display: block; padding: 0 10px"> - master
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # JavaScript testing was introduced in WordPress 3.8.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> - '3.[89]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> tags:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +12,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '3.[89]*'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> pull_request:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px"> # Runs the QUnit tests for WordPress.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,12 +53,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cancel previous runs of this workflow (pull requests only)
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.event_name == 'pull_request' }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: styfle/cancel-workflow-action@0.5.0
- with:
- access_token: ${{ github.token }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,12 +66,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> svn --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install NodeJS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/setup-node@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version: 14
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cache NodeJS modules
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-node-modules
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,8 +78,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # npm cache files are stored in `~/.npm` on Linux/macOS
</span><span class="cx" style="display: block; padding: 0 10px"> path: ~/.npm
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore-keys: |
- ${{ runner.os }}-npm-
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Log debug information
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> node --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npx install-changed --install-command="npm ci"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: npm ci
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run QUnit tests
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run grunt qunit:compiled
</span></span></pre></div>
<a id="branches52githubworkflowsphpcompatibilityyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/php-compatibility.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/php-compatibility.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/php-compatibility.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name: PHP Compatibility
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> on:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # PHP compatibility testing was introduced in WordPress 5.5.
</ins><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="cx" style="display: block; padding: 0 10px"> branches:
</span><span class="cx" style="display: block; padding: 0 10px"> - master
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # The PHP compatibility testing was introduced in WordPress 5.5.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> - '5.[5-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[6-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> tags:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +12,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '5.[5-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[6-9].[0-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> pull_request:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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:
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,10 +50,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout repository
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Set up PHP
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: shivammathur/setup-php@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> php-version: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> coverage: none
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> composer --version
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: ramsey/composer-install@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> composer-options: "--no-progress --no-ansi --no-interaction"
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches52githubworkflowsphpunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/phpunit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/phpunit-tests.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/phpunit-tests.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> push:
</span><span class="cx" style="display: block; padding: 0 10px"> branches:
</span><span class="cx" style="display: block; padding: 0 10px"> - master
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - trunk
</ins><span class="cx" style="display: block; padding: 0 10px"> - '3.[7-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]'
</span><span class="cx" style="display: block; padding: 0 10px"> tags:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,33 +11,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - '3.[7-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> - '[4-9].[0-9]*'
</span><span class="cx" style="display: block; padding: 0 10px"> pull_request:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ branches:
+ - master
+ - trunk
+ - '3.[7-9]'
+ - '[4-9].[0-9]'
+ workflow_dispatch:
</ins><span class="cx" style="display: block; padding: 0 10px"> # Once weekly On Sundays at 00:00 UTC.
</span><span class="cx" style="display: block; padding: 0 10px"> schedule:
</span><span class="cx" style="display: block; padding: 0 10px"> - cron: '0 0 * * 0'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LOCAL_DIR: build
</del><span class="cx" style="display: block; padding: 0 10px"> PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
</span><span class="cx" style="display: block; padding: 0 10px"> COMPOSER_INSTALL: ${{ false }}
</span><span class="cx" style="display: block; padding: 0 10px"> # Controls which NPM script to use for running PHPUnit tests. Options ar `php` and `php-composer`.
</span><span class="cx" style="display: block; padding: 0 10px"> PHPUNIT_SCRIPT: php
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_PHP_MEMCACHED: ${{ false }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SLOW_TESTS: 'external-http,media,restapi'
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> jobs:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Sets up WordPress for testing or development use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Sets up the workflow for testing.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Cancels all previous workflow runs for pull requests that have not completed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - 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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setup-workflow:
+ name: Setup Workflow
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,73 +42,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Cancel previous runs of this workflow (pull requests only)
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.event_name == 'pull_request' }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: styfle/cancel-workflow-action@0.5.0
- with:
- access_token: ${{ github.token }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - 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
-
</del><span class="cx" style="display: block; padding: 0 10px"> # Runs the PHPUnit tests for WordPress.
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Performs the following steps:
</span><span class="cx" style="display: block; padding: 0 10px"> # - Set environment variables.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets up the environment variables needed for testing with memcached (if desired).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # - Downloads the built WordPress artifact from the previous job.
- # - Unzips the artifact.
</del><span class="cx" style="display: block; padding: 0 10px"> # - Installs NodeJS 14.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Sets up caching for NPM.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # _ Installs NPM dependencies using install-changed to hash the `package.json` file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs NPM dependencies
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Configures caching for Composer.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # _ Installs Composer dependencies (if desired).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # - Installs Composer dependencies (if desired).
</ins><span class="cx" style="display: block; padding: 0 10px"> # - Logs Docker debug information (about both the Docker installation within the runner).
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the WordPress Docker container.
</span><span class="cx" style="display: block; padding: 0 10px"> # - Starts the memcached server after the Docker network has been created (if desired).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,27 +68,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # - Submit the test results to the WordPress.org host test results.
</span><span class="cx" style="display: block; padding: 0 10px"> # - todo: Configure Slack notifications for failing tests.
</span><span class="cx" style="display: block; padding: 0 10px"> test-php:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- name: ${{ matrix.php }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
- needs: setup-wordpress
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }} ${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
+ needs: setup-workflow
</ins><span class="cx" style="display: block; padding: 0 10px"> runs-on: ${{ matrix.os }}
</span><span class="cx" style="display: block; padding: 0 10px"> strategy:
</span><span class="cx" style="display: block; padding: 0 10px"> matrix:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- php: [ '7.3', '7.2', '7.1', '7.0', '5.6' ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ php: [ '5.6', '7.0', '7.1', '7.2', '7.3' ]
</ins><span class="cx" style="display: block; padding: 0 10px"> os: [ ubuntu-latest ]
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: [ false ]
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ split_slow: [ false ]
+ multisite: [ false, true ]
</ins><span class="cx" style="display: block; padding: 0 10px"> include:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Include job for PHP 7.3 with memcached.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # 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.3 with memcached.
</ins><span class="cx" style="display: block; padding: 0 10px"> - php: '7.3'
</span><span class="cx" style="display: block; padding: 0 10px"> os: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: true
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ multisite: false
+ - php: '7.3'
+ os: ubuntu-latest
+ memcached: true
+ multisite: true
</ins><span class="cx" style="display: block; padding: 0 10px"> # Report the results of the PHP 7.3 without memcached job.
</span><span class="cx" style="display: block; padding: 0 10px"> - php: '7.3'
</span><span class="cx" style="display: block; padding: 0 10px"> os: ubuntu-latest
</span><span class="cx" style="display: block; padding: 0 10px"> memcached: false
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ multisite: false
</ins><span class="cx" style="display: block; padding: 0 10px"> report: true
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_PHP: ${{ matrix.php }}-fpm
</span><span class="cx" style="display: block; padding: 0 10px"> LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Configure environment variables
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,21 +116,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
</span><span class="cx" style="display: block; padding: 0 10px"> echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Download the built WordPress artifact
- uses: actions/download-artifact@v2
- with:
- name: built-wp-${{ github.sha }}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Checkout repository
+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Unzip built artifact
- run: unzip built-wp-${{ github.sha }}.zip
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Install NodeJS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/setup-node@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> node-version: 14
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Use cached Node modules
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-node-modules
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,22 +132,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # npm cache files are stored in `~/.npm` on Linux/macOS
</span><span class="cx" style="display: block; padding: 0 10px"> path: ~/.npm
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore-keys: |
- ${{ runner.os }}-npm-
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Dependencies
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npx install-changed --install-command="npm ci"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ run: npm ci
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - name: Get composer cache directory
+ id: composer-cache
+ if: ${{ env.COMPOSER_INSTALL == true }}
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Cache Composer dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ env.COMPOSER_INSTALL == true }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/cache@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> cache-name: cache-composer-dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> path: ${{ steps.composer-cache.outputs.dir }}
</span><span class="cx" style="display: block; padding: 0 10px"> key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore-keys: |
- ${{ runner.os }}-php-${{ matrix.php }}-composer-
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install Composer dependencies
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ env.COMPOSER_INSTALL == true }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Start the Memcached server.
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ matrix.memcached }}
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
</ins><span class="cx" style="display: block; padding: 0 10px"> docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: General debug information
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,39 +194,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Install WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run env:install
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - 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
+
</ins><span class="cx" style="display: block; padding: 0 10px"> - name: Run PHPUnit tests
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ matrix.php >= '7.0' }}
+ run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run AJAX tests
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ ! matrix.split_slow && ! matrix.multisite }}
+ run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run tests as a multisite install
</span><span class="cx" style="display: block; padding: 0 10px"> run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run ms-files tests as a multisite install
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ matrix.multisite && ! matrix.split_slow }}
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Run external HTTP tests
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if: ${{ ! matrix.multisite && ! matrix.split_slow }}
</ins><span class="cx" style="display: block; padding: 0 10px"> run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - name: Run REST API tests
- run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group restapi-jsclient
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Checkout the WordPress Test Reporter
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- uses: actions/checkout@v2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> repository: 'WordPress/phpunit-test-runner'
</span><span class="cx" style="display: block; padding: 0 10px"> path: 'test-runner'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - 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
-
</del><span class="cx" style="display: block; padding: 0 10px"> - name: Submit test results to the WordPress.org host test results
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
</span><span class="cx" style="display: block; padding: 0 10px"> env:
</span></span></pre></div>
<a id="branches52githubworkflowstestnpmyml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.2/.github/workflows/test-npm.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/test-npm.yml (rev 0)
+++ branches/5.2/.github/workflows/test-npm.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,175 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+name: Test NPM
+
+on:
+ push:
+ branches:
+ - master
+ - trunk
+ - '3.[7-9]'
+ - '[4-9].[0-9]'
+ pull_request:
+ branches:
+ - master
+ - trunk
+ - '3.[7-9]'
+ - '[4-9].[0-9]'
+ paths:
+ # These files configure NPM. Changes could affect the outcome.
+ - 'package*.json'
+ # JavaScript files are built using NPM.
+ - '**.js'
+ # CSS and SCSS files are built using NPM.
+ - '**.scss'
+ - '**.css'
+ # Changes to workflow files should always verify all workflows are successful.
+ - '.github/workflows/**.yml'
+ workflow_dispatch:
+
+env:
+ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
+
+jobs:
+ # Prepares the workflow.
+ #
+ # Performs the following steps:
+ # - Cancels all previous workflow runs for pull requests that have not completed.
+ prepare-workflow:
+ name: Prepare the workflow
+ runs-on: ubuntu-latest
+ if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+
+ steps:
+ - name: Cancel previous runs of this workflow (pull requests only)
+ if: ${{ github.event_name == 'pull_request' }}
+ uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
+
+ # Verifies that installing NPM dependencies and building WordPress works as expected.
+ #
+ # Performs the following steps:
+ # - 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.
+ # - Cleans up after building WordPress to the `build` directory.
+ # - Builds WordPress to run from the `src` directory.
+ # - Cleans up after building WordPress to the `src` directory.
+ test-npm:
+ name: Test NPM on ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+ needs: prepare-workflow
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ ubuntu-latest, windows-latest ]
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+ - name: Log debug information
+ run: |
+ npm --version
+ node --version
+ curl --version
+ git --version
+ svn --version
+
+ - name: Install NodeJS
+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+ with:
+ node-version: 14
+
+ - name: Cache NodeJS modules (Ubuntu & MacOS)
+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+ if: ${{ matrix.os != 'windows-latest' }}
+ with:
+ path: ~/.npm
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+
+ - name: Get NPM cache directory (Windows only)
+ if: ${{ matrix.os == 'windows-latest' }}
+ id: npm-cache
+ run: echo "::set-output name=dir::$(npm config get cache)"
+
+ - name: Cache NodeJS modules (Windows only)
+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+ if: ${{ matrix.os == 'windows-latest' }}
+ with:
+ path: ${{ steps.npm-cache.outputs.dir }}
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+
+ - name: Install Dependencies
+ run: npm ci
+
+ - name: Build WordPress
+ run: npm run build
+
+ - name: Clean after building
+ run: npm run grunt clean
+
+ - name: Build WordPress in /src
+ run: npm run build:dev
+
+ - name: Clean after building in /src
+ run: npm run grunt clean --dev
+
+ # Verifies that installing NPM dependencies and building WordPress works as expected on MacOS.
+ #
+ # This is a separate job in order to that more strict conditions can be used.
+ #
+ # Performs the following steps:
+ # - 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.
+ # - Cleans up after building WordPress to the `build` directory.
+ # - Builds WordPress to run from the `src` directory.
+ # - Cleans up after building WordPress to the `src` directory.
+ test-npm-macos:
+ name: Test NPM on MacOS
+ runs-on: macos-latest
+ if: ${{ github.repository == 'WordPress/wordpress-develop' }}
+ needs: prepare-workflow
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+
+ - name: Log debug information
+ run: |
+ npm --version
+ node --version
+ curl --version
+ git --version
+ svn --version
+
+ - name: Install NodeJS
+ uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
+ with:
+ node-version: 14
+
+ - name: Cache NodeJS modules
+ uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
+ if: ${{ matrix.os != 'windows-latest' }}
+ with:
+ path: ~/.npm
+ key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+
+ - name: Install Dependencies
+ run: npm ci
+
+ - name: Build WordPress
+ run: npm run build
+
+ - name: Clean after building
+ run: npm run grunt clean
+
+ - name: Build WordPress in /src
+ run: npm run build:dev
+
+ - name: Clean after building in /src
+ run: npm run grunt clean --dev
</ins></span></pre></div>
<a id="branches52githubworkflowstestoldbranchesyml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.2/.github/workflows/test-old-branches.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/test-old-branches.yml (rev 0)
+++ branches/5.2/.github/workflows/test-old-branches.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,58 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+name: Test old branches
+
+on:
+ # Once weekly On Mondays at 00:00 UTC.
+ schedule:
+ - cron: '0 0 1,15 * *'
+
+jobs:
+ dispatch-workflows-for-old-branches:
+ name: ${{ matrix.workflow }} for ${{ matrix.branch }}
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ workflow: [
+ 'coding-standards.yml',
+ 'javascript-tests.yml',
+ 'phpunit-tests.yml',
+ 'test-npm.yml'
+ ]
+ branch: [
+ '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
+ '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1', '4.0',
+ '3.9', '3.8', '3.7'
+ ]
+ include:
+ # PHP Compatibility testing was introduced in 5.5.
+ - branch: '5.7'
+ workflow: 'php-compatibility.yml'
+ - branch: '5.6'
+ workflow: 'php-compatibility.yml'
+ - branch: '5.5'
+ workflow: 'php-compatibility.yml'
+
+ # End to End testing was introduced in 5.3 but later removed as there were no meaningful assertions.
+ # Only the officially supported major branch runs E2E tests so that more assertions can be added, and the
+ # workflow does not continue to run needlessly on old branches.
+ - branch: '5.7'
+ workflow: 'end-to-end-tests.yml'
+ exclude:
+ # Coding standards and JavaScript testing did not take place in 3.7.
+ - branch: '3.7'
+ workflow: 'coding-standards.yml'
+ - branch: '3.7'
+ workflow: 'javascript-tests.yml'
+
+ steps:
+ - name: Dispatch workflow run
+ uses: actions/github-script@47f7cf65b5ced0830a325f705cad64f2f58dddf7 # v3.1.0
+ with:
+ github-token: ${{ secrets.GHA_OLD_BRANCH_DISPATCH }}
+ script: |
+ github.actions.createWorkflowDispatch({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ workflow_id: '${{ matrix.workflow }}',
+ ref: '${{ matrix.branch }}'
+ });
</ins></span></pre></div>
<a id="branches52githubworkflowsverifynpmonwindowsyml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/5.2/.github/workflows/verify-npm-on-windows.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/verify-npm-on-windows.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/verify-npm-on-windows.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,71 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-name: Test NPM on Windows
-
-on:
- push:
- branches:
- - master
- - '3.[7-9]'
- - '[4-9].[0-9]'
- pull_request:
-
-env:
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
-
-jobs:
- # Verifies that installing NPM dependencies and building WordPress works on Windows.
- #
- # 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.
- test-npm:
- name: Tests NPM on Windows
- runs-on: windows-latest
- if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
-
- steps:
- - 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: |
- npm --version
- node --version
- curl --version
- git --version
- svn --version
-
- - name: Install NodeJS
- uses: actions/setup-node@v1
- with:
- node-version: 14
-
- - name: Get NPM cache directory
- id: npm-cache
- run: echo "::set-output name=dir::$(npm config get cache)"
-
- - name: Cache NodeJS modules
- uses: actions/cache@v2
- env:
- cache-name: cache-node-modules
- with:
- path: ${{ steps.npm-cache.outputs.dir }}
- 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
</del></span></pre></div>
<a id="branches52githubworkflowswelcomenewcontributorsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/.github/workflows/welcome-new-contributors.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/.github/workflows/welcome-new-contributors.yml 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/.github/workflows/welcome-new-contributors.yml 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if: ${{ github.repository == 'WordPress/wordpress-develop' }}
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> steps:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - uses: bubkoo/welcome-action@v1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.3
</ins><span class="cx" style="display: block; padding: 0 10px"> with:
</span><span class="cx" style="display: block; padding: 0 10px"> GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
</span><span class="cx" style="display: block; padding: 0 10px"> FIRST_PR_COMMENT: >
</span></span></pre></div>
<a id="branches52Gruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/Gruntfile.js 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/Gruntfile.js 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = function(grunt) {
</span><span class="cx" style="display: block; padding: 0 10px"> var path = require('path'),
</span><span class="cx" style="display: block; padding: 0 10px"> fs = require( 'fs' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ glob = require( 'glob' ),
+ assert = require( 'assert' ).strict,
</ins><span class="cx" style="display: block; padding: 0 10px"> spawn = require( 'child_process' ).spawnSync,
</span><span class="cx" style="display: block; padding: 0 10px"> SOURCE_DIR = 'src/',
</span><span class="cx" style="display: block; padding: 0 10px"> BUILD_DIR = 'build/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,6 +489,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-admin/css/*.css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/css/*.css',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude minified and already processed files, and files from external packages.
+ // These are present when running `grunt build` after `grunt --dev`.
+ '!wp-admin/css/*-rtl.css',
+ '!wp-includes/css/*-rtl.css',
+ '!wp-admin/css/*.min.css',
+ '!wp-includes/css/*.min.css',
+ '!wp-includes/css/dist',
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exceptions
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/css/dashicons.css',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/css/wp-embed-template.css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1362,6 +1372,126 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy:version',
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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.`
+ );
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask( 'build', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( grunt.option( 'dev' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.task.run( [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1375,6 +1505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'build:css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:emoji',
</span><span class="cx" style="display: block; padding: 0 10px"> 'includes:embed',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'verify:build'
</ins><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span></span></pre></div>
<a id="branches52packagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/package-lock.json 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/package-lock.json 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,9 +73,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "@sideway/address": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
- "integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
+ "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "@hapi/hoek": "^9.0.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2906,9 +2906,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "check-node-version": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "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==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.1.0.tgz",
+ "integrity": "sha512-TSXGsyfW5/xY2QseuJn8/hleO2AU7HxVCdkc900jp1vcfzF840GkjvRT7CHl8sRtWn23n3X3k0cwH9RXeRwhfw==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "chalk": "^3.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3162,9 +3162,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "clean-css": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
- "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "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==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "source-map": "~0.6.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6142,35 +6142,95 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-cssmin": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
- "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
+ "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "chalk": "^2.4.1",
- "clean-css": "~4.2.1",
- "maxmin": "^2.1.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "chalk": "^4.1.0",
+ "clean-css": "^5.0.1",
+ "maxmin": "^3.0.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span><span class="cx" style="display: block; padding: 0 10px"> "ansi-styles": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "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==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "color-convert": "^1.9.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "color-convert": "^2.0.1"
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "chalk": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
- "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+ "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"
+ }
+ },
+ "gzip-size": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+ "dev": true,
+ "requires": {
+ "duplexer": "^0.1.1",
+ "pify": "^4.0.1"
+ }
+ },
+ "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"
+ }
+ },
+ "supports-color": {
+ "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"
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7957,9 +8017,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "joi": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "17.3.0",
- "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
- "integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "17.4.0",
+ "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
+ "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "@hapi/hoek": "^9.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11244,6 +11304,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "dev": true
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "randombytes": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "2.1.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12023,10 +12089,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "run-parallel": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
- "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
- "dev": true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "requires": {
+ "queue-microtask": "^1.2.2"
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "run-queue": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.0.3",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12169,9 +12238,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "sass": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "1.32.6",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
- "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "1.32.8",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
+ "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "chokidar": ">=2.0.0 <4.0.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14135,9 +14204,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "uglify-js": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "3.12.6",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz",
- "integrity": "sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "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==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "uglify-to-browserify": {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14669,28 +14738,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "wait-on": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "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==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
+ "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "axios": "^0.21.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "joi": "^17.3.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "lodash": "^4.17.20",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "lodash": "^4.17.21",
</ins><span class="cx" style="display: block; padding: 0 10px"> "minimist": "^1.2.5",
</span><span class="cx" style="display: block; padding: 0 10px"> "rxjs": "^6.6.3"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span><span class="cx" style="display: block; padding: 0 10px"> "lodash": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "4.17.20",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
- "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "rxjs": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "6.6.3",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
- "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "6.6.6",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
+ "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
</ins><span class="cx" style="display: block; padding: 0 10px"> "dev": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": {
</span><span class="cx" style="display: block; padding: 0 10px"> "tslib": "^1.9.0"
</span></span></pre></div>
<a id="branches52packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/package.json 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/package.json 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "@wordpress/custom-templated-path-webpack-plugin": "1.2.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "@wordpress/library-export-default-webpack-plugin": "1.1.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "autoprefixer": "^9.8.6",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "check-node-version": "4.0.3",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "check-node-version": "4.1.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "copy-webpack-plugin": "^5.1.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "cssnano": "4.1.10",
</span><span class="cx" style="display: block; padding: 0 10px"> "dotenv": "^8.2.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-clean": "~2.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-concat": "~1.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-copy": "~1.0.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "grunt-contrib-cssmin": "~3.0.0",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "grunt-contrib-cssmin": "~4.0.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-imagemin": "~4.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-jshint": "3.0.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-qunit": "^4.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,11 +58,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "ink-docstrap": "1.3.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "jquery-migrate": "1.4.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "matchdep": "~2.0.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "sass": "^1.32.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "sass": "^1.32.8",
</ins><span class="cx" style="display: block; padding: 0 10px"> "source-map-loader": "^1.1.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "uglify-js": "^3.12.6",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "uglify-js": "^3.13.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> "uglifyjs-webpack-plugin": "2.2.0",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "wait-on": "^5.2.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "wait-on": "^5.3.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "webpack": "4.43.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack-dev-server": "3.11.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack-livereload-plugin": "2.3.0"
</span></span></pre></div>
<a id="branches52testsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/includes/abstract-testcase.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/includes/abstract-testcase.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,4 +1231,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52testsphpunittestsadminincludesPluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/admin/includesPlugin.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/admin/includesPlugin.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group admin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Admin_includesPlugin extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
+ self::_back_up_mu_plugins();
+ }
+
+ public static function wpTearDownAfterClass() {
+ self::_restore_mu_plugins();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_plugin_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,12 +118,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'list_files_test_plugin/list_files_test_plugin.php',
</span><span class="cx" style="display: block; padding: 0 10px"> 'list_files_test_plugin/subdir/subfile.php',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $plugin_files );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $sub_dir . '/subfile.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $plugin[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> rmdir( $sub_dir );
</span><span class="cx" style="display: block; padding: 0 10px"> rmdir( $plugin_dir );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSame( $expected, $plugin_files );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,22 +131,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_when_mu_plugins_exists_but_is_empty() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(), get_mu_plugins() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = get_mu_plugins();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up.
- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array(), $mu_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,20 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_when_mu_plugins_directory_does_not_exist() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFileNotExists( WPMU_PLUGIN_DIR );
+ $this->assertSame( array(), get_mu_plugins() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,24 +152,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_ignore_index_php_containing_silence_is_golden() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Silence is golden.', 'index.php', WPMU_PLUGIN_DIR );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(), get_mu_plugins() );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mu_plugins = get_mu_plugins();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/index.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array(), $mu_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,25 +168,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_not_ignore_index_php_containing_something_other_than_silence_is_golden() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Silence is not golden.', 'index.php', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_mu_plugins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( 'index.php' ), array_keys( $found ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/index.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rmdir( WPMU_PLUGIN_DIR );
+
+ $this->assertSame( array( 'index.php' ), array_keys( $found ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,27 +184,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_mu_plugins
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_mu_plugins_should_ignore_files_without_php_extensions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_dir( WPMU_PLUGIN_DIR ) ) {
- $exists = true;
- $this->_back_up_mu_plugins();
- } else {
- $exists = false;
- mkdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mkdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Test', 'foo.php', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_create_plugin( '<?php\n//Test 2', 'bar.txt', WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_mu_plugins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( 'foo.php' ), array_keys( $found ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up.
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/foo.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( WPMU_PLUGIN_DIR . '/bar.txt' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists ) {
- $this->_restore_mu_plugins();
- } else {
- rmdir( WPMU_PLUGIN_DIR );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSame( array( 'foo.php' ), array_keys( $found ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,33 +353,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Move existing mu-plugins to wp-content/mu-plugin/backup.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Move existing mu-plugins to wp-content/mu-plugin-backup.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function _back_up_mu_plugins() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function _back_up_mu_plugins() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( WPMU_PLUGIN_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_dir( $mu_bu_dir ) ) {
- mkdir( $mu_bu_dir );
- }
-
- $files_to_move = array();
- if ( $mu_plugins = opendir( WPMU_PLUGIN_DIR ) ) {
- 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 );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rename( WPMU_PLUGIN_DIR, $mu_bu_dir );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,25 +373,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function _restore_mu_plugins() {
- $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
- $files_to_move = array();
- if ( is_dir( $mu_bu_dir ) && $mu_plugins = opendir( $mu_bu_dir ) ) {
- while ( false !== $plugin = readdir( $mu_plugins ) ) {
- if ( 0 !== strpos( $plugin, '.' ) ) {
- $files_to_move[] = $plugin;
- }
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static function _restore_mu_plugins() {
+ $mu_bu_dir = WP_CONTENT_DIR . '/mu-plugin-backup';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @closedir( $mu_plugins );
-
- foreach ( $files_to_move as $file_to_move ) {
- rename( $mu_bu_dir . '/' . $file_to_move, WPMU_PLUGIN_DIR . '/' . $file_to_move );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_dir( WPMU_PLUGIN_DIR ) ) {
+ rmdir( WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( $mu_bu_dir ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rmdir( $mu_bu_dir );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rename( $mu_bu_dir, WPMU_PLUGIN_DIR );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches52testsphpunittestsadminincludesUpdateCorephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/5.2/tests/phpunit/tests/admin/includesUpdateCore.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/admin/includesUpdateCore.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/admin/includesUpdateCore.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,34 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group admin
- * @group upgrade
- */
-class Tests_Admin_IncludesUpdateCore extends WP_UnitTestCase {
- public function data_old_files() {
- global $_old_files;
-
- require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
-
- $files = $_old_files;
-
- foreach ( $files as &$file ) {
- $file = array( $file );
- }
-
- return $files;
- }
-
- /**
- * Ensure no project files are inside `$_old_files` in the build directory.
- *
- * @ticket 36083
- *
- * @dataProvider data_old_files
- *
- * @param string $file File name.
- */
- public function test_new_files_are_not_in_old_files_array_compiled( $file ) {
- $this->assertFileNotExists( dirname( ABSPATH ) . '/build/' . $file );
- }
-}
</del></span></pre></div>
<a id="branches52testsphpunittestsdependenciesjqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/dependencies/jquery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/dependencies/jquery.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/dependencies/jquery.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22896
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="branches52testsphpunittestsdependenciesmediaelementjsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/5.2/tests/phpunit/tests/dependencies/mediaelementjs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/dependencies/mediaelementjs.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/dependencies/mediaelementjs.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,36 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group dependencies
- * @group scripts
- */
-class Tests_Dependencies_MediaElementjs extends WP_UnitTestCase {
- /**
- * Test if the MediaElement.js Flash fallbacks have been re-added.
- *
- * MediaElement's Flash fallbacks were removed in WordPress 4.9.2 due to limited use cases and
- * a history of security vulnerabilities. It's unlikely that there'll ever be a need to
- * restore them in the future, and doing so could introduce security vulnerabilities. If you
- * want to re-add them, please discuss that with the Security team first.
- *
- * @since 5.1.0
- *
- * @ticket 42720
- */
- function test_exclusion_of_flash() {
- $mejs_folder = ABSPATH . WPINC . '/js/mediaelement';
- $js_files = glob( $mejs_folder . '/*.js' );
-
- /*
- * The path in $mejs_folder is hardcoded, so this is just a sanity check to make sure the
- * correct directory is used, in case it gets renamed in the future.
- */
- $this->assertGreaterThan( 0, count( $js_files ) );
-
- $mejs_directory_iterator = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $mejs_folder ) );
- $mejs_swf_iterator = new RegexIterator( $mejs_directory_iterator, '/\.swf$/i', RecursiveRegexIterator::GET_MATCH );
-
- // Make sure the Flash files haven't been re-added accidentally.
- $this->assertCount( 0, iterator_to_array( $mejs_swf_iterator ) );
- }
-}
</del></span></pre></div>
<a id="branches52testsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/dependencies/scripts.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/dependencies/scripts.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1341,16 +1341,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array_keys( $wp_enqueue_code_editor['htmlhint'] )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- 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" );
- }
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52testsphpunittestsformattingEmojiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/formatting/Emoji.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/formatting/Emoji.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/formatting/Emoji.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36525
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unfiltered_emoji_cdns() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo( '_print_emoji_detection_script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( wp_json_encode( $this->png_cdn ), $output );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'emoji_svg_url', array( $this, '_filtered_emoji_svn_cdn' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo( '_print_emoji_detection_script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( wp_json_encode( $this->png_cdn ), $output );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'emoji_url', array( $this, '_filtered_emoji_png_cdn' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // `_print_emoji_detection_script()` assumes `wp-includes/js/wp-emoji-loader.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-emoji-loader.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo( '_print_emoji_detection_script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( wp_json_encode( $filtered_png_cdn ), $output );
</span></span></pre></div>
<a id="branches52testsphpunittestsoembedcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/oembed/controller.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/oembed/controller.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,6 +34,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'administrator@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // `get_post_embed_html()` assumes `wp-includes/js/wp-embed.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpTearDownAfterClass() {
</span></span></pre></div>
<a id="branches52testsphpunittestsoembedgetResponseDataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/oembed/getResponseData.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/oembed/getResponseData.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/oembed/getResponseData.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group oembed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_oEmbed_Response_Data extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_oembed_response_data_non_existent_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_oembed_response_data( 0, 100 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52testsphpunittestsoembedtemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/oembed/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/oembed/template.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/oembed/template.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // `print_embed_scripts()` assumes `wp-includes/js/wp-embed-template.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-embed-template.js' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . WPINC . '/theme-compat/embed.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = ob_get_clean();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,50 +293,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34698
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_js_no_ampersands() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( '&', file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @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 `grunt 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 ) );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches52testsphpunittestsoembedwpOembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/oembed/wpOembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/oembed/wpOembed.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/oembed/wpOembed.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,6 +18,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->oembed = _wp_oembed_get_object();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pre_oembed_result_filtered = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // `get_post_embed_html()` assumes `wp-includes/js/wp-embed.js` is present:
+ self::touch( ABSPATH . WPINC . '/js/wp-embed.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function _filter_pre_oembed_result( $result ) {
</span></span></pre></div>
<a id="branches52testsphpunittestsshortcodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/tests/phpunit/tests/shortcode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/tests/phpunit/tests/shortcode.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/tests/phpunit/tests/shortcode.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +745,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_php_and_js_shortcode_attribute_regexes_match() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file = file_get_contents( ABSPATH . WPINC . '/js/shortcode.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = file_get_contents( ABSPATH . 'js/_enqueues/wp/shortcode.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $matched = preg_match( '|\s+pattern = (\/.+\/)g;|', $file, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> $php = get_shortcode_atts_regex();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches52wptestsconfigsamplephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/wp-tests-config-sample.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/wp-tests-config-sample.php 2021-03-26 19:22:10 UTC (rev 50605)
+++ branches/5.2/wp-tests-config-sample.php 2021-03-26 20:02:01 UTC (rev 50606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
- define( 'ABSPATH', dirname( __FILE__ ) . '/build/' );
-} else {
- define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Path to the theme to test with.
</span></span></pre>
</div>
</div>
</body>
</html>