Ticket #3421: 3421-2.diff

wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli.php

@@ -42 +42 @@
                         'excerpt',
                         'revisions',
                         'title',
+
+                        // Needed for manual inspection/modification of the post's parent.
+                        'page-attributes',
                 );
                 register_post_type( 'command', array(
                         'has_archive' => 'cli/commands',
@@ -73 +76 @@
         }
 
         public static function action_pre_get_posts( $query ) {
-                if ( $query->is_main_query() && $query->is_post_type_archive( 'command' ) ) {
+                if ( ! is_admin() && $query->is_main_query() && $query->is_post_type_archive( 'command' ) ) {
                         $query->set( 'post_parent', 0 );
                         $query->set( 'orderby', 'title' );
                         $query->set( 'order', 'ASC' );
@@ -100 +103 @@
                 ) );
                 $existing = array();
                 foreach( $q->posts as $post ) {
-                        $cmd_path = rtrim( str_replace( home_url( 'cli/commands/' ), '', get_permalink( $post->ID ) ), '/' );
+                        $cmd_path = self::get_cmd_path( $post->ID );
                         $existing[ $cmd_path ] = array(
                                 'post_id'   => $post->ID,
                                 'cmd_path'  => $cmd_path,
@@ -144 +147 @@
                 }
                 $post = self::create_post_from_manifest_doc( $doc, $post_parent );
                 if ( $post ) {
-                        $cmd_path = rtrim( str_replace( home_url( 'cli/commands/' ), '', get_permalink( $post->ID ) ), '/' );
+                        $cmd_path = self::get_cmd_path( $post->ID );
                         if ( ! empty( $doc['repo_url'] ) ) {
                                 update_post_meta( $post->ID, 'repo_url', esc_url_raw( $doc['repo_url'] ) );
                         }
@@ -475 +478 @@
                 return $matches;
         }
 
+        /**
+         * 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 );
+        }
+
 }
 
 DevHub_CLI::init();