Remove WP-CLI and add a note about usage

jdaviescoates · Mar 29, 2014 · 7a5a348 · 7a5a348
1 parent 5f33bfe
commit 7a5a348
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 325 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### HEAD
+
+* Remove wp-cli
+
 ### 1.1.1: 2014-03-11
 
 * Update phpdotenv to 1.0.6

diff --git a/README.md b/README.md
@@ -258,6 +258,12 @@ Bedrock disables the internal WP Cron via `define('DISABLE_WP_CRON', true);`. If
 
 `*/5 * * * * curl http://example.com/wp/wp-cron.php`
 
+## WP-CLI
+
+Bedrock works with [WP-CLI](http://wp-cli.org/) just like any other WordPress project would. Previously we required WP-CLI in our `composer.json` file as a dependency. This has been removed since WP-CLI now recommends installing it globally with a `phar` file. It also caused conflicts if you tried using a global install.
+
+The `wp` command will automatically pick up Bedrock's subdirectory install as long as you run commands in the `web/` dir or any path deeper. If you want to run `wp` commands from the project root (above `web/`), you'll need to manually pass the `--path=web/wp` option.
+
 ## Todo
 
 * Add Vagrant

diff --git a/composer.json b/composer.json
@@ -59,7 +59,6 @@
     "wordpress": "3.8.1",
     "fancyguy/webroot-installer": "1.1.0",
     "composer/installers": "v1.0.12",
-    "wp-cli/wp-cli": "v0.14.1",
     "vlucas/phpdotenv": "~1.0.6"
   },
   "extra": {

diff --git a/composer.lock b/composer.lock