Merge pull request #91 from wp-cli/use-psr-4

Use PSR-4 for autoloading

Author: schlessera

composer.json

@@ -16,15 +16,19 @@
     ],
     "minimum-stability": "dev",
     "autoload": {
-        "files": [ "command.php" ]
+        "psr-4": { "WP_CLI\\": "src" },
+        "files": [ "scaffold-package-command.php" ]
     },
     "require": {
-        "wp-cli/wp-cli": "^1.0.0"
+        "wp-cli/wp-cli": "dev-master"
     },
     "require-dev": {
         "behat/behat": "~2.5"
     },
     "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        },
         "commands": [
             "scaffold package",
             "scaffold package-tests",

command.php scaffold-package-command.phpcommand.php renamed to scaffold-package-command.php

@@ -4,7 +4,10 @@
 	return;
 }
 
-require_once __DIR__ . '/inc/ScaffoldPackageCommand.php';
+$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' ) );

inc/ScaffoldPackageCommand.php src/ScaffoldPackageCommand.phpinc/ScaffoldPackageCommand.php renamed to src/ScaffoldPackageCommand.php

@@ -87,12 +87,16 @@ public function package( $args, $assoc_args ) {
 
 		$package_root = dirname( dirname( __FILE__ ) );
 		$template_path = $package_root . '/templates/';
+		$wp_cli_yml = <<<EOT
+require:
+  - command.php
+EOT;
 
 		$files_written = $this->create_files( array(
 			"{$package_dir}/.gitignore"     => file_get_contents( "{$package_root}/.gitignore" ),
 			"{$package_dir}/.editorconfig"  => file_get_contents( "{$package_root}/.editorconfig" ),
 			"{$package_dir}/.distignore"    => file_get_contents( "{$package_root}/.distignore" ),
-			"{$package_dir}/wp-cli.yml"     => file_get_contents( "{$package_root}/wp-cli.yml" ),
+			"{$package_dir}/wp-cli.yml"     => $wp_cli_yml,
 			"{$package_dir}/command.php"    => Utils\mustache_render( "{$template_path}/command.mustache", $assoc_args ),
 			"{$package_dir}/composer.json"  => Utils\mustache_render( "{$template_path}/composer.mustache", $assoc_args ),
 		), $force );

wp-cli.yml

@@ -1,2 +1,2 @@
 require:
-  - command.php
+  - scaffold-package-command.php