<!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>[44715] trunk/tests/phpunit/includes/bootstrap.php: Build/Test Tools: Simplify `WP_PHPUnit_Util_Getopt` and update documentation.</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/44715">44715</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/44715","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-30 00:53:52 +0000 (Wed, 30 Jan 2019)</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: Simplify `WP_PHPUnit_Util_Getopt` and update documentation.
Introduced in [918/tests] and updated in <a href="https://core.trac.wordpress.org/changeset/26871">[26871]</a>, the class is there to make sure that known bugs are not skipped when `phpunit` is called with a `--group` that corresponds to an `@ticket` annotation (such as `phpunit --group 12345`).
Enforcing recognized arguments or correctly formed arguments is not the concern here, so reusing `PHPUnit_Util_Getopt::parseLongOption()` was superfluous.
See <a href="https://core.trac.wordpress.org/ticket/43218">#43218</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2019-01-29 21:28:57 UTC (rev 44714)
+++ trunk/tests/phpunit/includes/bootstrap.php 2019-01-30 00:53:52 UTC (rev 44715)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,11 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require dirname( __FILE__ ) . '/class-wp-fake-block-type.php';
</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">- * A child class of the PHP test runner.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A class to handle additional command line arguments passed to the script.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Used to access the protected longOptions property, to parse the arguments
- * passed to the script.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * If it is determined that phpunit was called with a --group that corresponds
</span><span class="cx" style="display: block; padding: 0 10px"> * to an @ticket annotation (such as `phpunit --group 12345` for bugs marked
</span><span class="cx" style="display: block; padding: 0 10px"> * as #WP12345), then it is assumed that known bugs should not be skipped.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,27 +147,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * how you call phpunit has no effect.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_PHPUnit_Util_Getopt {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $longOptions = array(
- 'exclude-group=',
- 'group=',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> function __construct( $argv ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_shift( $argv );
- $options = array();
- while ( current( $argv ) ) {
- $arg = current( $argv );
- next( $argv );
- try {
- if ( strlen( $arg ) > 1 && $arg[0] === '-' && $arg[1] === '-' ) {
- self::parseLongOption( substr( $arg, 2 ), $this->longOptions, $options, $argv );
- }
- } catch ( PHPUnit_Framework_Exception $e ) {
- // Enforcing recognized arguments or correctly formed arguments is
- // not really the concern here.
- continue;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $skipped_groups = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajax' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ms-files' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,8 +155,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'external-http' => true,
</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">- foreach ( $options as $option ) {
- switch ( $option[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( current( $argv ) ) {
+ $option = current( $argv );
+ $value = next( $argv );
+
+ switch ( $option ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> case '--exclude-group':
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $skipped_groups as $group_name => $skipped ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $skipped_groups[ $group_name ] = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> continue 2;
</span><span class="cx" style="display: block; padding: 0 10px"> case '--group':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groups = explode( ',', $option[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groups = explode( ',', $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $groups as $group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> WP_UnitTestCase::forceTicket( $group );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,65 +195,5 @@
</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">- /**
- * Copied from https://raw.githubusercontent.com/sebastianbergmann/phpunit/6.5.7/src/Util/Getopt.php
- *
- * @param $arg
- * @param $long_options
- * @param $opts
- * @param $args
- */
- protected static function parseLongOption( $arg, $long_options, &$opts, &$args ) {
- $count = count( $long_options );
- $list = explode( '=', $arg );
- $opt = $list[0];
- $opt_arg = null;
-
- if ( count( $list ) > 1 ) {
- $opt_arg = $list[1];
- }
-
- $opt_len = strlen( $opt );
-
- for ( $i = 0; $i < $count; $i++ ) {
- $long_opt = $long_options[ $i ];
- $opt_start = substr( $long_opt, 0, $opt_len );
-
- if ( $opt_start != $opt ) {
- continue;
- }
-
- $opt_rest = substr( $long_opt, $opt_len );
-
- if ( $opt_rest != '' && $opt[0] != '=' && $i + 1 < $count &&
- $opt == substr( $long_options[ $i + 1 ], 0, $opt_len ) ) {
- throw new Exception(
- "option --$opt is ambiguous"
- );
- }
-
- if ( substr( $long_opt, -1 ) == '=' ) {
- if ( substr( $long_opt, -2 ) != '==' ) {
- if ( ! strlen( $opt_arg ) ) {
- if ( false === $opt_arg = current( $args ) ) {
- throw new Exception(
- "option --$opt requires an argument"
- );
- }
- next( $args );
- }
- }
- } elseif ( $opt_arg ) {
- throw new Exception(
- "option --$opt doesn't allow an argument"
- );
- }
-
- $full_option = '--' . preg_replace( '/={1,2}$/', '', $long_opt );
- $opts[] = array( $full_option, $opt_arg );
-
- return;
- }
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );
</span></span></pre>
</div>
</div>
</body>
</html>