From 16c61961cf8c26b48d6546e14f25fddb4635e00b Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Thu, 23 Mar 2017 15:51:47 -0700
Subject: [PATCH 1/2] Use Composer to install WP-CLI in tests

Doing so ensures tests run against local copy of command, instead of
Phar bundled version.
---
 .travis.yml                           | 15 ++++++++++----
 bin/install-package-tests.sh          | 30 ---------------------------
 composer.json                         |  6 +++++-
 export-command.php                    |  2 +-
 features/bootstrap/FeatureContext.php |  3 ++-
 5 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6aa217ee1..06ae36d0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,8 @@ cache:
 
 env:
   global:
-    - WP_CLI_BIN_DIR=/tmp/wp-cli-phar
+    - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
+    - WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
 
 matrix:
   include:
@@ -32,9 +33,15 @@ matrix:
     - php: 5.3
       env: WP_VERSION=latest
 
-before_script:
+before_install:
   - phpenv config-rm xdebug.ini
-  - composer validate
+
+install:
+  - composer install
   - bash bin/install-package-tests.sh
 
-script: ./vendor/bin/behat --format progress --strict
+before_script:
+  - composer validate
+
+script:
+  - behat --format progress --strict
diff --git a/bin/install-package-tests.sh b/bin/install-package-tests.sh
index 3026f0826..2ff49dd8d 100755
--- a/bin/install-package-tests.sh
+++ b/bin/install-package-tests.sh
@@ -2,39 +2,9 @@
 
 set -ex
 
-WP_CLI_BIN_DIR=${WP_CLI_BIN_DIR-/tmp/wp-cli-phar}
-
-PACKAGE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
-
-download() {
-    if [ `which curl` ]; then
-        curl -s "$1" > "$2";
-    elif [ `which wget` ]; then
-        wget -nv -O "$2" "$1"
-    fi
-}
-
-install_wp_cli() {
-
-	# the Behat test suite will pick up the executable found in $WP_CLI_BIN_DIR
-	mkdir -p $WP_CLI_BIN_DIR
-	download https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar $WP_CLI_BIN_DIR/wp
-	chmod +x $WP_CLI_BIN_DIR/wp
-
-}
-
-download_behat() {
-
-	cd $PACKAGE_DIR
-	composer require --dev behat/behat='~2.5'
-
-}
-
 install_db() {
 	mysql -e 'CREATE DATABASE IF NOT EXISTS wp_cli_test;' -uroot
 	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test.* TO "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot
 }
 
-install_wp_cli
-download_behat
 install_db
diff --git a/composer.json b/composer.json
index 68318baeb..b72073e90 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,16 @@
         "files": [ "export-command.php" ]
     },
     "require": {
-        "nb/oxymel": "~0.1.0"
+        "nb/oxymel": "~0.1.0",
+        "wp-cli/wp-cli": "dev-master"
     },
     "require-dev": {
         "behat/behat": "~2.5"
     },
     "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        },
         "commands": [
             "export"
         ]
diff --git a/export-command.php b/export-command.php
index 4add2dfca..e3c427727 100644
--- a/export-command.php
+++ b/export-command.php
@@ -5,7 +5,7 @@
 }
 
 $autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
-if ( file_exists( $autoload ) ) {
+if ( file_exists( $autoload ) && ! class_exists( 'Export_Command' ) ) {
 	require_once $autoload;
 }
 
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
index cc72cc02c..dfbbfa016 100644
--- a/features/bootstrap/FeatureContext.php
+++ b/features/bootstrap/FeatureContext.php
@@ -318,7 +318,8 @@ public function download_wp( $subdir = '' ) {
 
 	public function create_config( $subdir = '' ) {
 		$params = self::$db_settings;
-		$params['dbprefix'] = $subdir ?: 'wp_';
+		// Replaces all characters that are not alphanumeric or an underscore into an underscore.
+		$params['dbprefix'] = $subdir ? preg_replace( '#[^a-zA-Z\_0-9]#', '_', $subdir ) : 'wp_';
 
 		$params['skip-salts'] = true;
 		$this->proc( 'wp core config', $params, $subdir )->run_check();

From 31c0582b2c85f394327d7a4b23c9278a4f0ad559 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel@handbuilt.co>
Date: Fri, 24 Mar 2017 05:39:13 -0700
Subject: [PATCH 2/2] Remove unnecessary class_exists() check

---
 export-command.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/export-command.php b/export-command.php
index e3c427727..4add2dfca 100644
--- a/export-command.php
+++ b/export-command.php
@@ -5,7 +5,7 @@
 }
 
 $autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
-if ( file_exists( $autoload ) && ! class_exists( 'Export_Command' ) ) {
+if ( file_exists( $autoload ) ) {
 	require_once $autoload;
 }