Merge pull request #39 from wp-cli/revert-37

Revert #37 to remove `--stdout` for `wp db export`

Author: miya0001

features/db-export.feature

@@ -42,15 +42,3 @@ Feature: Export a WordPress database
       """
       -- MySQL dump
       """
-
-    When I run `wp db export --stdout`
-    Then STDOUT should contain:
-      """
-      -- MySQL dump
-      """
-
-    When I try `wp db export - --stdout`
-    Then STDERR should be:
-      """
-      Error: The file name is not allowed when output mode is STDOUT.
-      """

src/DB_Command.php

@@ -269,9 +269,6 @@ public function query( $args, $assoc_args ) {
 	 * [--exclude_tables=<tables>]
 	 * : The comma separated list of specific tables that should be skipped from exporting. Excluding this parameter will export all tables in the database.
 	 *
-	 * [--stdout]
-	 * : Output database to STDOUT.
-	 *
 	 * [--porcelain]
 	 * : Output filename for the exported database.
 	 *
@@ -306,7 +303,7 @@ public function query( $args, $assoc_args ) {
 	 *     Success: Exported to 'wordpress_dbase-db72bb5.sql'.
 	 *
 	 *     # Export database to STDOUT.
-	 *     $ wp db export --stdout
+	 *     $ wp db export -
 	 *     -- MySQL dump 10.13  Distrib 5.7.19, for osx10.12 (x86_64)
 	 *     --
 	 *     -- Host: localhost    Database: wpdev
@@ -323,19 +320,7 @@ public function export( $args, $assoc_args ) {
 			$hash = substr( md5( mt_rand() ), 0, 7 );
 			$result_file = sprintf( '%s-%s-%s.sql', DB_NAME, date( 'Y-m-d' ), $hash );;
 		}
-
-		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'stdout' ) && ! empty( $args[0] ) ) {
-			WP_CLI::error( 'The file name is not allowed when output mode is STDOUT.' );
-		}
-
-		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'stdout' ) ) {
-			$stdout = true;
-		} elseif ( '-' === $result_file ) {
-			$stdout = true;
-		} else {
-			$stdout = false;
-		}
-
+		$stdout = ( '-' === $result_file );
 		$porcelain = \WP_CLI\Utils\get_flag_value( $assoc_args, 'porcelain' );
 
 		// Bail if both porcelain and STDOUT are set.
@@ -375,7 +360,6 @@ public function export( $args, $assoc_args ) {
 
 		// Remove parameters not needed for SQL run.
 		unset( $assoc_args['porcelain'] );
-		unset( $assoc_args['stdout'] );
 
 		self::run( $escaped_command, $assoc_args );