<!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>[13711] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Direcrory: When Release Confirmation is enabled, and a tag for a non-confirmed release is deleted, remove the release.</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/13711">13711</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/13711","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-05-16 03:06:24 +0000 (Thu, 16 May 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 Direcrory: When Release Confirmation is enabled, and a tag for a non-confirmed release is deleted, remove the release.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5900">#5900</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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclasspluginimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-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-05-16 02:34:14 UTC (rev 13710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-05-16 03:06:24 UTC (rev 13711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1783,6 +1783,10 @@
</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"> * Fetch a specific release of the plugin, by tag.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $plugin Plugin slug.
+ * @param string $tag Release tag.
+ * @return array|bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_release( $plugin, $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $releases = self::get_releases( $plugin );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1798,6 +1802,10 @@
</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"> * Add a Plugin Release to the internal storage.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $plugin Plugin slug.
+ * @param array $data Release data.
+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function add_release( $plugin, $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $data['tag'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,6 +1854,30 @@
</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">+ * Remove a Plugin Release from the internal storage.
+ *
+ * @param string $plugin Plugin slug.
+ * @param string $tag Release tag.
+ * @return bool
+ */
+ public static function remove_release( $plugin, $tag ) {
+ $result = false;
+ $plugin = self::get_plugin_post( $plugin );
+ $releases = self::get_releases( $plugin );
+
+ // Remove the release in question.
+ foreach ( $releases as $i => $r ) {
+ if ( $r['tag'] === $tag && ! $r['confirmed'] ) {
+ unset( $releases[ $i ] );
+
+ $result = update_post_meta( $plugin->ID, 'releases', $releases );
+ }
+ }
+
+ return $result;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add additional context to ZIP urls.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The ZIP URL will have URL suffixed which is a rest api URL to information about the 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-05-16 02:34:14 UTC (rev 13710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2024-05-16 03:06:24 UTC (rev 13711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,9 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $plugin_slug The slug of the plugin to import.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $svn_changed_tags A list of tags/trunk which the SVN change touched. Optional.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $svn_tags_deleted A list of tags/trunk which were deleted in the SVN change. Optional.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $svn_revision_triggered The SVN revision which this import has been triggered by. Optional.
</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 function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ), $svn_revision_triggered = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ), $svn_tags_deleted = array(), $svn_revision_triggered = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Reset properties.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->warnings = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,6 +195,14 @@
</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">+ // Check to see if any of the releases were deleted.
+ foreach ( $svn_tags_deleted as $svn_deleted_tag ) {
+ // Note: Confirmed releases will not be deleted, only unconfirmed ones.
+ if ( Plugin_Directory::remove_release( $plugin, $svn_deleted_tag ) ) {
+ echo "Plugin tag {$svn_deleted_tag} deleted; release removed.\n";
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Now check to see if the stable has been confirmed.
</span><span class="cx" style="display: block; padding: 0 10px"> $release = Plugin_Directory::get_release( $plugin, $stable_tag );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $release ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjobsclasspluginimportphp"></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/jobs/class-plugin-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/jobs/class-plugin-import.php 2024-05-16 02:34:14 UTC (rev 13710)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php 2024-05-16 03:06:24 UTC (rev 13711)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function queue( $plugin_slug, $plugin_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $when_to_run = time() + 10;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $when_to_run = time() + 5;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $next_scheduled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $when_to_run = $next_scheduled + HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set some default values if not included from the caller.
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['tags_touched'] ??= array( 'trunk' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data['tags_deleted'] ??= array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['revisions'] ??= [ 0 ];
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['readme_touched'] ??= true;
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['code_touched'] ??= true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,11 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['assets_touched'] ??= true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_touched = $plugin_data['tags_touched'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags_deleted = $plugin_data['tags_deleted'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $revision = max( (array) $plugin_data['revisions'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $importer = new CLI\Import();
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $importer->import_from_svn( $plugin_slug, $tags_touched, $revision );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $importer->import_from_svn( $plugin_slug, $tags_touched, $tags_deleted, $revision );
</ins><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( STDERR, "[{$plugin_slug}] Plugin Import Failed: " . $e->getMessage() . "\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> } finally {
</span></span></pre>
</div>
</div>
</body>
</html>