Merge pull request #104 from wp-cli/loading-order-fix

Only add commands if `scaffold` is already loaded.

Author: danielbachhuber

scaffold-package-command.php

@@ -4,11 +4,20 @@
 	return;
 }
 
-$autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
-if ( file_exists( $autoload ) ) {
-	require_once $autoload;
-}
+$registration = function () {
+	$autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
+	if ( file_exists( $autoload ) ) {
+		require_once $autoload;
+	}
+
+	WP_CLI::add_command( 'scaffold package', array( 'WP_CLI\ScaffoldPackageCommand', 'package' ) );
+	WP_CLI::add_command( 'scaffold package-readme', array( 'WP_CLI\ScaffoldPackageCommand', 'package_readme' ) );
+	WP_CLI::add_command( 'scaffold package-tests', array( 'WP_CLI\ScaffoldPackageCommand', 'package_tests' ) );
+};
 
-WP_CLI::add_command( 'scaffold package', array( 'WP_CLI\ScaffoldPackageCommand', 'package' ) );
-WP_CLI::add_command( 'scaffold package-readme', array( 'WP_CLI\ScaffoldPackageCommand', 'package_readme' ) );
-WP_CLI::add_command( 'scaffold package-tests', array( 'WP_CLI\ScaffoldPackageCommand', 'package_tests' ) );
+// Only use command hooks in versions that support them.
+if ( version_compare( WP_CLI_VERSION, '1.2.0-alpha', '>=' ) ) {
+	WP_CLI::add_hook( 'after_add_command:scaffold', $registration );
+} else {
+	$registration();
+}