Drop Composer from the installation script

danielbachhuber · danielbachhuber · commit 26f78687eb53 · 2016-11-26T17:04:35.000-08:00
It should be pre-installed
diff --git a/bin/install-package-tests.sh b/bin/install-package-tests.sh
@@ -26,9 +26,7 @@ install_wp_cli() {
 download_behat() {
 
 	cd $PACKAGE_DIR
-	download https://getcomposer.org/installer installer
-	php installer
-	php composer.phar require --dev behat/behat='~2.5'
+	composer require --dev behat/behat='~2.5'
 
 }
 
diff --git a/inc/ScaffoldPackageCommand.php b/inc/ScaffoldPackageCommand.php
@@ -423,7 +423,7 @@ public function package_readme( $args, $assoc_args ) {
 	 * The `features/bootstrap/FeatureContext.php` file expects the
 	 * WP_CLI_BIN_DIR environment variable.
 	 *
-	 * WP-CLI Behat framework uses Behat ~2.5.
+	 * WP-CLI Behat framework uses Behat ~2.5, which is installed with Composer.
 	 *
 	 * ## OPTIONS
 	 *

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ install_wp_cli() {`
`26`	`26`	`download_behat() {`
`27`	`27`
`28`	`28`	`cd $PACKAGE_DIR`
`29`		`- download https://getcomposer.org/installer installer`
`30`		`- php installer`
`31`		`- php composer.phar require --dev behat/behat='~2.5'`
	`29`	`+ composer require --dev behat/behat='~2.5'`
`32`	`30`
`33`	`31`	`}`
`34`	`32`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ public function package_readme( $args, $assoc_args ) {`
`423`	`423`	* The `features/bootstrap/FeatureContext.php` file expects the
`424`	`424`	`* WP_CLI_BIN_DIR environment variable.`
`425`	`425`	`*`
`426`		`- * WP-CLI Behat framework uses Behat ~2.5.`
	`426`	`+ * WP-CLI Behat framework uses Behat ~2.5, which is installed with Composer.`
`427`	`427`	`*`
`428`	`428`	`* ## OPTIONS`
`429`	`429`	`*`