Merge pull request #1194 from phpDocumentor/backport/1.x/pr-1193

[1.x] Merge pull request #1193 from phpDocumentor/fix/table-colspan
phpDocumentor · Jan 10, 2025 · 9cd73d3 · 9cd73d3
2 parents 7ff4221 + edc712a
commit 9cd73d3
Show file tree

Hide file tree

Showing 17 changed files with 778 additions and 1 deletion.
diff --git a/...ides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php b/...ides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php
@@ -67,7 +67,7 @@ private function extractTableRows(ParserContext $context): array
     }
 
     /** @param array<int, int> $columnRanges */
-    private function extractRow(array $columnRanges, string $line, int &$currentSpan): TableRow
+    private function extractRow(array $columnRanges, string $line, int $currentSpan): TableRow
     {
         $row = new TableRow();
         $currentColumnStart = null;

diff --git a/...table-col-span/pretty-table-col-span.html → ...le-grid-col-span/table-grid-col-span.html b/...table-col-span/pretty-table-col-span.html → ...le-grid-col-span/table-grid-col-span.html
@@ -18,5 +18,11 @@
             <td>body row 2</td>
             <td colspan="3">Cells may span columns.</td>
         </tr>
+        <tr>
+            <td>body row 1, column 1</td>
+            <td>column 2</td>
+            <td>column 3</td>
+            <td>column 4</td>
+        </tr>
     </tbody>
 </table>
diff --git a/...-table-col-span/pretty-table-col-span.rst → ...ble-grid-col-span/table-grid-col-span.rst b/...-table-col-span/pretty-table-col-span.rst → ...ble-grid-col-span/table-grid-col-span.rst
@@ -6,3 +6,5 @@
 +------------------------+------------+----------+----------+
 | body row 2             | Cells may span columns.          |
 +------------------------+----------------------------------+
+| body row 1, column 1   | column 2   | column 3 | column 4 |
++------------------------+------------+----------+----------+
diff --git a/...w-span/pretty-table-complex-row-span.html → ...row-span/table-grid-complex-row-span.html b/...w-span/pretty-table-complex-row-span.html → ...row-span/table-grid-complex-row-span.html
diff --git a/...ow-span/pretty-table-complex-row-span.rst → ...-row-span/table-grid-complex-row-span.rst b/...ow-span/pretty-table-complex-row-span.rst → ...-row-span/table-grid-complex-row-span.rst
diff --git a/...tty-table-error1/pretty-table-error1.html → .../table-grid-error1/table-grid-error1.html b/...tty-table-error1/pretty-table-error1.html → .../table-grid-error1/table-grid-error1.html
diff --git a/...etty-table-error1/pretty-table-error1.rst → ...s/table-grid-error1/table-grid-error1.rst b/...etty-table-error1/pretty-table-error1.rst → ...s/table-grid-error1/table-grid-error1.rst
diff --git a/...tty-table-header/pretty-table-header.html → .../table-grid-header/table-grid-header.html b/...tty-table-header/pretty-table-header.html → .../table-grid-header/table-grid-header.html
diff --git a/...etty-table-header/pretty-table-header.rst → ...s/table-grid-header/table-grid-header.rst b/...etty-table-header/pretty-table-header.rst → ...s/table-grid-header/table-grid-header.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,5 @@ @@
     +------------------------+------------+----------+----------+
     | body row 2             | Cells may span columns.          |
     +------------------------+----------------------------------+
+    | body row 1, column 1   | column 2   | column 3 | column 4 |
+    +------------------------+------------+----------+----------+