Move to padColumn

swissspidy · swissspidy · commit ab44ee39335b · 2025-03-03T16:58:20.000+01:00
diff --git a/lib/cli/table/Ascii.php b/lib/cli/table/Ascii.php
@@ -138,7 +138,6 @@ public function row( array $row ) {
 
 			foreach ( $row as $col => $value ) {
 				$value              = $value ?: '';
-				$value              = str_replace( "\t", '    ', $value );
 				$col_width          = $this->_widths[ $col ];
 				$encoding           = function_exists( 'mb_detect_encoding' ) ? mb_detect_encoding( $value, null, true /*strict*/ ) : false;
 				$original_val_width = Colors::width( $value, self::isPreColorized( $col ), $encoding );
@@ -199,6 +198,7 @@ public function row( array $row ) {
 	}
 
 	private function padColumn($content, $column) {
+		$content = str_replace( "\t", '    ', $content );
 		return $this->_characters['padding'] . Colors::pad( $content, $this->_widths[ $column ], $this->isPreColorized( $column ) ) . $this->_characters['padding'];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ public function row( array $row ) {`
`138`	`138`
`139`	`139`	`foreach ( $row as $col => $value ) {`
`140`	`140`	`$value = $value ?: '';`
`141`		`- $value = str_replace( "\t", ' ', $value );`
`142`	`141`	`$col_width = $this->_widths[ $col ];`
`143`	`142`	`$encoding = function_exists( 'mb_detect_encoding' ) ? mb_detect_encoding( $value, null, true /strict/ ) : false;`
`144`	`143`	`$original_val_width = Colors::width( $value, self::isPreColorized( $col ), $encoding );`
`@@ -199,6 +198,7 @@ public function row( array $row ) {`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`private function padColumn($content, $column) {`
	`201`	`+ $content = str_replace( "\t", ' ', $content );`
`202`	`202`	`return $this->_characters['padding'] . Colors::pad( $content, $this->_widths[ $column ], $this->isPreColorized( $column ) ) . $this->_characters['padding'];`
`203`	`203`	`}`
`204`	`204`