Merge pull request #99 from TheDragonCode/patch/table-view

andrey-helldar · web-flow · commit ce1c2460cab6 · 2026-02-16T15:51:50.000+03:00
Revert "Refactor `TableView` to improve separator handling with distinct header and footer methods
diff --git a/src/View/TableView.php b/src/View/TableView.php
@@ -19,7 +19,7 @@ public function show(array $data): void
         $headers = $this->headers($data);
         $widths  = $this->columnWidths($headers, $data);
 
-        $this->writeHeaderLine($widths);
+        $this->writeLine($this->separator($widths));
         $this->writeLine($this->formatRow($headers, $widths));
         $this->writeLine($this->separator($widths));
 
@@ -33,7 +33,7 @@ public function show(array $data): void
             $this->writeLine($this->formatRow(array_values($row), $widths));
         }
 
-        $this->writeFooterLine($widths);
+        $this->writeLine($this->separator($widths));
     }
 
     protected function headers(array $data): array
@@ -54,25 +54,11 @@ protected function columnWidths(array $headers, array $data): array
         return $widths;
     }
 
-    protected function writeHeaderLine(array $widths): void
-    {
-        $this->writeLine(
-            $this->separator($widths, '┌', '┬', '┐')
-        );
-    }
-
-    protected function writeFooterLine(array $widths): void
-    {
-        $this->writeLine(
-            $this->separator($widths, '└', '┴', '┘')
-        );
-    }
-
-    protected function separator(array $widths, string $start = '├', string $divider = '┼', string $end = '┤'): string
+    protected function separator(array $widths): string
     {
-        $parts = array_map(static fn (int $w) => str_repeat('─', $w + 2), $widths);
+        $parts = array_map(fn (int $w) => str_repeat('-', $w + 2), $widths);
 
-        return $start . implode($divider, $parts) . $end;
+        return '+' . implode('+', $parts) . '+';
     }
 
     protected function formatRow(array $values, array $widths): string
@@ -83,6 +69,6 @@ protected function formatRow(array $values, array $widths): string
             $cells[] = ' ' . mb_str_pad((string) $value, $widths[$i]) . ' ';
         }
 
-        return '│' . implode('│', $cells) . '│';
+        return '|' . implode('|', $cells) . '|';
     }
 }
