@@ -753,3 +753,53 @@ Feature: WP-CLI Commands
       """
       Did you mean
       """
+
+  Scenario: Adding a command can be aborted through the hooks system
+    Given an empty directory
+    And a abort-add-command.php file:
+      """
+      <?php
+      WP_CLI::add_hook( 'before_add_command:test-command-2', function ( $addition ) {
+        $addition->abort( 'Testing hooks.' );
+      } );
+
+      WP_CLI::add_command( 'test-command-1', function () {} );
+      WP_CLI::add_command( 'test-command-2', function () {} );
+      """
+
+    When I run `wp --require=abort-add-command.php`
+    Then STDOUT should contain:
+      """
+      test-command-1
+      """
+    And STDOUT should not contain:
+      """
+      test-command-2
+      """
+
+  Scenario: Adding a command can depend on a previous command having been added before
+    Given an empty directory
+    And a add-dependent-command.php file:
+      """
+      <?php
+      class TestCommand {
+      }
+
+      WP_CLI::add_hook( 'after_add_command:test-command', function () {
+        WP_CLI::add_command( 'test-command sub-command', function () {} );
+      } );
+
+      WP_CLI::add_command( 'test-command', 'TestCommand' );
+      """
+
+    When I run `wp --require=add-dependent-command.php`
+    Then STDOUT should contain:
+      """
+      test-command
+      """
+
+    When I run `wp --require=add-dependent-command.php help test-command`
+    Then STDOUT should contain:
+      """
+      sub-command
+      """
@@ -1,5 +1,8 @@
 <?php
 
+// Store the path to the Phar early on for `Utils\phar-safe-path()` function.
+define( 'WP_CLI_PHAR_PATH', getcwd() );
+
 if ( file_exists( 'phar://wp-cli.phar/php/wp-cli.php' ) ) {
 	define( 'WP_CLI_ROOT', 'phar://wp-cli.phar' );
 	include WP_CLI_ROOT . '/php/wp-cli.php';
 
@@ -135,7 +135,7 @@ function set_file_contents( $phar, $path, $content ) {
 	->files()
 	->ignoreVCS(true)
 	->ignoreDotFiles(false)
-	->in( WP_CLI_ROOT . '/vendor/wp-cli/config-command/templates')
+	->in( WP_CLI_VENDOR_DIR . '/wp-cli/config-command/templates')
 	;
 foreach ( $finder as $file ) {
 	add_file( $phar, $file );
@@ -146,7 +146,7 @@ function set_file_contents( $phar, $path, $content ) {
 	->files()
 	->ignoreVCS(true)
 	->ignoreDotFiles(false)
-	->in( WP_CLI_ROOT . '/vendor/wp-cli/scaffold-command/templates')
+	->in( WP_CLI_VENDOR_DIR . '/wp-cli/scaffold-command/templates')
 	;
 foreach ( $finder as $file ) {
 	add_file( $phar, $file );