Merge pull request wp-cli#71 from bskrtich/master

Fix 2 small bugs related to passing in empty arrays to the table class

Author: danielbachhuber

lib/cli/Table.php

@@ -33,7 +33,7 @@ class Table {
 	 *
 	 * There are 3 ways to instantiate this class:
 	 *
-	 *  1. Pass an array of strings as the first paramater for the column headers
+	 *  1. Pass an array of strings as the first parameter for the column headers
 	 *     and a 2-dimensional array as the second parameter for the data rows.
 	 *  2. Pass an array of hash tables (string indexes instead of numerical)
 	 *     where each hash table is a row and the indexes of the *first* hash
@@ -48,7 +48,7 @@ public function __construct(array $headers = null, array $rows = null, array $fo
 		if (!empty($headers)) {
 			// If all the rows is given in $headers we use the keys from the
 			// first row for the header values
-			if (empty($rows)) {
+			if ($rows === null) {
 				$rows = $headers;
 				$keys = array_keys(array_shift($headers));
 				$headers = array();

lib/cli/table/Ascii.php

@@ -78,7 +78,7 @@ public function setWidths(array $widths) {
 	}
 
 	/**
-	 * Set the contraint width for the table
+	 * Set the constraint width for the table
 	 *
 	 * @param int $constraintWidth
 	 */
@@ -123,32 +123,36 @@ public function border() {
 	 */
 	public function row( array $row ) {
 
-		$extra_rows = array_fill( 0, count( $row ), array() );
 		$extra_row_count = 0;
-		foreach( $row as $col => $value ) {
-
-			$value = str_replace( PHP_EOL, ' ', $value );
-
-			$col_width = $this->_widths[ $col ];
-			$original_val_width = Colors::length( $value );
-			if ( $original_val_width > $col_width ) {
-				$row[ $col ] = \cli\safe_substr( $value, 0, $col_width );
-				$value = \cli\safe_substr( $value, $col_width, $original_val_width );
-				$i = 0;
-				do {
-					$extra_value = \cli\safe_substr( $value, 0, $col_width );
-					$val_width = \cli\safe_strlen( $extra_value );
-					if ( $val_width ) {
-						$extra_rows[ $col ][] = $extra_value;
-						$value = \cli\safe_substr( $value, $col_width, $original_val_width );
-						$i++;
-						if ( $i > $extra_row_count ) {
-							$extra_row_count = $i;
+
+		if ( count( $row ) > 0 ) {
+			$extra_rows = array_fill( 0, count( $row ), array() );
+
+			foreach( $row as $col => $value ) {
+
+				$value = str_replace( PHP_EOL, ' ', $value );
+
+				$col_width = $this->_widths[ $col ];
+				$original_val_width = Colors::length( $value );
+				if ( $original_val_width > $col_width ) {
+					$row[ $col ] = \cli\safe_substr( $value, 0, $col_width );
+					$value = \cli\safe_substr( $value, $col_width, $original_val_width );
+					$i = 0;
+					do {
+						$extra_value = \cli\safe_substr( $value, 0, $col_width );
+						$val_width = \cli\safe_strlen( $extra_value );
+						if ( $val_width ) {
+							$extra_rows[ $col ][] = $extra_value;
+							$value = \cli\safe_substr( $value, $col_width, $original_val_width );
+							$i++;
+							if ( $i > $extra_row_count ) {
+								$extra_row_count = $i;
+							}
 						}
-					}
-				} while( $value );
-			}
+					} while( $value );
+				}
 
+			}
 		}
 
 		$row = array_map(array($this, 'padColumn'), $row, array_keys($row));

tests/test-table-ascii.php

@@ -134,6 +134,22 @@ public function testDrawMultiplicationTable() {
 | 16 | 16 | 32 | 48 | 64 | 80 | 96 | 112 | 128 | 144 | 160 | 176 | 192 | 208 | 224 | 240 | 256 |
 +----+----+----+----+----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
 
+OUT;
+		$this->assertInOutEquals(array($headers, $rows), $output);
+	}
+
+	/**
+	 * Draw a table with headers but no data
+	 */
+	public function testDrawWithHeadersNoData() {
+		$headers = array('header 1', 'header 2');
+		$rows = array();
+		$output = <<<'OUT'
++----------+----------+
+| header 1 | header 2 |
++----------+----------+
++----------+----------+
+
 OUT;
 		$this->assertInOutEquals(array($headers, $rows), $output);
 	}