diff --git a/tests/.pest/snapshots/Unit/Result/ToConsoleTest/compare.snap b/tests/.pest/snapshots/Unit/Result/ToConsoleTest/compare.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬───────────────────────────────┬──────────────────────────────┐
-│ #     │ 0                             │ 1                            │
-├───────┼───────────────────────────────┼──────────────────────────────┤
-│ min   │ 15.67890123 ms - 202 bytes    │ 2.3456789 ms - 102 bytes     │
-│ max   │ 112.78901234 ms - 209 bytes   │ 9.75678901 ms - 109 bytes    │
-│ avg   │ 53.02524845125 ms - 205 bytes │ 5.94290024625 ms - 105 bytes │
-│ total │ 424.20198761 ms - 1.61 KB     │ 47.54320197 ms - 844 bytes   │
-├───────┼───────────────────────────────┼──────────────────────────────┤
-│ order │ 2                             │ 1                            │
-└───────┴───────────────────────────────┴──────────────────────────────┘
++-------+-------------------------------+------------------------------+
+| #     | 0                             | 1                            |
++-------+-------------------------------+------------------------------+
+| min   | 15.67890123 ms - 202 bytes    | 2.3456789 ms - 102 bytes     |
+| max   | 112.78901234 ms - 209 bytes   | 9.75678901 ms - 109 bytes    |
+| avg   | 53.02524845125 ms - 205 bytes | 5.94290024625 ms - 105 bytes |
+| total | 424.20198761 ms - 1.61 KB     | 47.54320197 ms - 844 bytes   |
++-------+-------------------------------+------------------------------+
+| order | 2                             | 1                            |
++-------+-------------------------------+------------------------------+
diff --git a/tests/.pest/snapshots/Unit/Result/ToConsoleTest/deviations.snap b/tests/.pest/snapshots/Unit/Result/ToConsoleTest/deviations.snap
@@ -2,16 +2,16 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌──────────────────┬───────────────────────────────┬──────────────────────────────┐
-│ #                │ 0                             │ 1                            │
-├──────────────────┼───────────────────────────────┼──────────────────────────────┤
-│ min              │ 15.67890123 ms - 202 bytes    │ 2.3456789 ms - 102 bytes     │
-│ max              │ 112.78901234 ms - 209 bytes   │ 9.75678901 ms - 109 bytes    │
-│ avg              │ 53.02524845125 ms - 205 bytes │ 5.94290024625 ms - 105 bytes │
-│ total            │ 848.40397522 ms - 3.21 KB     │ 95.08640394 ms - 1.65 KB     │
-├──────────────────┼───────────────────────────────┼──────────────────────────────┤
-│ order            │ 2                             │ 1                            │
-├──────────────────┼───────────────────────────────┼──────────────────────────────┤
-│ deviation time   │ 0%                            │ 0%                           │
-│ deviation memory │ 0%                            │ 0%                           │
-└──────────────────┴───────────────────────────────┴──────────────────────────────┘
++------------------+-------------------------------+------------------------------+
+| #                | 0                             | 1                            |
++------------------+-------------------------------+------------------------------+
+| min              | 15.67890123 ms - 202 bytes    | 2.3456789 ms - 102 bytes     |
+| max              | 112.78901234 ms - 209 bytes   | 9.75678901 ms - 109 bytes    |
+| avg              | 53.02524845125 ms - 205 bytes | 5.94290024625 ms - 105 bytes |
+| total            | 848.40397522 ms - 3.21 KB     | 95.08640394 ms - 1.65 KB     |
++------------------+-------------------------------+------------------------------+
+| order            | 2                             | 1                            |
++------------------+-------------------------------+------------------------------+
+| deviation time   | 0%                            | 0%                           |
+| deviation memory | 0%                            | 0%                           |
++------------------+-------------------------------+------------------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/default.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/default.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬───────────────────────────────┬──────────────────────────────┐
-│ #     │ 0                             │ 1                            │
-├───────┼───────────────────────────────┼──────────────────────────────┤
-│ min   │ 15.67890123 ms - 202 bytes    │ 2.3456789 ms - 102 bytes     │
-│ max   │ 112.78901234 ms - 209 bytes   │ 9.75678901 ms - 109 bytes    │
-│ avg   │ 53.02524845125 ms - 205 bytes │ 5.94290024625 ms - 105 bytes │
-│ total │ 424.20198761 ms - 1.61 KB     │ 47.54320197 ms - 844 bytes   │
-├───────┼───────────────────────────────┼──────────────────────────────┤
-│ order │ 2                             │ 1                            │
-└───────┴───────────────────────────────┴──────────────────────────────┘
++-------+-------------------------------+------------------------------+
+| #     | 0                             | 1                            |
++-------+-------------------------------+------------------------------+
+| min   | 15.67890123 ms - 202 bytes    | 2.3456789 ms - 102 bytes     |
+| max   | 112.78901234 ms - 209 bytes   | 9.75678901 ms - 109 bytes    |
+| avg   | 53.02524845125 ms - 205 bytes | 5.94290024625 ms - 105 bytes |
+| total | 424.20198761 ms - 1.61 KB     | 47.54320197 ms - 844 bytes   |
++-------+-------------------------------+------------------------------+
+| order | 2                             | 1                            |
++-------+-------------------------------+------------------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___0__.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___0__.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬────────────────────┬───────────────────┐
-│ #     │ 0                  │ 1                 │
-├───────┼────────────────────┼───────────────────┤
-│ min   │ 16 ms - 202 bytes  │ 2 ms - 102 bytes  │
-│ max   │ 113 ms - 209 bytes │ 10 ms - 109 bytes │
-│ avg   │ 53 ms - 205 bytes  │ 6 ms - 105 bytes  │
-│ total │ 424 ms - 1.61 KB   │ 48 ms - 844 bytes │
-├───────┼────────────────────┼───────────────────┤
-│ order │ 2                  │ 1                 │
-└───────┴────────────────────┴───────────────────┘
++-------+--------------------+-------------------+
+| #     | 0                  | 1                 |
++-------+--------------------+-------------------+
+| min   | 16 ms - 202 bytes  | 2 ms - 102 bytes  |
+| max   | 113 ms - 209 bytes | 10 ms - 109 bytes |
+| avg   | 53 ms - 205 bytes  | 6 ms - 105 bytes  |
+| total | 424 ms - 1.61 KB   | 48 ms - 844 bytes |
++-------+--------------------+-------------------+
+| order | 2                  | 1                 |
++-------+--------------------+-------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___0____0_.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___0____0_.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬────────────────────┬───────────────────┐
-│ #     │ 0                  │ 1                 │
-├───────┼────────────────────┼───────────────────┤
-│ min   │ 16 ms - 202 bytes  │ 2 ms - 102 bytes  │
-│ max   │ 113 ms - 209 bytes │ 10 ms - 109 bytes │
-│ avg   │ 53 ms - 205 bytes  │ 6 ms - 105 bytes  │
-│ total │ 424 ms - 1.61 KB   │ 48 ms - 844 bytes │
-├───────┼────────────────────┼───────────────────┤
-│ order │ 2                  │ 1                 │
-└───────┴────────────────────┴───────────────────┘
++-------+--------------------+-------------------+
+| #     | 0                  | 1                 |
++-------+--------------------+-------------------+
+| min   | 16 ms - 202 bytes  | 2 ms - 102 bytes  |
+| max   | 113 ms - 209 bytes | 10 ms - 109 bytes |
+| avg   | 53 ms - 205 bytes  | 6 ms - 105 bytes  |
+| total | 424 ms - 1.61 KB   | 48 ms - 844 bytes |
++-------+--------------------+-------------------+
+| order | 2                  | 1                 |
++-------+--------------------+-------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___2__.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___2__.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬───────────────────────┬──────────────────────┐
-│ #     │ 0                     │ 1                    │
-├───────┼───────────────────────┼──────────────────────┤
-│ min   │ 15.68 ms - 202 bytes  │ 2.35 ms - 102 bytes  │
-│ max   │ 112.79 ms - 209 bytes │ 9.76 ms - 109 bytes  │
-│ avg   │ 53.03 ms - 205 bytes  │ 5.94 ms - 105 bytes  │
-│ total │ 424.2 ms - 1.61 KB    │ 47.54 ms - 844 bytes │
-├───────┼───────────────────────┼──────────────────────┤
-│ order │ 2                     │ 1                    │
-└───────┴───────────────────────┴──────────────────────┘
++-------+-----------------------+----------------------+
+| #     | 0                     | 1                    |
++-------+-----------------------+----------------------+
+| min   | 15.68 ms - 202 bytes  | 2.35 ms - 102 bytes  |
+| max   | 112.79 ms - 209 bytes | 9.76 ms - 109 bytes  |
+| avg   | 53.03 ms - 205 bytes  | 5.94 ms - 105 bytes  |
+| total | 424.2 ms - 1.61 KB    | 47.54 ms - 844 bytes |
++-------+-----------------------+----------------------+
+| order | 2                     | 1                    |
++-------+-----------------------+----------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___2____2_.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___2____2_.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬───────────────────────┬──────────────────────┐
-│ #     │ 0                     │ 1                    │
-├───────┼───────────────────────┼──────────────────────┤
-│ min   │ 15.68 ms - 202 bytes  │ 2.35 ms - 102 bytes  │
-│ max   │ 112.79 ms - 209 bytes │ 9.76 ms - 109 bytes  │
-│ avg   │ 53.03 ms - 205 bytes  │ 5.94 ms - 105 bytes  │
-│ total │ 424.2 ms - 1.61 KB    │ 47.54 ms - 844 bytes │
-├───────┼───────────────────────┼──────────────────────┤
-│ order │ 2                     │ 1                    │
-└───────┴───────────────────────┴──────────────────────┘
++-------+-----------------------+----------------------+
+| #     | 0                     | 1                    |
++-------+-----------------------+----------------------+
+| min   | 15.68 ms - 202 bytes  | 2.35 ms - 102 bytes  |
+| max   | 112.79 ms - 209 bytes | 9.76 ms - 109 bytes  |
+| avg   | 53.03 ms - 205 bytes  | 5.94 ms - 105 bytes  |
+| total | 424.2 ms - 1.61 KB    | 47.54 ms - 844 bytes |
++-------+-----------------------+----------------------+
+| order | 2                     | 1                    |
++-------+-----------------------+----------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___5__.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___5__.snap
@@ -2,13 +2,13 @@
  0/1 [░░░░░░░░░░░░░░░░░░░░░░░░░░░░] 0% 1/1 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%
 
 
