Merge pull request #443 from wp-cli/fix/reuse-has_stdin-from-framework

wp-cli · Nov 14, 2023 · fde2586 · fde2586
2 parents e118963 + 4b1ba25
commit fde2586
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 32 deletions.
diff --git a/src/Option_Command.php b/src/Option_Command.php
@@ -1,6 +1,5 @@
 <?php
 
-use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Formatter;
 use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 use WP_CLI\Utils;
@@ -682,7 +681,7 @@ function ( $key ) {
 		if ( 'delete' === $action ) {
 			$patch_value = null;
 		} else {
-			$stdin_value = EntityUtils::has_stdin()
+			$stdin_value = Utils\has_stdin()
 				? trim( WP_CLI::get_value_from_arg_or_stdin( $args, -1 ) )
 				: null;
 

diff --git a/src/Post_Command.php b/src/Post_Command.php
@@ -1,7 +1,6 @@
 <?php
 
 use WP_CLI\CommandWithDBObject;
-use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Fetchers\Post as PostFetcher;
 use WP_CLI\Fetchers\User as UserFetcher;
 use WP_CLI\Utils;
@@ -795,7 +794,7 @@ public function generate( $args, $assoc_args ) {
 		}
 
 		if ( Utils\get_flag_value( $assoc_args, 'post_content' ) ) {
-			if ( ! EntityUtils::has_stdin() ) {
+			if ( ! Utils\has_stdin() ) {
 				WP_CLI::error( 'The parameter `post_content` reads from STDIN.' );
 			}
 

diff --git a/src/Site_Option_Command.php b/src/Site_Option_Command.php
@@ -1,6 +1,5 @@
 <?php
 
-use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Formatter;
 use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 use WP_CLI\Utils;
@@ -372,7 +371,7 @@ function ( $key ) {
 		if ( 'delete' === $action ) {
 			$patch_value = null;
 		} else {
-			$stdin_value = EntityUtils::has_stdin()
+			$stdin_value = Utils\has_stdin()
 				? trim( WP_CLI::get_value_from_arg_or_stdin( $args, -1 ) )
 				: null;
 			$patch_value = ! empty( $stdin_value )

diff --git a/src/User_Command.php b/src/User_Command.php
@@ -1,7 +1,6 @@
 <?php
 
 use WP_CLI\CommandWithDBObject;
-use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Fetchers\User as UserFetcher;
 use WP_CLI\Formatter;
 use WP_CLI\Iterators\CSV as CsvIterator;
@@ -964,7 +963,7 @@ public function import_csv( $args, $assoc_args ) {
 				WP_CLI::error( "Couldn't access remote CSV file (HTTP {$response_code} response)." );
 			}
 		} elseif ( '-' === $filename ) {
-			if ( ! EntityUtils::has_stdin() ) {
+			if ( ! Utils\has_stdin() ) {
 				WP_CLI::error( 'Unable to read content from STDIN.' );
 			}
 		} elseif ( ! file_exists( $filename ) ) {

diff --git a/src/WP_CLI/CommandWithMeta.php b/src/WP_CLI/CommandWithMeta.php
@@ -5,8 +5,8 @@
 use Exception;
 use WP_CLI;
 use WP_CLI_Command;
-use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Traverser\RecursiveDataStructureTraverser;
+use WP_CLI\Utils;
 
 /**
  * Base class for WP-CLI commands that deal with metadata
@@ -412,7 +412,7 @@ function ( $key ) {
 		if ( 'delete' === $action ) {
 			$patch_value = null;
 		} else {
-			$stdin_value = EntityUtils::has_stdin()
+			$stdin_value = Utils\has_stdin()
 				? trim( WP_CLI::get_value_from_arg_or_stdin( $args, -1 ) )
 				: null;
 			$patch_value = ! empty( $stdin_value )

diff --git a/src/WP_CLI/Entity/Utils.php b/src/WP_CLI/Entity/Utils.php