Fix remaining template issues

Author: schlessera

src/ScaffoldPackageCommand.php

@@ -105,7 +105,7 @@ public function package( $args, $assoc_args ) {
 		$template_path = $package_root . '/templates/';
 		$wp_cli_yml = <<<EOT
 require:
-  - command.php
+  - hello-world-command.php
 EOT;
 
 		$files_written = $this->create_files( array(

templates/HelloWorldCommand.mustache

@@ -5,22 +5,20 @@ namespace WP_CLI\HelloWorld;
 use WP_CLI;
 use WP_CLI_Command;
 
-/**
- * Greets the world.
- *
- * ## EXAMPLES
- *
- *     # Greet the world.
- *     $ wp hello-world
- *     Success: Hello World!
- */
 class HelloWorldCommand extends WP_CLI_Command {
 
 	/**
-	 * Invoke the command.
+	 * Greets the world.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     # Greet the world.
+	 *     $ wp hello-world
+	 *     Success: Hello World!
 	 *
 	 * @param array $args       Indexed array of positional arguments.
 	 * @param array $assoc_args Associative array of associative arguments.
+	 */
 	public function __invoke( $args, $assoc_args ) {
 		WP_CLI::success( 'Hello World!' );
 	}

templates/hello-world-command.mustache

@@ -8,21 +8,6 @@ if ( ! class_exists( '\WP_CLI' ) ) {
 	return;
 }
 
-/**
- * Says "Hello World" to new users
- *
- * @when before_wp_load
- */
-$hello_world_command = function() {
-	WP_CLI::success( "Hello world." );
-};
-WP_CLI::add_command( 'hello-world', $hello_world_command );
-<?php
-
-if ( ! class_exists( 'WP_CLI' ) ) {
-	return;
-}
-
 $wpcli_hello_world_autoloader = __DIR__ . '/vendor/autoload.php';
 
 if ( file_exists( $wpcli_hello_world_autoloader ) ) {