Skip to content

Commit 79028a9

Browse files
Merge pull request #69 from wp-cli/59-drop-composer
Drop Composer from the installation script
2 parents 1f85567 + 4a6a44f commit 79028a9

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ wp-cli/scaffold-package-command
33

44
Scaffold WP-CLI commands with functional tests
55

6-
[![Build Status](https://travis-ci.org/wp-cli/scaffold-package-command.svg?branch=master)](https://travis-ci.org/wp-cli/scaffold-package-command)
7-
[![CircleCI](https://circleci.com/gh/wp-cli/scaffold-package-command/tree/master.svg?style=svg)](https://circleci.com/gh/wp-cli/scaffold-package-command/tree/master)
6+
[![Build Status](https://travis-ci.org/wp-cli/scaffold-package-command.svg?branch=master)](https://travis-ci.org/wp-cli/scaffold-package-command) [![CircleCI](https://circleci.com/gh/wp-cli/scaffold-package-command/tree/master.svg?style=svg)](https://circleci.com/gh/wp-cli/scaffold-package-command/tree/master)
87

98
Quick links: [Using](#using) | [Installing](#installing) | [Contributing](#contributing)
109

@@ -28,7 +27,7 @@ Default behavior is to create the following files:
2827
- Test harness (via wp scaffold package-tests)
2928

3029
Unless specified with `--dir=<dir>`, the command package is placed in the
31-
WP-CLI package directory.
30+
WP-CLI `packages/local/` directory.
3231

3332
**OPTIONS**
3433

@@ -131,7 +130,7 @@ calling `behat`.
131130
The `features/bootstrap/FeatureContext.php` file expects the
132131
WP_CLI_BIN_DIR environment variable.
133132

134-
WP-CLI Behat framework uses Behat ~2.5.
133+
WP-CLI Behat framework uses Behat ~2.5, which is installed with Composer.
135134

136135
**OPTIONS**
137136

bin/install-package-tests.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ install_wp_cli() {
2626
download_behat() {
2727

2828
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'
3230

3331
}
3432

inc/ScaffoldPackageCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ public function package_readme( $args, $assoc_args ) {
423423
* The `features/bootstrap/FeatureContext.php` file expects the
424424
* WP_CLI_BIN_DIR environment variable.
425425
*
426-
* WP-CLI Behat framework uses Behat ~2.5.
426+
* WP-CLI Behat framework uses Behat ~2.5, which is installed with Composer.
427427
*
428428
* ## OPTIONS
429429
*

0 commit comments

Comments
 (0)