Merge pull request #145 from skeltoac/update-tty-checks

Update TTY checks
wp-cli · Jul 1, 2021 · a286685 · a286685
2 parents e472e08 + 36989c5
commit a286685
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/cli/Shell.php b/lib/cli/Shell.php
@@ -91,7 +91,11 @@ static public function isPiped() {
 		if ($shellPipe !== false) {
 			return filter_var($shellPipe, FILTER_VALIDATE_BOOLEAN);
 		} else {
-			return (function_exists('posix_isatty') && !posix_isatty(STDOUT));
+			if ( function_exists('stream_isatty') ) {
+				return !stream_isatty(STDOUT);
+			} else {
+				return (function_exists('posix_isatty') && !posix_isatty(STDOUT));
+			}
 		}
 	}
 

diff --git a/lib/cli/Streams.php b/lib/cli/Streams.php
@@ -14,7 +14,11 @@ static function _call( $func, $args ) {
 	}
 
 	static public function isTty() {
-		return (function_exists('posix_isatty') && posix_isatty(static::$out));
+		if ( function_exists('stream_isatty') ) {
+			return !stream_isatty(static::$out);
+		} else {
+			return (function_exists('posix_isatty') && !posix_isatty(static::$out));
+		}
 	}
 
 	/**