Check COLUMNS early and on all platforms

Author: swissspidy

lib/cli/Shell.php

@@ -31,7 +31,7 @@ static public function columns() {
 			$columns = null;
 		}
 		if ( null === $columns ) {
-			if ( function_exists( 'exec' ) ) {
+			if ( ! ( $columns = (int) getenv( 'COLUMNS' ) ) && function_exists( 'exec' ) ) {
 				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' ) ) {
@@ -49,15 +49,13 @@ static public function columns() {
 						}
 					}
 				} else {
-					if ( ! ( $columns = (int) getenv( 'COLUMNS' ) ) ) {
-						$size = exec( '/usr/bin/env stty size 2>/dev/null' );
-						if ( '' !== $size && preg_match( '/[0-9]+ ([0-9]+)/', $size, $matches ) ) {
-							$columns = (int) $matches[1];
-						}
-						if ( ! $columns ) {
-							if ( getenv( 'TERM' ) ) {
-								$columns = (int) exec( '/usr/bin/env tput cols 2>/dev/null' );
-							}
+					$size = exec( '/usr/bin/env stty size 2>/dev/null' );
+					if ( '' !== $size && preg_match( '/[0-9]+ ([0-9]+)/', $size, $matches ) ) {
+						$columns = (int) $matches[1];
+					}
+					if ( ! $columns ) {
+						if ( getenv( 'TERM' ) ) {
+							$columns = (int) exec( '/usr/bin/env tput cols 2>/dev/null' );
 						}
 					}
 				}