<!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>[49528] branches/5.1: Build/Test Tools: Backport the local Docker environment 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/49528">49528</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/49528","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>2020-11-06 17:24:43 +0000 (Fri, 06 Nov 2020)</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 the local Docker environment to the 5.2 branch.
This commit introduces the Docker-based local WordPress development environment to the 5.2 branch and converts the Travis test jobs to utilize this environment for easier and more consistent testing.
Merges [45745,45762,45783-45784,45800,45819,45885,46320,46999,47225,47912,48121,49335,49358,49360,49362] to the 5.1 branch.
See <a href="https://core.trac.wordpress.org/ticket/48301">#48301</a>, <a href="https://core.trac.wordpress.org/ticket/47767">#47767</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches51travisyml">branches/5.1/.travis.yml</a></li>
<li><a href="#branches51packagelockjson">branches/5.1/package-lock.json</a></li>
<li><a href="#branches51packagejson">branches/5.1/package.json</a></li>
<li><a href="#branches51testsphpunitincludesobjectcachephp">branches/5.1/tests/phpunit/includes/object-cache.php</a></li>
<li><a href="#branches51testsphpunittestsajaxCustomizeMenusphp">branches/5.1/tests/phpunit/tests/ajax/CustomizeMenus.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches51env">branches/5.1/.env</a></li>
<li><a href="#branches51dockercomposeyml">branches/5.1/docker-compose.yml</a></li>
<li>branches/5.1/tools/local-env/</li>
<li><a href="#branches51toolslocalenvdefaulttemplate">branches/5.1/tools/local-env/default.template</a></li>
<li><a href="#branches51toolslocalenvmysqlinitsql">branches/5.1/tools/local-env/mysql-init.sql</a></li>
<li><a href="#branches51toolslocalenvphpconfigini">branches/5.1/tools/local-env/php-config.ini</a></li>
<li><a href="#branches51toolslocalenvphpunitconfigini">branches/5.1/tools/local-env/phpunit-config.ini</a></li>
<li>branches/5.1/tools/local-env/scripts/</li>
<li><a href="#branches51toolslocalenvscriptsdockerjs">branches/5.1/tools/local-env/scripts/docker.js</a></li>
<li><a href="#branches51toolslocalenvscriptsinstalljs">branches/5.1/tools/local-env/scripts/install.js</a></li>
<li><a href="#branches51toolslocalenvscriptsstartjs">branches/5.1/tools/local-env/scripts/start.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches51">branches/5.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.1
</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.1 2020-11-06 17:17:17 UTC (rev 49527)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.1 2020-11-06 17:24:43 UTC (rev 49528)
</ins><a id="branches51"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.1</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:44744,44747-44749,44760,44762,44768-44769,44788,44794,44797,44799,44801,44805-44806,44814,44816,44829,44833,44842,44858,44925-44926,44993,45067,45936,45971,45990,45997,46019,46474-46478,46483,46485,46893-46896,47313,47318,47341,47633-47638,47887,47889,47948-47951,47984,48241,48338,48341,49306,49380,49382-49388
</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:44744,44747-44749,44760,44762,44768-44769,44788,44794,44797,44799,44801,44805-44806,44814,44816,44829,44833,44842,44858,44925-44926,44993,45067,45745,45762,45783-45784,45800,45819,45885,45936,45971,45990,45997,46019,46320,46474-46478,46483,46485,46893-46896,46999,47225,47313,47318,47341,47633-47638,47887,47889,47912,47948-47951,47984,48121,48241,48338,48341,49306,49335,49358,49360,49362,49380,49382-49388
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches51env"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/.env</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/.env (rev 0)
+++ branches/5.1/.env 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,59 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+##
+# Default configuration options for the local dev environment.
+#
+# All of these options can be overridden by setting them as environment variables before starting
+# the environment. You will need to restart your environment when changing any of these.
+#
+# Below, the following substitutions can be made:
+# - '{version}': any major.minor PHP version from 5.2 onwards.
+# - '{phpunit_version}': any major PHPUnit version starting with 4.
+##
+
+# The site will be available at http://localhost:LOCAL_PORT
+LOCAL_PORT=8889
+
+# Where to run WordPress from. Valid options are 'src' and 'build'.
+LOCAL_DIR=src
+
+# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
+LOCAL_PHP=7.3-fpm
+
+##
+# The PHPUnit version to use when running tests.
+#
+# Support for new PHPUnit versions is not backported to past versions, so some old WordPress branches require an older
+# version to run tests.
+#
+# Valid versions are:
+# - 'latest' for the highest version of PHPUnit supported on the highest version of PHP supported.
+# - '{version}-fpm' for the highest version of PHPUnit supported on the specified version of PHP.
+# - '{phpunit_version}-php-{version}-fpm' for a specific version of PHPUnit on the specified version of PHP. This format
+# is only available for PHP versions 5.6 and higher.
+#
+# For the full list of available options, see https://hub.docker.com/r/wordpressdevelop/phpunit/tags.
+#
+# For full documentation on PHPUnit compatibility and WordPress versions, see
+# https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/.
+#
+# This defaults to the value assigned to the value of LOCAL_PHP.
+##
+LOCAL_PHPUNIT=${LOCAL_PHP}
+
+# Whether or not to enable XDebug.
+LOCAL_PHP_XDEBUG=false
+
+# Whether or not to enable Memcached.
+LOCAL_PHP_MEMCACHED=false
+
+# The MySQL version to use. See https://hub.docker.com/_/mysql/ for valid versions.
+LOCAL_MYSQL=5.7
+
+# The debug settings to add to `wp-config.php`.
+LOCAL_WP_DEBUG=true
+LOCAL_WP_DEBUG_LOG=true
+LOCAL_WP_DEBUG_DISPLAY=true
+LOCAL_SCRIPT_DEBUG=true
+LOCAL_WP_ENVIRONMENT_TYPE=local
+
+# The URL to use when running e2e tests.
+WP_BASE_URL=http://localhost:${LOCAL_PORT}
</ins></span></pre></div>
<a id="branches51travisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/.travis.yml 2020-11-06 17:17:17 UTC (rev 49527)
+++ branches/5.1/.travis.yml 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,32 +1,59 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-sudo: false
-dist: trusty
</del><span class="cx" style="display: block; padding: 0 10px"> language: php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+services:
+ - docker
+
</ins><span class="cx" style="display: block; padding: 0 10px"> cache:
</span><span class="cx" style="display: block; padding: 0 10px"> apt: true
</span><span class="cx" style="display: block; padding: 0 10px"> directories:
</span><span class="cx" style="display: block; padding: 0 10px"> - $HOME/.npm
</span><span class="cx" style="display: block; padding: 0 10px"> - vendor
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - $HOME/.composer/cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> global:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - WP_TRAVISCI=travis:phpunit
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - LOCAL_DIR: build
+ - COMPOSER_INSTALL: false
+ - NPM_INSTALL: true
+ - WP_INSTALL: true
+ - PHP_FPM_UID: "`id -u`"
+ - PHP_FPM_GID: "`id -g`"
+
</ins><span class="cx" style="display: block; padding: 0 10px"> matrix:
</span><span class="cx" style="display: block; padding: 0 10px"> include:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: 7.2
- env: WP_TRAVISCI=travis:format
- - php: 7.1
- env: WP_TRAVISCI=travis:js
- - php: 7.3
- - php: 7.0
- env: WP_TEST_REPORTER=true
- - php: 5.6
- env: WP_TRAVIS_OBJECT_CACHE=true
- services: memcached
- - php: 5.2
- dist: precise
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - env: WP_TRAVISCI=travis:format LOCAL_PHP=7.2-fpm LOCAL_PHPUNIT=7.2-fpm COMPOSER_INSTALL=true WP_INSTALL=false
+ name: "PHP Linting"
+ - env: WP_TRAVISCI=travis:js LOCAL_PHP=7.1-fpm WP_INSTALL=false
+ name: "JS Tests"
+ - env: LOCAL_PHP_MEMCACHED=true LOCAL_PHPUNIT=7.3-fpm WP_TRAVISCI=test:php
+ name: "PHPUnit Tests: PHP 7.3 with Memcached"
+ - env: LOCAL_PHP=7.0-fpm LOCAL_PHPUNIT=6-php-7.0-fpm WP_TEST_REPORTER=true WP_TRAVISCI=test:php
+ name: "PHPUnit Tests: PHP 7.0"
+ - env: LOCAL_PHP=5.6-fpm LOCAL_PHPUNIT=4-php-5.6-fpm WP_TRAVISCI=test:php
+ name: "PHPUnit Tests: PHP 5.6"
+ - env: WP_TRAVISCI=travis:phpunit WP_INSTALL=false
+ php: 5.2
+ dist: precise
+ fast_finish: true
+
</ins><span class="cx" style="display: block; padding: 0 10px"> before_install:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- |
- if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - |
+ if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+ travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
+ fi
+ - |
+ if [[ "$WP_TRAVISCI" != "travis:phpunit" ]]; then
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+ sudo apt-get update
+ sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+ fi
+ - |
+ sudo rm /usr/local/bin/docker-compose
+ curl -L https://github.com/docker/compose/releases/download/1.24.0/docker-compose-`uname -s`-`uname -m` > docker-compose
+ chmod +x docker-compose
+ sudo mv docker-compose /usr/local/bin
+ - |
+ if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
</ins><span class="cx" style="display: block; padding: 0 10px"> mysql -u root -e "CREATE DATABASE wordpress_tests;"
</span><span class="cx" style="display: block; padding: 0 10px"> cp wp-tests-config-sample.php wp-tests-config.php
</span><span class="cx" style="display: block; padding: 0 10px"> sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,90 +60,83 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sed -i "s/yourusernamehere/root/" wp-tests-config.php
</span><span class="cx" style="display: block; padding: 0 10px"> sed -i "s/yourpasswordhere//" wp-tests-config.php
</span><span class="cx" style="display: block; padding: 0 10px"> travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fi
-- |
- if [[ "$WP_TRAVIS_OBJECT_CACHE" == "true" ]]; then
- cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- fi
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fi
+
</ins><span class="cx" style="display: block; padding: 0 10px"> before_script:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- |
- # Remove Xdebug for a huge performance increase:
- if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
- phpenv config-rm xdebug.ini
- else
- echo "xdebug.ini does not exist"
- fi
-- |
- # Export Composer's global bin dir to PATH, but not on PHP 5.2:
- if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
- composer config --list --global
- export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }`
- fi
-- |
- # Install the specified version of PHPUnit depending on the PHP version:
- if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
- case "$TRAVIS_PHP_VERSION" in
- 7.3|7.2|7.1)
- echo "Using PHPUnit 7.x"
- travis_retry composer global require "phpunit/phpunit:^7"
- ;;
- 7.0)
- echo "Using PHPUnit 6.x"
- travis_retry composer global require "phpunit/phpunit:^6"
- ;;
- 5.6|5.5|5.4|5.3)
- echo "Using PHPUnit 4.x"
- travis_retry composer global require "phpunit/phpunit:^4"
- ;;
- 5.2)
- # Do nothing, use default PHPUnit 3.6.x
- echo "Using default PHPUnit, hopefully 3.6"
- ;;
- *)
- echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
- exit 1
- ;;
- esac
- fi
-- |
- # We only need to run composer install on the code formatting job.
- if [[ "$WP_TRAVISCI" == "travis:format" ]]; then
- composer --version
- travis_retry composer install
- fi
-- npm --version
-- node --version
-- nvm install
-- npm install -g grunt-cli
-- npm install
-- npm prune
-- mysql --version
-- phpenv versions
-- php --version
-- php -m
-- npm --version
-- node --version
-- |
- # Display PHPUnit information (for PHP tests only).
- if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
- which phpunit
- phpunit --version
- fi
-- curl --version
-- grunt --version
-- git --version
-- svn --version
-- locale -a
-script: grunt $WP_TRAVISCI
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - |
+ if [[ "$COMPOSER_INSTALL" == "true" ]]; then
+ docker-compose run --rm php composer --version
+ docker-compose run --rm php composer install
+ fi
+ - npm --version
+ - node --version
+ - nvm install
+ - |
+ if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+ phpenv config-rm xdebug.ini
+ npm install -g grunt-cli
+ mysql --version
+ phpenv versions
+ php --version
+ php -m
+ fi
+ - |
+ if [[ "$NPM_INSTALL" == "true" ]]; then
+ npm install
+ fi
+ - |
+ if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+ npm run env:start
+ npm run build
+ docker-compose run --rm mysql mysql --version
+ docker-compose run --rm php php --version
+ docker-compose run --rm php php -m
+ docker-compose run --rm phpunit phpunit --version
+ fi
+ - |
+ if [[ "$LOCAL_PHP_MEMCACHED" == "true" ]]; then
+ cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
+ # The memcached server needs to start after `npm run env:start`, which sets up the Docker network.
+ docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
+ fi
+ - |
+ if [[ "$WP_INSTALL" == "true" ]]; then
+ # Run the install process after memcached has started.
+ npm run env:install
+ fi
+ - npm --version
+ - node --version
+ - curl --version
+ - git --version
+ - svn --version
+ - php --version
+ - php -i
+ - locale -a
+
+script:
+ - |
+ if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+ npm run test:php -- --verbose -c phpunit.xml.dist &&
+ npm run test:php -- --verbose -c phpunit.xml.dist --group ajax &&
+ npm run test:php -- --verbose -c tests/phpunit/multisite.xml &&
+ npm run test:php -- --verbose -c tests/phpunit/multisite.xml --group ms-files &&
+ npm run test:php -- --verbose -c phpunit.xml.dist --group external-http &&
+ npm run test:php -- --verbose -c phpunit.xml.dist --group restapi-jsclient &&
+ # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
+ LOCAL_PHP_XDEBUG=true npm run test:php -- -v --group xdebug --exclude-group __fakegroup__
+ elif [[ "$WP_TRAVISCI" == "travis:format" ]]; then
+ docker-compose run --rm php composer format
+ else
+ npm run grunt $WP_TRAVISCI
+ fi
+
</ins><span class="cx" style="display: block; padding: 0 10px"> after_script:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- |
- if [[ "$WP_TEST_REPORTER" == "true" ]]; then
- git clone https://github.com/WordPress/phpunit-test-runner.git test-runner
- export WPT_PREPARE_DIR=$(pwd)
- export WPT_TEST_DIR=$(pwd)
- php test-runner/report.php
- fi
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - |
+ if [[ "$WP_TEST_REPORTER" == "true" ]]; then
+ git clone https://github.com/WordPress/phpunit-test-runner.git test-runner
+ docker-compose run --rm -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
+ fi
+
</ins><span class="cx" style="display: block; padding: 0 10px"> notifications:
</span><span class="cx" style="display: block; padding: 0 10px"> slack:
</span><span class="cx" style="display: block; padding: 0 10px"> rooms:
</span></span></pre></div>
<a id="branches51dockercomposeyml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/docker-compose.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/docker-compose.yml (rev 0)
+++ branches/5.1/docker-compose.yml 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,136 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+version: '3.7'
+
+services:
+
+ ##
+ # The web server container.
+ ##
+ wordpress-develop:
+ image: nginx:alpine
+
+ networks:
+ - wpdevnet
+
+ ports:
+ - ${LOCAL_PORT-8889}:80
+
+ environment:
+ LOCAL_DIR: ${LOCAL_DIR-src}
+
+ volumes:
+ - ./tools/local-env/default.template:/etc/nginx/conf.d/default.template
+ - ./:/var/www
+
+ # Load our config file, substituting environment variables into the config.
+ command: /bin/sh -c "envsubst '$$LOCAL_DIR' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"
+
+ depends_on:
+ - php
+
+ ##
+ # The PHP container.
+ ##
+ php:
+ image: wordpressdevelop/php:${LOCAL_PHP-7.3-fpm}
+
+ networks:
+ - wpdevnet
+
+ environment:
+ LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+ LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
+ PHP_FPM_UID: ${PHP_FPM_UID-1000}
+ PHP_FPM_GID: ${PHP_FPM_GID-1000}
+
+ volumes:
+ - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
+ - ./:/var/www
+
+ depends_on:
+ - mysql
+
+ ##
+ # The MySQL container.
+ ##
+ mysql:
+ image: mysql:${LOCAL_MYSQL-5.7}
+
+ networks:
+ - wpdevnet
+
+ ports:
+ - "3306"
+
+ environment:
+ MYSQL_ROOT_PASSWORD: password
+
+ volumes:
+ - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql
+ - mysql:/var/lib/mysql
+
+ # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0.
+ command: --default-authentication-plugin=mysql_native_password
+
+ ##
+ # The WP CLI container.
+ ##
+ cli:
+ image: wordpressdevelop/cli:${LOCAL_PHP-7.3-fpm}
+
+ networks:
+ - wpdevnet
+
+ environment:
+ LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+ LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
+ PHP_FPM_UID: ${PHP_FPM_UID-1000}
+ PHP_FPM_GID: ${PHP_FPM_GID-1000}
+
+ volumes:
+ - ./:/var/www
+
+ # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
+ init: true
+
+ ##
+ # The PHPUnit container.
+ ##
+ phpunit:
+ image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-7.3-fpm}
+
+ networks:
+ - wpdevnet
+
+ environment:
+ LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+ LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
+ LOCAL_DIR: ${LOCAL_DIR-src}
+ WP_MULTISITE: ${WP_MULTISITE-false}
+ PHP_FPM_UID: ${PHP_FPM_UID-1000}
+ PHP_FPM_GID: ${PHP_FPM_GID-1000}
+ TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
+ TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
+ GITHUB_REF: ${GITHUB_REF-false}
+ GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
+
+ volumes:
+ - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini
+ - ./:/var/www
+ - phpunit-uploads:/var/www/${LOCAL_DIR-src}/wp-content/uploads
+
+ # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
+ init: true
+
+ depends_on:
+ - mysql
+
+volumes:
+ # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.
+ mysql: {}
+ # Using a volume for the uploads directory improves PHPUnit performance.
+ phpunit-uploads: {}
+
+networks:
+ # Creating our own network allows us to connect between containers using their service name.
+ wpdevnet:
+ driver: bridge
</ins></span></pre></div>
<a id="branches51packagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/package-lock.json 2020-11-06 17:17:17 UTC (rev 49527)
+++ branches/5.1/package-lock.json 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,6 +33,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.0.2.tgz",
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha512-zuJMxn5Qnk7CKl+zrVXDqXs0F+p4tshO6B4s8VenJj34EEVuV4iZIbkGiEFJUbn29z9Mcn6k8yfj9qSCNDcPPQ=="
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "@hapi/address": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
+ "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
+ "dev": true
+ },
+ "@hapi/bourne": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+ "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
+ "dev": true
+ },
+ "@hapi/hoek": {
+ "version": "8.5.1",
+ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+ "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
+ "dev": true
+ },
+ "@hapi/joi": {
+ "version": "15.1.1",
+ "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+ "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+ "dev": true,
+ "requires": {
+ "@hapi/address": "2.x.x",
+ "@hapi/bourne": "1.x.x",
+ "@hapi/hoek": "8.x.x",
+ "@hapi/topo": "3.x.x"
+ }
+ },
+ "@hapi/topo": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
+ "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+ "dev": true,
+ "requires": {
+ "@hapi/hoek": "^8.3.0"
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "@tannin/compile": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.0.1",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.0.1.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4683,6 +4722,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "is-obj": "^1.0.0"
</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">+ "dotenv": {
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+ "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+ "dev": true
+ },
+ "dotenv-expand": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+ "dev": true
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "download": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "4.4.3",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13295,6 +13346,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/rungen/-/rungen-0.3.2.tgz",
</span><span class="cx" style="display: block; padding: 0 10px"> "integrity": "sha1-QAwJ6+kU57F+C27zJjQA/Cq8fLM="
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "rx": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+ "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+ "dev": true
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "rxjs": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "5.5.10",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15839,6 +15896,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "indexof": "0.0.1"
</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">+ "wait-on": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz",
+ "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==",
+ "dev": true,
+ "requires": {
+ "@hapi/joi": "^15.0.3",
+ "core-js": "^2.6.5",
+ "minimist": "^1.2.0",
+ "request": "^2.88.0",
+ "rx": "^4.1.0"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "2.6.11",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+ "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+ "dev": true
+ }
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "ware": {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": "1.3.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
</span></span></pre></div>
<a id="branches51packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/package.json 2020-11-06 17:17:17 UTC (rev 49527)
+++ branches/5.1/package.json 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "check-node-version": "3.2.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "copy-webpack-plugin": "^4.6.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "cssnano": "4.1.8",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "dotenv": "^8.2.0",
+ "dotenv-expand": "^5.1.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "grunt": "~1.0.3",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-banner": "^0.6.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "grunt-contrib-clean": "~2.0.0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,6 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "source-map-loader": "^0.2.4",
</span><span class="cx" style="display: block; padding: 0 10px"> "uglify-js": "^3.4.9",
</span><span class="cx" style="display: block; padding: 0 10px"> "uglifyjs-webpack-plugin": "2.1.1",
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "wait-on": "^3.3.0",
</ins><span class="cx" style="display: block; padding: 0 10px"> "webpack": "4.29.2",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack-dev-server": "3.1.14",
</span><span class="cx" style="display: block; padding: 0 10px"> "webpack-livereload-plugin": "2.2.0"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,6 +113,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "whatwg-fetch": "3.0.0"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "scripts": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "grunt": "grunt"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "build": "grunt build",
+ "build:dev": "grunt build --dev",
+ "dev": "grunt watch --dev",
+ "test": "grunt test",
+ "watch": "grunt watch",
+ "grunt": "grunt",
+ "env:start": "node ./tools/local-env/scripts/start.js",
+ "env:stop": "node ./tools/local-env/scripts/docker.js down",
+ "env:restart": "npm run env:stop && npm run env:start",
+ "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
+ "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
+ "env:install": "node ./tools/local-env/scripts/install.js",
+ "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
+ "env:logs": "node ./tools/local-env/scripts/docker.js logs",
+ "env:pull": "node ./tools/local-env/scripts/docker.js pull",
+ "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit"
</ins><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="branches51testsphpunitincludesobjectcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/tests/phpunit/includes/object-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tests/phpunit/includes/object-cache.php 2020-11-06 17:17:17 UTC (rev 49527)
+++ branches/5.1/tests/phpunit/includes/object-cache.php 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $memcached_servers ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->servers = $memcached_servers;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->servers = array( array( '127.0.0.1', 11211 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->servers = array( array( 'memcached', 11211 ) );
</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"> $this->addServers( $this->servers );
</span></span></pre></div>
<a id="branches51testsphpunittestsajaxCustomizeMenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/tests/phpunit/tests/ajax/CustomizeMenus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tests/phpunit/tests/ajax/CustomizeMenus.php 2020-11-06 17:17:17 UTC (rev 49527)
+++ branches/5.1/tests/phpunit/tests/ajax/CustomizeMenus.php 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'administrator' != $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're not an admin, we should get a wp_die(-1).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPAjaxDieStopException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->setExpectedException( 'WPAjaxDieStopException', '-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"> wp_set_current_user( self::factory()->user->create( array( 'role' => $role ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'administrator' != $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're not an admin, we should get a wp_die(-1).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPAjaxDieStopException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->setExpectedException( 'WPAjaxDieStopException', '-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"> wp_set_current_user( self::factory()->user->create( array( 'role' => $role ) ) );
</span></span></pre></div>
<a id="branches51toolslocalenvdefaulttemplate"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/default.template</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/default.template (rev 0)
+++ branches/5.1/tools/local-env/default.template 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,32 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+server {
+ index index.php index.html;
+
+ listen 80 default_server;
+ listen [::]:80 default_server;
+
+ server_name localhost;
+
+ client_max_body_size 1g;
+
+ error_log /var/log/nginx/error.log;
+ access_log /var/log/nginx/access.log;
+
+ root /var/www/${LOCAL_DIR};
+
+ absolute_redirect off;
+
+ location / {
+ try_files $uri $uri/ /index.php?$args;
+ }
+
+ location ~ \.php$ {
+ try_files $uri =404;
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass php:9000;
+ fastcgi_index index.php;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_pass_header Authorization;
+ }
+}
</ins></span></pre></div>
<a id="branches51toolslocalenvmysqlinitsql"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/mysql-init.sql</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/mysql-init.sql (rev 0)
+++ branches/5.1/tools/local-env/mysql-init.sql 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,8 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * MySQL server init.
+ *
+ * SQL queries in this file will be executed the first time the MySQL server is started.
+ */
+
+CREATE DATABASE IF NOT EXISTS wordpress_develop;
+CREATE DATABASE IF NOT EXISTS wordpress_develop_tests;
</ins></span></pre></div>
<a id="branches51toolslocalenvphpconfigini"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/php-config.ini</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/php-config.ini (rev 0)
+++ branches/5.1/tools/local-env/php-config.ini 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,2 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+upload_max_filesize = 1G
+post_max_size = 1G
</ins></span></pre></div>
<a id="branches51toolslocalenvphpunitconfigini"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/phpunit-config.ini</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/phpunit-config.ini (rev 0)
+++ branches/5.1/tools/local-env/phpunit-config.ini 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,6 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+upload_max_filesize = 1G
+post_max_size = 1G
+
+opcache.enable = 1
+opcache.enable_cli = 1
+opache.file_cache = /tmp/php-opcache
</ins></span></pre></div>
<a id="branches51toolslocalenvscriptsdockerjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/scripts/docker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/scripts/docker.js (rev 0)
+++ branches/5.1/tools/local-env/scripts/docker.js 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,8 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const dotenv = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
+const { execSync } = require( 'child_process' );
+
+dotenvExpand( dotenv.config() );
+
+// Execute any docker-compose command passed to this script.
+execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
</ins></span></pre></div>
<a id="branches51toolslocalenvscriptsinstalljs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/scripts/install.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/scripts/install.js (rev 0)
+++ branches/5.1/tools/local-env/scripts/install.js 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,47 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const dotenv = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
+const wait_on = require( 'wait-on' );
+const { execSync } = require( 'child_process' );
+const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
+
+dotenvExpand( dotenv.config() );
+
+// Create wp-config.php.
+wp_cli( 'config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force' );
+
+// Add the debug settings to wp-config.php.
+// Windows requires this to be done as an additional step, rather than using the --extra-php option in the previous step.
+wp_cli( `config set WP_DEBUG ${process.env.LOCAL_WP_DEBUG} --raw --type=constant` );
+wp_cli( `config set WP_DEBUG_LOG ${process.env.LOCAL_WP_DEBUG_LOG} --raw --type=constant` );
+wp_cli( `config set WP_DEBUG_DISPLAY ${process.env.LOCAL_WP_DEBUG_DISPLAY} --raw --type=constant` );
+wp_cli( `config set SCRIPT_DEBUG ${process.env.LOCAL_SCRIPT_DEBUG} --raw --type=constant` );
+wp_cli( `config set WP_ENVIRONMENT_TYPE ${process.env.LOCAL_WP_ENVIRONMENT_TYPE} --type=constant` );
+
+// Move wp-config.php to the base directory, so it doesn't get mixed up in the src or build directories.
+renameSync( 'src/wp-config.php', 'wp-config.php' );
+
+// Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php.
+const testConfig = readFileSync( 'wp-tests-config-sample.php', 'utf8' )
+ .replace( 'youremptytestdbnamehere', 'wordpress_develop_tests' )
+ .replace( 'yourusernamehere', 'root' )
+ .replace( 'yourpasswordhere', 'password' )
+ .replace( 'localhost', 'mysql' )
+ .concat( "\ndefine( 'FS_METHOD', 'direct' );\n" );
+
+writeFileSync( 'wp-tests-config.php', testConfig );
+
+// Once the site is available, install WordPress!
+wait_on( { resources: [ `tcp:localhost:${process.env.LOCAL_PORT}`] } )
+ .then( () => {
+ wp_cli( 'db reset --yes' );
+ wp_cli( `core install --title="WordPress Develop" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:${process.env.LOCAL_PORT}` );
+ } );
+
+/**
+ * Runs WP-CLI commands in the Docker environment.
+ *
+ * @param {string} cmd The WP-CLI command to run.
+ */
+function wp_cli( cmd ) {
+ execSync( `docker-compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
+}
</ins></span></pre></div>
<a id="branches51toolslocalenvscriptsstartjs"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.1/tools/local-env/scripts/start.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tools/local-env/scripts/start.js (rev 0)
+++ branches/5.1/tools/local-env/scripts/start.js 2020-11-06 17:24:43 UTC (rev 49528)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,36 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const dotenv = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
+const { execSync } = require( 'child_process' );
+
+dotenvExpand( dotenv.config() );
+
+// Start the local-env containers.
+execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );
+
+// If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.
+if ( process.env.DOCKER_TOOLBOX_INSTALL_PATH ) {
+ // VBoxManage is added to the PATH on every platform except Windows.
+ const vboxmanage = process.env.VBOX_MSI_INSTALL_PATH ? `${ process.env.VBOX_MSI_INSTALL_PATH }/VBoxManage` : 'VBoxManage'
+
+ // Check if the port forwarding is already configured for this port.
+ const vminfoBuffer = execSync( `"${ vboxmanage }" showvminfo "${ process.env.DOCKER_MACHINE_NAME }" --machinereadable` );
+ const vminfo = vminfoBuffer.toString().split( /[\r\n]+/ );
+
+ vminfo.forEach( ( info ) => {
+ if ( ! info.startsWith( 'Forwarding' ) ) {
+ return;
+ }
+
+ // `info` is in the format: Forwarding(1)="tcp-port8889,tcp,127.0.0.1,8889,,8889"
+ // Parse it down so `rule` only contains the data inside quotes, split by ','.
+ const rule = info.replace( /(^.*?"|"$)/, '' ).split( ',' );
+
+ // Delete rules that are using the port we need.
+ if ( rule[ 3 ] === process.env.LOCAL_PORT || rule[ 5 ] === process.env.LOCAL_PORT ) {
+ execSync( `"${ vboxmanage }" controlvm "${ process.env.DOCKER_MACHINE_NAME }" natpf1 delete ${ rule[ 0 ] }`, { stdio: 'inherit' } );
+ }
+ } );
+
+ // Add our port forwarding rule.
+ execSync( `"${ vboxmanage }" controlvm "${ process.env.DOCKER_MACHINE_NAME }" natpf1 "tcp-port${ process.env.LOCAL_PORT },tcp,127.0.0.1,${ process.env.LOCAL_PORT },,${ process.env.LOCAL_PORT }"`, { stdio: 'inherit' } );
+}
</ins></span></pre>
</div>
</div>
</body>
</html>