-┌───────┬──────────────────────────┬────────────────────────┐
-│ #     │ 0                        │ 1                      │
-├───────┼──────────────────────────┼────────────────────────┤
-│ min   │ 15.6789 ms - 202 bytes   │ 2.34568 ms - 102 bytes │
-│ max   │ 112.78901 ms - 209 bytes │ 9.75679 ms - 109 bytes │
-│ avg   │ 53.02525 ms - 205 bytes  │ 5.9429 ms - 105 bytes  │
-│ total │ 424.20199 ms - 1.61 KB   │ 47.5432 ms - 844 bytes │
-├───────┼──────────────────────────┼────────────────────────┤
-│ order │ 2                        │ 1                      │
-└───────┴──────────────────────────┴────────────────────────┘
++-------+--------------------------+------------------------+
+| #     | 0                        | 1                      |
++-------+--------------------------+------------------------+
+| min   | 15.6789 ms - 202 bytes   | 2.34568 ms - 102 bytes |
+| max   | 112.78901 ms - 209 bytes | 9.75679 ms - 109 bytes |
+| avg   | 53.02525 ms - 205 bytes  | 5.9429 ms - 105 bytes  |
+| total | 424.20199 ms - 1.61 KB   | 47.5432 ms - 844 bytes |
++-------+--------------------------+------------------------+
+| order | 2                        | 1                      |
++-------+--------------------------+------------------------+
diff --git a/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___5____5_.snap b/tests/.pest/snapshots/Unit/Round/RoundTest/round_with_data_set___5____5_.snap

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function show(array $data): void`
`19`	`19`	`$headers = $this->headers($data);`
`20`	`20`	`$widths = $this->columnWidths($headers, $data);`
`21`	`21`
`22`		`- $this->writeHeaderLine($widths);`
	`22`	`+ $this->writeLine($this->separator($widths));`
`23`	`23`	`$this->writeLine($this->formatRow($headers, $widths));`
`24`	`24`	`$this->writeLine($this->separator($widths));`
`25`	`25`
`@@ -33,7 +33,7 @@ public function show(array $data): void`
`33`	`33`	`$this->writeLine($this->formatRow(array_values($row), $widths));`
`34`	`34`	`}`
`35`	`35`
`36`		`- $this->writeFooterLine($widths);`
	`36`	`+ $this->writeLine($this->separator($widths));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`protected function headers(array $data): array`
