<!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>[40547] branches/4.7: Build/Test Tools: Backport various recent changes to the 4.7 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 { 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/40547">40547</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/40547","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-24 00:37:19 +0000 (Mon, 24 Apr 2017)</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 various recent changes to the 4.7 branch.
* Add support for PHPUnit 6+.
* Add Composer files to the cache on Travis.
* Remove HHVM from the test infrastructure on Travis.
Merges <a href="https://core.trac.wordpress.org/changeset/40536">[40536]</a>, <a href="https://core.trac.wordpress.org/changeset/40538">[40538]</a>, <a href="https://core.trac.wordpress.org/changeset/40539">[40539]</a>, and <a href="https://core.trac.wordpress.org/changeset/40546">[40546]</a> to the 4.7 branch.
See <a href="https://core.trac.wordpress.org/ticket/40539">#40539</a>
Fixes <a href="https://core.trac.wordpress.org/ticket/39822">#39822</a>, <a href="https://core.trac.wordpress.org/ticket/40548">#40548</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47travisyml">branches/4.7/.travis.yml</a></li>
<li><a href="#branches47testsphpunitincludesbootstrapphp">branches/4.7/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#branches47testsphpunitincludestestcaseajaxphp">branches/4.7/tests/phpunit/includes/testcase-ajax.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches47testsphpunitincludesphpunit6compatphp">branches/4.7/tests/phpunit/includes/phpunit6-compat.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</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/4.7 2017-04-24 00:27:28 UTC (rev 40546)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-04-24 00:37:19 UTC (rev 40547)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</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/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058
,40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39919,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036-40037,40039-40041,40045,40049,40055-40056,40058,
40061,40063-40066,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40120-40126,40129-40131,40148,40160,40169,40181,40183,40195,40235,40238,40241,40252,40255,40257-40259,40263-40264,40268-40269,40271,40284,40290,40300-40306,40311,40313-40316,40318-40320,40324,40333,40353,40357-40358,40368,40376,40378-40382,40395-40398,40400,40405,40421,40428,40434,40458,40472,40481,40513,40536,40538-40539,40546
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47travisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/.travis.yml 2017-04-24 00:27:28 UTC (rev 40546)
+++ branches/4.7/.travis.yml 2017-04-24 00:37:19 UTC (rev 40547)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,8 @@
</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"> - node_modules
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - vendor
+ - $HOME/.composer/cache
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> global:
</span><span class="cx" style="display: block; padding: 0 10px"> - WP_TRAVISCI=travis:phpunit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,19 +23,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 5.4
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 5.3
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 5.2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: hhvm
- sudo: required
- dist: trusty
- group: edge
- addons:
- apt:
- packages:
- - mysql-server-5.6
- - mysql-client-core-5.6
- - mysql-client-5.6
</del><span class="cx" style="display: block; padding: 0 10px"> - php: nightly
</span><span class="cx" style="display: block; padding: 0 10px"> allow_failures:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: hhvm
</del><span class="cx" style="display: block; padding: 0 10px"> - php: nightly
</span><span class="cx" style="display: block; padding: 0 10px"> before_install:
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><span class="cx" style="display: block; padding: 0 10px"> before_script:
</span><span class="cx" style="display: block; padding: 0 10px"> - |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- # Remove Xdebug for a huge performance increase, but not from nightly or hhvm:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ # Remove Xdebug for a huge performance increase, but not from nightly:
</ins><span class="cx" style="display: block; padding: 0 10px"> stable='^[0-9\.]+$'
</span><span class="cx" style="display: block; padding: 0 10px"> if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then
</span><span class="cx" style="display: block; padding: 0 10px"> phpenv config-rm xdebug.ini
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,9 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> # Install the specified version of PHPUnit depending on the PHP version:
</span><span class="cx" style="display: block; padding: 0 10px"> if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
</span><span class="cx" style="display: block; padding: 0 10px"> case "$TRAVIS_PHP_VERSION" in
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 7.1|7.0|hhvm|nightly)
- echo "Using PHPUnit 5.7"
- composer global require "phpunit/phpunit=5.7.*"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 7.1|7.0|nightly)
+ echo "Using PHPUnit 6.1"
+ composer global require "phpunit/phpunit=6.1.*"
</ins><span class="cx" style="display: block; padding: 0 10px"> ;;
</span><span class="cx" style="display: block; padding: 0 10px"> 5.6|5.5|5.4|5.3)
</span><span class="cx" style="display: block; padding: 0 10px"> echo "Using PHPUnit 4.8"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,11 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - mysql --version
</span><span class="cx" style="display: block; padding: 0 10px"> - phpenv versions
</span><span class="cx" style="display: block; padding: 0 10px"> - php --version
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-- |
- # Debug PHP extensions, but not on HHVM because the command hangs indefinitely:
- if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
- php -m
- fi
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+- php -m
</ins><span class="cx" style="display: block; padding: 0 10px"> - npm --version
</span><span class="cx" style="display: block; padding: 0 10px"> - node --version
</span><span class="cx" style="display: block; padding: 0 10px"> - which phpunit
</span></span></pre></div>
<a id="branches47testsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/includes/bootstrap.php 2017-04-24 00:27:28 UTC (rev 40546)
+++ branches/4.7/tests/phpunit/includes/bootstrap.php 2017-04-24 00:37:19 UTC (rev 40547)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Installs WordPress for running the tests and loads WordPress and the test libraries
</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">+/**
+ * Compatibility with PHPUnit 6+
+ */
+if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
+ require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $config_file_path = dirname( dirname( __FILE__ ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
</span></span></pre></div>
<a id="branches47testsphpunitincludesphpunit6compatphpfromrev40536trunktestsphpunitincludesphpunit6compatphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/4.7/tests/phpunit/includes/phpunit6-compat.php (from rev 40536, trunk/tests/phpunit/includes/phpunit6-compat.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/includes/phpunit6-compat.php (rev 0)
+++ branches/4.7/tests/phpunit/includes/phpunit6-compat.php 2017-04-24 00:37:19 UTC (rev 40547)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,37 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
+
+ class_alias( 'PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase' );
+ class_alias( 'PHPUnit\Framework\Exception', 'PHPUnit_Framework_Exception' );
+ class_alias( 'PHPUnit\Framework\ExpectationFailedException', 'PHPUnit_Framework_ExpectationFailedException' );
+ class_alias( 'PHPUnit\Framework\Error\Notice', 'PHPUnit_Framework_Error_Notice' );
+ class_alias( 'PHPUnit\Framework\Test', 'PHPUnit_Framework_Test' );
+ class_alias( 'PHPUnit\Framework\Warning', 'PHPUnit_Framework_Warning' );
+ class_alias( 'PHPUnit\Framework\AssertionFailedError', 'PHPUnit_Framework_AssertionFailedError' );
+ class_alias( 'PHPUnit\Framework\TestSuite', 'PHPUnit_Framework_TestSuite' );
+ class_alias( 'PHPUnit\Framework\TestListener', 'PHPUnit_Framework_TestListener' );
+ class_alias( 'PHPUnit\Util\GlobalState', 'PHPUnit_Util_GlobalState' );
+ class_alias( 'PHPUnit\Util\Getopt', 'PHPUnit_Util_Getopt' );
+
+ class PHPUnit_Util_Test extends PHPUnit\Util\Test {
+
+ public static function getTickets( $className, $methodName ) {
+ $annotations = self::parseTestMethodAnnotations( $className, $methodName );
+
+ $tickets = array();
+
+ if ( isset( $annotations['class']['ticket'] ) ) {
+ $tickets = $annotations['class']['ticket'];
+ }
+
+ if ( isset( $annotations['method']['ticket'] ) ) {
+ $tickets = array_merge( $tickets, $annotations['method']['ticket'] );
+ }
+
+ return array_unique( $tickets );
+ }
+
+ }
+
+}
</ins></span></pre></div>
<a id="branches47testsphpunitincludestestcaseajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/includes/testcase-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/includes/testcase-ajax.php 2017-04-24 00:27:28 UTC (rev 40546)
+++ branches/4.7/tests/phpunit/includes/testcase-ajax.php 2017-04-24 00:37:19 UTC (rev 40547)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,4 +200,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $buffer ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_last_response = $buffer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * PHPUnit 6+ compatibility shim.
+ *
+ * @param mixed $exception
+ * @param string $message
+ * @param int|string $code
+ */
+ public function setExpectedException( $exception, $message = '', $code = null ) {
+ if ( is_callable( 'parent::setExpectedException' ) ) {
+ parent::setExpectedException( $exception, $message, $code );
+ } else {
+ $this->expectException( $exception );
+ if ( '' !== $message ) {
+ $this->expectExceptionMessage( $message );
+ }
+ if ( null !== $code ) {
+ $this->expectExceptionCode( $code );
+ }
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>