Address code review feedback for table headers

Author: swissspidy

lib/cli/Table.php

@@ -72,7 +72,11 @@ public function __construct( array $headers = array(), array $rows = array(), ar
 				$rows      = $headers;
 				$first_row = array_shift( $headers );
 				$keys      = is_array( $first_row ) ? array_keys( $first_row ) : array();
-				$headers   = array_map( $safe_strval, $keys );
+
+				$headers = array();
+				foreach ( $keys as $key ) {
+					$headers[ $key ] = $safe_strval( $key );
+				}
 			} else {
 				$headers = array_map( $safe_strval, $headers );
 			}
@@ -82,7 +86,11 @@ public function __construct( array $headers = array(), array $rows = array(), ar
 			$safe_rows = array();
 			foreach ( $rows as $row ) {
 				if ( is_array( $row ) ) {
-					$safe_rows[] = array_map( $safe_strval, $row );
+					$normalized_row = array();
+					foreach ( $headers as $key => $header_val ) {
+						$normalized_row[ $key ] = isset( $row[ $key ] ) ? $safe_strval( $row[ $key ] ) : '';
+					}
+					$safe_rows[] = $normalized_row;
 				}
 			}
 			$this->setRows( $safe_rows );

tests/Test_Table.php

@@ -399,6 +399,48 @@ public function test_resetRows() {
 		$this->assertGreaterThan( 0, count( $out ) );
 	}
 
+	public function test_shortcut_constructor_tabular() {
+		$headers = array(
+			array( 'Name' => 'Alice', 'Age' => '30' ),
+			array( 'Name' => 'Bob', 'Age' => '25' ),
+		);
+
+		$table = new cli\Table( $headers );
+		$table->setRenderer( new cli\Table\Tabular() );
+
+		$out = $table->getDisplayLines();
+
+		$expected = [
+			"Name\tAge",
+			"Alice\t30",
+			"Bob\t25",
+		];
+
+		$this->assertSame( $expected, $out );
+	}
+
+	public function test_shortcut_constructor_normalization() {
+		$headers = array(
+			array( 'Name' => 'Alice', 'Age' => '30' ),
+			array( 'Age' => '25', 'Name' => 'Bob' ), // Different order
+			array( 'Name' => 'Charlie' ), // Missing Age
+		);
+
+		$table = new cli\Table( $headers );
+		$table->setRenderer( new cli\Table\Tabular() );
+
+		$out = $table->getDisplayLines();
+
+		$expected = [
+			"Name\tAge",
+			"Alice\t30",
+			"Bob\t25", // Order should be normalized to match headers!
+			"Charlie\t", // Missing value should be empty string
+		];
+
+		$this->assertSame( $expected, $out );
+	}
+
 	public function test_displayRow_ascii() {
 		$mockFile = tempnam( sys_get_temp_dir(), 'temp' );
 		$resource = fopen( $mockFile, 'wb' );