Merge pull request #136 from wp-cli/135-fix-manual-width-attribution

Use forced width attribution as fallback only to avoid scrapping manual widths

Author: schlessera

lib/cli/Table.php

@@ -136,7 +136,7 @@ public function display() {
 	 * @return array
 	 */
 	public function getDisplayLines() {
-		$this->_renderer->setWidths($this->_width);
+		$this->_renderer->setWidths($this->_width, $fallback = true);
 		$border = $this->_renderer->border();
 
 		$out = array();

lib/cli/table/Ascii.php

@@ -32,9 +32,16 @@ class Ascii extends Renderer {
 	/**
 	 * Set the widths of each column in the table.
 	 *
-	 * @param array  $widths  The widths of the columns.
+	 * @param array  $widths    The widths of the columns.
+	 * @param bool   $fallback  Whether to use these values as fallback only.
 	 */
-	public function setWidths(array $widths) {
+	public function setWidths(array $widths, $fallback = false) {
+		if ($fallback) {
+			foreach ( $this->_widths as $index => $value ) {
+			    $widths[$index] = $value;
+			}
+		}
+		$this->_widths = $widths;
 
 		if ( is_null( $this->_constraintWidth ) ) {
 			$this->_constraintWidth = (int) Shell::columns();

lib/cli/table/Renderer.php

@@ -25,9 +25,15 @@ public function __construct(array $widths = array()) {
 	/**
 	 * Set the widths of each column in the table.
 	 *
-	 * @param array  $widths  The widths of the columns.
+	 * @param array  $widths    The widths of the columns.
+	 * @param bool   $fallback  Whether to use these values as fallback only.
 	 */
-	public function setWidths(array $widths) {
+	public function setWidths(array $widths, $fallback = false) {
+		if ($fallback) {
+			foreach ( $this->_widths as $index => $value ) {
+			    $widths[$index] = $value;
+			}
+		}
 		$this->_widths = $widths;
 	}