`@@ -54,25 +54,11 @@ protected function columnWidths(array $headers, array $data): array`
`54`	`54`	`return $widths;`
`55`	`55`	`}`
`56`	`56`
`57`		`- protected function writeHeaderLine(array $widths): void`
`58`		`- {`
`59`		`- $this->writeLine(`
`60`		`- $this->separator($widths, '┌', '┬', '┐')`
`61`		`- );`
`62`		`- }`
`63`		`-`
`64`		`- protected function writeFooterLine(array $widths): void`
`65`		`- {`
`66`		`- $this->writeLine(`
`67`		`- $this->separator($widths, '└', '┴', '┘')`
`68`		`- );`
`69`		`- }`
`70`		`-`
`71`		`- protected function separator(array $widths, string $start = '├', string $divider = '┼', string $end = '┤'): string`
	`57`	`+ protected function separator(array $widths): string`
`72`	`58`	`{`
`73`		`- $parts = array_map(static fn (int $w) => str_repeat('─', $w + 2), $widths);`
	`59`	`+ $parts = array_map(fn (int $w) => str_repeat('-', $w + 2), $widths);`
`74`	`60`
`75`		`- return $start . implode($divider, $parts) . $end;`
	`61`	`+ return '+' . implode('+', $parts) . '+';`
`76`	`62`	`}`
`77`	`63`
`78`	`64`	`protected function formatRow(array $values, array $widths): string`
`@@ -83,6 +69,6 @@ protected function formatRow(array $values, array $widths): string`
`83`	`69`	`$cells[] = ' ' . mb_str_pad((string) $value, $widths[$i]) . ' ';`
`84`	`70`	`}`
`85`	`71`
`86`		`- return '│' . implode('│', $cells) . '│';`
	`72`	`+ return '\|' . implode('\|', $cells) . '\|';`
`87`	`73`	`}`
`88`	`74`	`}`