Merge branch 'master' into wordunimplemented2

PHPOffice · Sep 14, 2024 · 8b01436 · 8b01436
2 parents 86b939f + 43785fe
commit 8b01436
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/docs/changes/1.x/1.4.0.md b/docs/changes/1.x/1.4.0.md
@@ -15,5 +15,6 @@
 ### Miscellaneous
 
 - Bump dompdf/dompdf from 2.0.4 to 3.0.0 by [@dependabot](https://github.com/dependabot) fixing [#2621](https://github.com/PHPOffice/PHPWord/issues/2621) in [#2666](https://github.com/PHPOffice/PHPWord/pull/2666)
+- Add test case to make sure vMerge defaults to 'continue' by [@SpraxDev](https://github.com/SpraxDev) in [#2677](https://github.com/PHPOffice/PHPWord/pull/2677)
 
 ### BC Breaks
diff --git a/tests/PhpWordTests/Reader/Word2007/StyleTest.php b/tests/PhpWordTests/Reader/Word2007/StyleTest.php
@@ -165,6 +165,44 @@ public function testReadTableCellStyle(): void
         self::assertEquals('auto', $styleCell->getBorderBottomColor());
     }
 
+    public function testReadTableCellsWithVerticalMerge(): void
+    {
+        $documentXml = '<w:tbl>
+          <w:tr>
+            <w:tc>
+              <w:tcPr>
+                <w:vMerge w:val="restart" />
+              </w:tcPr>
+            </w:tc>
+          </w:tr>
+          <w:tr>
+            <w:tc>
+              <w:tcPr>
+                <w:vMerge />
+              </w:tcPr>
+            </w:tc>
+          </w:tr>
+          <w:tr>
+            <w:tc />
+          </w:tr>
+        </w:tbl>';
+
+        $phpWord = $this->getDocumentFromString(['document' => $documentXml]);
+
+        $table = $phpWord->getSection(0)->getElements()[0];
+        self::assertInstanceOf('PhpOffice\PhpWord\Element\Table', $table);
+
+        $rows = $table->getRows();
+        self::assertCount(3, $rows);
+        foreach ($rows as $row) {
+            self::assertCount(1, $row->getCells());
+        }
+
+        self::assertSame('restart', $rows[0]->getCells()[0]->getStyle()->getVMerge());
+        self::assertSame('continue', $rows[1]->getCells()[0]->getStyle()->getVMerge());
+        self::assertNull($rows[2]->getCells()[0]->getStyle()->getVMerge());
+    }
+
     /**
      * Test reading of position.
      */