<!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>[6271] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-trac.php: Themes: Conform to WPCS.</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="http://meta.trac.wordpress.org/changeset/6271">6271</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6271","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-12-14 19:01:47 +0000 (Thu, 14 Dec 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'>Themes: Conform to WPCS.
Updates Trac class with docs and formatting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorylibclasstracphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-trac.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorylibclasstracphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-trac.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-trac.php 2017-12-14 10:44:04 UTC (rev 6270)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-trac.php 2017-12-14 19:01:47 UTC (rev 6271)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,69 +1,129 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Class to interact with Trac's RPC API.
+ *
+ * @package WordPressdotorg\Theme_Directory
+ */
+
+/**
+ * Class Trac
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class Trac {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $rpc;
- const attributes = 3;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $username, $password, $host, $path = '/', $port = 80, $ssl = FALSE ) {
- // Assume URL to $host, ignore $path, $port, $ssl
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Attributes key in RPC response array.
+ */
+ const ATTRIBUTES = 3;
+
+ /**
+ * Holds a reference to \WP_HTTP_IXR_Client.
+ *
+ * @var \WP_HTTP_IXR_Client
+ */
+ protected $rpc;
+
+ /**
+ * Trac constructor.
+ *
+ * @param string $username Trac username.
+ * @param string $password Trac password.
+ * @param string $host Server to use.
+ * @param string $path Path.
+ * @param int $port Which port to use. Default: 80.
+ * @param bool $ssl Whether to use SSL. Default: false.
+ */
+ public function __construct( $username, $password, $host, $path = '/', $port = 80, $ssl = false ) {
+ // Assume URL to $host, ignore $path, $port, $ssl.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->rpc = new WP_HTTP_IXR_Client( $host );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $http_basic_auth = 'Basic ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $http_basic_auth = 'Basic ';
</ins><span class="cx" style="display: block; padding: 0 10px"> $http_basic_auth .= base64_encode( $username . ':' . $password );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->rpc->headers['Authorization'] = $http_basic_auth;
</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 ticket_create( $subj, $desc, $attr = array() ) {
- if ( empty( $attr ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Creates a new Trac ticket.
+ *
+ * @param string $subj Ticket subject line.
+ * @param string $desc Ticket description.
+ * @param array $attr Ticket attributes. Default: Empty array.
+ * @return bool|mixed
+ */
+ public function ticket_create( $subj, $desc, $attr = array() ) {
+ if ( empty( $attr ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr = new IXR_Value( array(), 'struct' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $ok = $this->rpc->query( 'ticket.create', $subj, $desc, $attr );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$ok ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $ok ) {
+ // phpcs:ignore Squiz.PHP.CommentedOutCode.Found, Squiz.Commenting.InlineComment.InvalidEndChar
</ins><span class="cx" style="display: block; padding: 0 10px"> // print_r( $this->rpc );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return FALSE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
</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"> return $this->rpc->getResponse();
</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 ticket_update( $id, $comment, $attr = array(), $notify = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Updates a Trac ticket.
+ *
+ * @param int $id Ticket number.
+ * @param string $comment Comment.
+ * @param array $attr Ticket attributes. Default: Empty array.
+ * @param bool $notify Whether to notify. Default: false.
+ * @return bool|mixed
+ */
+ public function ticket_update( $id, $comment, $attr = array(), $notify = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attr['_ts'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $get = $this->ticket_get( $id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $get = $this->ticket_get( $id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr['_ts'] = $get['_ts'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $attr['action'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $attr['action'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr['action'] = 'leave';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ok = $this->rpc->query( 'ticket.update', $id, $comment, $attr, $notify );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $ok )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $ok ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->rpc->getResponse();
</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 ticket_query( $search ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Queries Trac tickets.
+ *
+ * @param string $search Trac search query.
+ * @return bool|mixed
+ */
+ public function ticket_query( $search ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ok = $this->rpc->query( 'ticket.query', $search );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$ok ) {
- return FALSE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $ok ) {
+ return false;
</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"> return $this->rpc->getResponse();
</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">+ * Gets a specific Trac ticket.
+ *
+ * @param int $id Trac ticket id.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return [id, time_created, time_changed, attributes] or false on failure.
</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 ticket_get( $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function ticket_get( $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ok = $this->rpc->query( 'ticket.get', $id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$ok ) {
- return FALSE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $ok ) {
+ return false;
</ins><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">- $response = $this->rpc->getResponse();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = $this->rpc->getResponse();
</ins><span class="cx" style="display: block; padding: 0 10px"> $response['id'] = $response[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $response[ self::attributes ] as $key => $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $response[ self::ATTRIBUTES ] as $key => $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $response[ $key ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $response;
</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">-
</del></span></pre>
</div>
</div>
</body>
</html>