Changeset 11949 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli-commands.php

Timestamp:

07/07/2022 03:23:38 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Developer, CLI: Move the path validation checks closer together for consistency.

Follow-up to [7717], [10692], [10693].

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/cli-commands.php (modified) (3 diffs)

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

@@ -9 +9 @@
          *
          * The source code for the version of WordPress to be parsed needs to be
-         * obtained and unpackaged locally. You should not be code used in an
+         * obtained and unpackaged locally. It should not be code used in an
          * active install.
          *
@@ -80 +80 @@
                 }
 
-                // Determine importing user's ID. 
-                $user = get_user_by( 'id', $user_id );
-                if ( ! $user ) {
-                        WP_CLI::error( 'Invalid user_id provided.' );
-                }
-                WP_CLI::log( "Importing as user ID $user_id ({$user->user_nicename})." );
-
-                $plugins = [
-                        'phpdoc-parser'  => 'phpdoc-parser/plugin.php',
-                        'posts-to-posts' => 'posts-to-posts/posts-to-posts.php',
-                ];
-
                 // Verify path is not a file.
                 if ( is_file( $path ) ) {
@@ -113 +101 @@
                         WP_CLI::confirm( "Looks like WP $version was already parsed on " . date_i18n( 'Y-m-d H:i', $last_parsed_date ) . ". Proceed anyway?" );
                 }
+
+                // Determine importing user's ID. 
+                $user = get_user_by( 'id', $user_id );
+                if ( ! $user ) {
+                        WP_CLI::error( 'Invalid user_id provided.' );
+                }
+                WP_CLI::log( "Importing as user ID $user_id ({$user->user_nicename})." );
+
+                $plugins = [
+                        'phpdoc-parser'  => 'phpdoc-parser/plugin.php',
+                        'posts-to-posts' => 'posts-to-posts/posts-to-posts.php',
+                ];
 
                 // Get the phpdoc-parser plugin if not installed.