Use forced width attribution as fallback only to avoid scrappiong man…

…ual widths
wp-cli · Aug 22, 2018 · 554b262 · 554b262
1 parent 766653b
commit 554b262
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lib/cli/Table.php b/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();

diff --git a/lib/cli/table/Ascii.php b/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();

diff --git a/lib/cli/table/Renderer.php b/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;
 	}