Merge pull request #17 from wp-cli/fix-dev-master-conflict

Fix conflict between dev-master and pull-request branches

Author: schlessera

.travis.yml

@@ -37,6 +37,7 @@ before_install:
   - phpenv config-rm xdebug.ini
 
 install:
+  - composer require wp-cli/wp-cli:dev-master
   - composer install
   - bash bin/install-package-tests.sh
 

composer.json

@@ -22,7 +22,7 @@
         "files": [ "server-command.php" ]
     },
     "require": {
-        "wp-cli/wp-cli": "dev-master"
+        "wp-cli/wp-cli": "*"
     },
     "require-dev": {
         "behat/behat": "~2.5"

features/bootstrap/FeatureContext.php

@@ -19,7 +19,7 @@
 		if ( ! empty( $composer->autoload->files ) ) {
 			$contents = 'require:' . PHP_EOL;
 			foreach( $composer->autoload->files as $file ) {
-				$contents .= '  - ' . dirname( dirname( dirname( __FILE__ ) ) ) . '/' . $file . PHP_EOL;
+				$contents .= '  - ' . dirname( dirname( dirname( __FILE__ ) ) ) . '/' . $file;
 			}
 			@mkdir( sys_get_temp_dir() . '/wp-cli-package-test/' );
 			$project_config = sys_get_temp_dir() . '/wp-cli-package-test/config.yml';
@@ -178,9 +178,6 @@ public static function create_cache_dir() {
 	 * @param array $parameters context parameters (set them up through behat.yml)
 	 */
 	public function __construct( array $parameters ) {
-		if ( getenv( 'WP_CLI_TEST_DBHOST' ) ) {
-			self::$db_settings['dbhost'] = getenv( 'WP_CLI_TEST_DBHOST' );
-		}
 		$this->drop_db();
 		$this->set_cache_dir();
 		$this->variables['CORE_CONFIG_SETTINGS'] = Utils\assoc_args_to_str( self::$db_settings );
@@ -318,8 +315,7 @@ public function download_wp( $subdir = '' ) {
 
 	public function create_config( $subdir = '' ) {
 		$params = self::$db_settings;
-		// 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['dbprefix'] = $subdir ?: 'wp_';
 
 		$params['skip-salts'] = true;
 		$this->proc( 'wp core config', $params, $subdir )->run_check();

features/bootstrap/utils.php

@@ -823,16 +823,3 @@ function parse_str_to_argv( $arguments ) {
 	}, $argv );
 	return $argv;
 }
-
-/**
- * Locale-independent version of basename()
- *
- * @access public
- *
- * @param string $path
- * @param string $suffix
- * @return string
- */
-function basename( $path, $suffix = '' ) {
-	return urldecode( \basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) );
-}

features/steps/given.php

@@ -109,7 +109,7 @@ function ( $world, TableNode $table ) {
 	}
 );
 
-$steps->Given( '/^save (STDOUT|STDERR) ([\'].+[^\'])?\s?as \{(\w+)\}$/',
+$steps->Given( '/^save (STDOUT|STDERR) ([\'].+[^\'])?as \{(\w+)\}$/',
 	function ( $world, $stream, $output_filter, $key ) {
 
 		$stream = strtolower( $stream );
@@ -161,4 +161,4 @@ function($world) {
 
 		file_put_contents( $wp_config_path, $wp_config_code );
 	}
-);
+);

features/steps/then.php

@@ -145,15 +145,6 @@ function ( $world, $stream ) {
 	}
 );
 
-$steps->Then( '/^(STDOUT|STDERR) should be a version string (<|<=|>|>=|==|=|!=|<>) ([+\w\.-]+)$/',
-	function ( $world, $stream, $operator, $goal_ver ) {
-		$stream = strtolower( $stream );
-		if ( false === version_compare( trim( $world->result->$stream, "\n" ), $goal_ver, $operator ) ) {
-			throw new Exception( $world->result );
-		}
-	}
-);	
-
 $steps->Then( '/^the (.+) (file|directory) should (exist|not exist|be:|contain:|not contain:)$/',
 	function ( $world, $path, $type, $action, $expected = null ) {
 		$path = $world->replace_variables( $path );

utils/behat-tags.php

@@ -15,7 +15,7 @@
 
 function version_tags( $prefix, $current, $operator = '<' ) {
 	if ( ! $current )
-		return array();
+		return;
 
 	exec( "grep '@{$prefix}-[0-9\.]*' -h -o features/*.feature | uniq", $existing_tags );