<!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>[6545] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli.php: devhub/cli: Fix Daniel's broken importer code</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/6545">6545</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/6545","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>danielbachhuber</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-05 21:58:18 +0000 (Mon, 05 Feb 2018)</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'>devhub/cli: Fix Daniel's broken importer code
Fixes <a href="http://meta.trac.wordpress.org/ticket/3421">#3421</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinccliphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinccliphp"></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/themes/pub/wporg-developer/inc/cli.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/themes/pub/wporg-developer/inc/cli.php 2018-02-05 21:32:57 UTC (rev 6544)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli.php 2018-02-05 21:58:18 UTC (rev 6545)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,6 +42,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'excerpt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'revisions',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Needed for manual inspection/modification of the post's parent.
+ 'page-attributes',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'command', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => 'cli/commands',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +76,7 @@
</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"> public static function action_pre_get_posts( $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $query->is_main_query() && $query->is_post_type_archive( 'command' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_admin() && $query->is_main_query() && $query->is_post_type_archive( 'command' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'post_parent', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'orderby', 'title' );
</span><span class="cx" style="display: block; padding: 0 10px"> $query->set( 'order', 'ASC' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $existing = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $q->posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cmd_path = rtrim( str_replace( home_url( 'cli/commands/' ), '', get_permalink( $post->ID ) ), '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cmd_path = self::get_cmd_path( $post->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> $existing[ $cmd_path ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cmd_path' => $cmd_path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::create_post_from_manifest_doc( $doc, $post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cmd_path = rtrim( str_replace( home_url( 'cli/commands/' ), '', get_permalink( $post->ID ) ), '/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cmd_path = self::get_cmd_path( $post->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $doc['repo_url'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post->ID, 'repo_url', esc_url_raw( $doc['repo_url'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,6 +478,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $matches;
</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 normalized version of the command path from the post permalink.
+ *
+ * This normalization is needed because CPTs share the slug namespace with
+ * other CPTs, causing unexpected conflicts that result in changed URLs like
+ * "command-2".
+ *
+ * @see https://github.com/wp-cli/handbook/issues/202
+ *
+ * @param int $post_id Post ID to get the normalized path for.
+ *
+ * @return string Normalized command path.
+ */
+ private static function get_cmd_path( $post_id ) {
+ $cmd_path = rtrim( str_replace( home_url( 'cli/commands/' ), '', get_permalink( $post_id ) ), '/' );
+ $parts = explode( '/', $cmd_path );
+ $cleaned_parts = array();
+ foreach ( $parts as $part ) {
+ $matches = null;
+ $result = preg_match( '/^(?<cmd>.*)(?<suffix>-[0-9]+)$/', $part, $matches );
+ if ( 1 === $result ) {
+ $part = $matches['cmd'];
+ }
+ $cleaned_parts[] = $part;
+ }
+ return implode( '/', $cleaned_parts );
+ }
+
</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"> DevHub_CLI::init();
</span></span></pre>
</div>
</div>
</body>
</html>