<!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>[13081] sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php: API: GitHub PRs: Tweak how the matching Trac ticket for a PR is found.</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="http://meta.trac.wordpress.org/changeset/13081">13081</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/13081","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-12-22 06:55:38 +0000 (Fri, 22 Dec 2023)</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'>API: GitHub PRs: Tweak how the matching Trac ticket for a PR is found.
This should reduce some cases of the ticket being misidentified.
See <a href="http://meta.trac.wordpress.org/ticket/7388">#7388</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracprfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2023-12-22 06:07:46 UTC (rev 13080)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php 2023-12-22 06:55:38 UTC (rev 13081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,12 +243,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function determine_trac_ticket( $pr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ticket = false;
</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 the trac found is the key, return the value.
- $trac_redirects = [
- // Themes trac mentions are likely Meta tickets.
- 'themes' => 'meta',
- ];
-
</del><span class="cx" style="display: block; padding: 0 10px"> // For now, we assume everything is destined for the Core Trac.
</span><span class="cx" style="display: block; padding: 0 10px"> $trac = 'core';
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $pr->base->repo->full_name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,9 +264,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $trac = WEBHOOK_TRAC_HINT;
</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">- // If a specific trac is mentioned within the PR body:
- elseif ( preg_match( '!/(?P<trac>[a-z]+).trac.wordpress.org/!i', $pr->body, $m ) ) {
- $trac = $m['trac'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If a specific trac is mentioned within the PR body (and only that trac)
+ elseif (
+ preg_match_all( '!/(?P<trac>[a-z]+).trac.wordpress.org/!i', $body, $m ) &&
+ 1 === count( array_unique( $m[0] ) )
+ ) {
+ $trac = $m['trac'][0];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the repo starts with 'wporg-' assume Meta.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,14 +280,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $regexes = [
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Match explicit ticket-ref links, as included in most PR descriptions.
+ "!Trac ticket:\s*https://(?P<trac>[a-z]+).trac.wordpress.org/ticket/(?P<id>\d+)!i",
+
+ // Match any references to the "expected" trac instance first. This covers cases where multiple tracs are mentioned.
+ "!{$trac}.trac.wordpress.org/ticket/(?P<id>\d+)!i",
+
+ // Then any trac instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> '!(?P<trac>[a-z]+).trac.wordpress.org/ticket/(?P<id>\d+)!i',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Now for just plain ticket references without a trac instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> '!(?:^|\s)#WP(\d+)!', // #WP1234
</span><span class="cx" style="display: block; padding: 0 10px"> '!(?:^|\s)#(\d{4,5})!', // #1234
</span><span class="cx" style="display: block; padding: 0 10px"> '!Ticket[ /-](\d+)!i',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // diff filenames.
</span><span class="cx" style="display: block; padding: 0 10px"> '!\b(\d+)(\.\d)?\.(?:diff|patch)!i',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Formats of common branches
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Formats of common branches.
</ins><span class="cx" style="display: block; padding: 0 10px"> '!((?P<trac>core|meta|bbpress|buddypress|themes)|WordPress|fix|trac)[-/](?P<id>\d+)!i',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Starts or ends with a ticketish number
</span><span class="cx" style="display: block; padding: 0 10px"> // These match things it really shouldn't, and are a last-ditch effort.
</span><span class="cx" style="display: block; padding: 0 10px"> '!\s(\d{4,5})$!i',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,8 +322,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $trac = $m['trac'];
</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">- $trac = $trac_redirects[ $trac ] ?? $trac;
-
</del><span class="cx" style="display: block; padding: 0 10px"> return [ $trac, $id ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>