Use env vars instead of test args.

Author: gitlost

lib/cli/Shell.php

@@ -21,20 +21,18 @@ class Shell {
 	/**
 	 * Returns the number of columns the current shell has for display.
 	 *
-	 * @param mixed $test For testing only.
-	 *
 	 * @return int  The number of columns.
 	 * @todo Test on more systems.
 	 */
-	static public function columns( $test = null ) {
+	static public function columns() {
 		static $columns;
 
-		if ( null !== $test ) {
+		if ( false !== ( $env_reset = getenv( 'WP_CLI_TEST_SHELL_COLUMNS_RESET' ) ) && $env_reset ) {
 			$columns = null;
 		}
 		if ( null === $columns ) {
 			if ( function_exists( 'exec' ) ) {
-				if ( self::is_windows( 'WIN' === $test ) ) {
+				if ( self::is_windows() ) {
 					// Cater for shells such as Cygwin and Git bash where `mode CON` returns an incorrect value for columns.
 					if ( ( $shell = getenv( 'SHELL' ) ) && preg_match( '/(?:bash|zsh)(?:.exe)?$/', $shell ) && getenv( 'TERM' ) ) {
 						$columns = (int) exec( 'tput cols' );

tests/test-shell.php

@@ -14,26 +14,40 @@ function testColumns() {
 		// Save.
 		$env_term = getenv( 'TERM' );
 		$env_columns = getenv( 'COLUMNS' );
+		$env_is_windows = getenv( 'WP_CLI_TEST_IS_WINDOWS' );
+		$env_shell_columns_reset = getenv( 'WP_CLI_TEST_SHELL_COLUMNS_RESET' );
+
+		putenv( 'WP_CLI_TEST_SHELL_COLUMNS_RESET=1' );
 
 		// No TERM should result in default 80.
 
 		putenv( 'TERM' );
-		$columns = cli\Shell::columns( true /*test*/ );
+
+		putenv( 'WP_CLI_TEST_IS_WINDOWS=0' );
+		$columns = cli\Shell::columns();
 		$this->assertSame( 80, $columns );
-		$columns = cli\Shell::columns( 'WIN' /*test*/ );
+
+		putenv( 'WP_CLI_TEST_IS_WINDOWS=1' );
+		$columns = cli\Shell::columns();
 		$this->assertSame( 80, $columns );
 
 		// TERM and COLUMNS should result in whatever COLUMNS is.
 
 		putenv( 'TERM=vt100' );
 		putenv( 'COLUMNS=100' );
-		$columns = cli\Shell::columns( true /*test*/ );
+
+		putenv( 'WP_CLI_TEST_IS_WINDOWS=0' );
+		$columns = cli\Shell::columns();
 		$this->assertSame( 100, $columns );
-		$columns = cli\Shell::columns( 'WIN' /*test*/ );
+
+		putenv( 'WP_CLI_TEST_IS_WINDOWS=1' );
+		$columns = cli\Shell::columns();
 		$this->assertSame( 100, $columns );
 
 		// Restore.
 		putenv( false === $env_term ? 'TERM' : "TERM=$env_term" );
 		putenv( false === $env_columns ? 'COLUMNS' : "COLUMNS=$env_columns" );
+		putenv( false === $env_is_windows ? 'WP_CLI_TEST_IS_WINDOWS' : "WP_CLI_TEST_IS_WINDOWS=$env_is_windows" );
+		putenv( false === $env_shell_columns_reset ? 'WP_CLI_TEST_SHELL_COLUMNS_RESET' : "WP_CLI_TEST_SHELL_COLUMNS_RESET=$env_shell_columns_reset" );
 	}
 }