<!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>[13876] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Store plugin releases from trunk as `trunk@1.2.3`, split the releases prefilling into it's own method.</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/13876">13876</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/13876","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>2024-07-04 03:47:24 +0000 (Thu, 04 Jul 2024)</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'>Plugin Directory: Store plugin releases from trunk as `trunk@1.2.3`, split the releases prefilling into it's own method.
See <a href="http://meta.trac.wordpress.org/ticket/7696">#7696</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-directory.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/plugin-directory/class-plugin-directory.php 2024-07-04 03:38:13 UTC (rev 13875)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-07-04 03:47:24 UTC (rev 13876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1728,48 +1728,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Meta doesn't exist yet? Lets fill it out.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $releases || ! is_array( $releases ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $plugin->ID, 'releases', [] );
-
- $tags = get_post_meta( $plugin->ID, 'tags', true );
- if ( $tags ) {
- foreach ( $tags as $tag_version => $tag ) {
- self::add_release( $plugin, [
- 'date' => strtotime( $tag['date'] ),
- 'tag' => $tag['tag'],
- 'version' => $tag_version,
- 'committer' => [ $tag['author'] ],
- 'zips_built' => true, // Old release, assume they were built.
- 'confirmations_required' => 0, // Old release, assume it's released.
- ] );
- }
- } else {
- // Pull from SVN directly.
- $svn_tags = Tools\SVN::ls( "https://plugins.svn.wordpress.org/{$plugin->post_name}/tags/", true ) ?: [];
- foreach ( $svn_tags as $entry ) {
- // Discard files
- if ( 'dir' !== $entry['kind'] ) {
- continue;
- }
-
- $tag = $entry['filename'];
-
- // Prefix the 0 for plugin versions like 0.1
- if ( '.' == substr( $tag, 0, 1 ) ) {
- $tag = "0{$tag}";
- }
-
- self::add_release( $plugin, [
- 'date' => strtotime( $entry['date'] ),
- 'tag' => $entry['filename'],
- 'version' => $tag,
- 'committer' => [ $entry['author'] ],
- 'zips_built' => true, // Old release, assume they were built.
- 'confirmations_required' => 0, // Old release, assume it's released.
- ] );
- }
- }
-
- $releases = get_post_meta( $plugin->ID, 'releases', true ) ?: [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $releases = self::prefill_releses_meta( $plugin );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1788,17 +1747,76 @@
</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">+ * Prefill the releases meta for a plugin.
+ *
+ * @param \WP_Post $plugin Plugin post object.
+ * @return array
+ */
+ public static function prefill_releses_meta( $plugin ) {
+ if ( ! $plugin->releases ) {
+ update_post_meta( $plugin->ID, 'releases', [] );
+ }
+
+ $tags = get_post_meta( $plugin->ID, 'tags', true );
+ if ( $tags ) {
+ foreach ( $tags as $tag_version => $tag ) {
+ self::add_release( $plugin, [
+ 'date' => strtotime( $tag['date'] ),
+ 'tag' => $tag['tag'],
+ 'version' => $tag_version,
+ 'committer' => [ $tag['author'] ],
+ 'zips_built' => true, // Old release, assume they were built.
+ 'confirmations_required' => 0, // Old release, assume it's released.
+ ] );
+ }
+ } else {
+ // Pull from SVN directly.
+ $svn_tags = Tools\SVN::ls( "https://plugins.svn.wordpress.org/{$plugin->post_name}/tags/", true ) ?: [];
+ foreach ( $svn_tags as $entry ) {
+ // Discard files
+ if ( 'dir' !== $entry['kind'] ) {
+ continue;
+ }
+
+ $tag = $entry['filename'];
+
+ // Prefix the 0 for plugin versions like 0.1
+ if ( '.' == substr( $tag, 0, 1 ) ) {
+ $tag = "0{$tag}";
+ }
+
+ self::add_release( $plugin, [
+ 'date' => strtotime( $entry['date'] ),
+ 'tag' => $entry['filename'],
+ 'version' => $tag,
+ 'committer' => [ $entry['author'] ],
+ 'zips_built' => true, // Old release, assume they were built.
+ 'confirmations_required' => 0, // Old release, assume it's released.
+ ] );
+ }
+ }
+
+ return get_post_meta( $plugin->ID, 'releases', true ) ?: [];
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Fetch a specific release of the plugin, by tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $plugin Plugin slug.
- * @param string $tag Release tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $plugin Plugin slug.
+ * @param string $version Plugin version / Release tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_release( $plugin, $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_release( $plugin, $version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $releases = self::get_releases( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Look for the version released as a tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered = wp_list_filter( $releases, compact( 'tag' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $filtered ) {
+ return array_shift( $filtered );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Look for the tag as a trunk version.
+ $filtered = wp_list_filter( $releases, [ 'tag' => "trunk@{$tag}", 'version' => $tag ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $filtered ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_shift( $filtered );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1835,7 +1853,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fill the $release with the newish data. This could/should use wp_parse_args()?
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $release[ $k ] = $v;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $release[ $k ] ) ) {
+ $release[ $k ] = array_unique( array_merge( $release[ $k ], $v ) );
+ } else {
+ $release[ $k ] = $v;
+ }
</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"> $releases = self::get_releases( $plugin );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp"></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/plugin-directory/cli/class-import.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/plugin-directory/cli/class-import.php 2024-07-04 03:38:13 UTC (rev 13875)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2024-07-04 03:47:24 UTC (rev 13876)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,6 +458,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'revision' => [ $last_revision ]
</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">+ } elseif ( 'trunk' === $stable_tag && version_compare( $version, $plugin->version, '>' ) ) {
+ // This is a new version, released from trunk.
+ Plugin_Directory::add_release(
+ $plugin,
+ [
+ 'tag' => "trunk@{$version}",
+ 'version' => $version,
+ 'committer' => [ $last_committer ],
+ 'revision' => [ $last_revision ]
+ ]
+ );
</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->rebuild_affected_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags, $svn_revision_triggered );
</span></span></pre>
</div>
</div>
</body>
</html>