Use PSR-4 for autoloading

danielbachhuber · danielbachhuber · commit ec6b476ad209 · 2017-03-23T12:38:52.000-07:00
diff --git a/composer.json b/composer.json
@@ -16,15 +16,21 @@
     ],
     "minimum-stability": "dev",
     "autoload": {
-        "files": [ "command.php" ]
+        "psr-4": {
+            "WP_CLI\\": "src/WP_CLI"
+        },
+        "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",
diff --git a/scaffold-package-command.php b/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 ) && ! class_exists( 'WP_CLI\ScaffoldPackageCommand' ) ) {
+	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' ) );
diff --git a/src/WP_CLI/ScaffoldPackageCommand.php b/src/WP_CLI/ScaffoldPackageCommand.php
diff --git a/wp-cli.yml b/wp-cli.yml
@@ -1,2 +1,2 @@
 require:
-  - command.php
+  - scaffold-package-command.php

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`require:`
`2`		`- - command.php`
	`2`	`+ - scaffold-package-command.php`