Writer HTML: ListItemRun is now rendered as unordered list (<ul>/<li>) instead of plain paragraph

Author: andomiell

src/PhpWord/Writer/HTML/Element/Container.php

@@ -50,14 +50,41 @@ public function write()
         $content = '';
 
         $elements = $container->getElements();
-        foreach ($elements as $element) {
+        foreach ($elements as $index => $element) {
+            if ($element instanceof \PhpOffice\PhpWord\Element\ListItemRun) {
+                $prevElement = $elements[$index - 1] ?? null;
+
+                if ($prevElement === null) {
+                    $content .= '<ul>';
+                } elseif (!$prevElement instanceof \PhpOffice\PhpWord\Element\ListItemRun) {
+                    $content .= '<ul>';
+                } elseif ($prevElement->getDepth() < $element->getDepth()) {
+                    $content = rtrim($content, '</li>');
+                    $content .= '<ul>';
+                }
+            }
+
             $elementClass = get_class($element);
             $writerClass = str_replace('PhpOffice\\PhpWord\\Element', $this->namespace, $elementClass);
             if (class_exists($writerClass)) {
                 /** @var AbstractElement $writer Type hint */
                 $writer = new $writerClass($this->parentWriter, $element, $withoutP);
                 $content .= $writer->write();
             }
+
+            if ($element instanceof \PhpOffice\PhpWord\Element\ListItemRun) {
+                $nextElement = $elements[$index + 1] ?? null;
+
+                if ($nextElement === null) {
+                    $content .= '</ul>';
+                } elseif (!$nextElement instanceof \PhpOffice\PhpWord\Element\ListItemRun) {
+                    $content .= '</ul>';
+                } elseif ($nextElement->getDepth() < $element->getDepth()) {
+                    for ($i = $element->getDepth() - $nextElement->getDepth(); $i !== 0; --$i) {
+                        $content .= '</ul></li>';
+                    }
+                }
+            }
         }
 
         return $content;

tests/PhpWordTests/Writer/HTML/ElementTest.php

@@ -200,24 +200,67 @@ public function testWriteTitleTextRun(): void
      */
     public function testListItemRun(): void
     {
-        $expected1 = 'List item run 1';
-        $expected2 = 'List item run 1 in bold';
+        $expected11 = 'List item run 1.1';
+        $expected11InBold = 'List item run 1.1 in bold';
+        $expected12 = 'List item run 1.2';
+        $expected21 = 'List item run 2.1';
+        $expected22 = 'List item run 2.2';
+        $expected31 = 'List item run 3.1';
+        $expected13 = 'List item run 1.3';
 
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
 
-        $listItemRun = $section->addListItemRun(0, null, 'MyParagraphStyle');
-        $listItemRun->addText($expected1);
-        $listItemRun->addText($expected2, ['bold' => true]);
+        $listItemRun11 = $section->addListItemRun(0, null, 'MyParagraphStyle');
+        $listItemRun11->addText($expected11);
+        $listItemRun11->addText($expected11InBold, ['bold' => true]);
+
+        $listItemRun12 = $section->addListItemRun(0);
+        $listItemRun12->addText($expected12);
+
+        $listItemRun21 = $section->addListItemRun(1);
+        $listItemRun21->addText($expected21);
+
+        $listItemRun22 = $section->addListItemRun(1);
+        $listItemRun22->addText($expected22);
+
+        $listItemRun31 = $section->addListItemRun(2);
+        $listItemRun31->addText($expected31);
+
+        $listItemRun13 = $section->addListItemRun(0);
+        $listItemRun13->addText($expected13);
 
         $htmlWriter = new HTML($phpWord);
         $content = $htmlWriter->getContent();
 
         $dom = new DOMDocument();
         $dom->loadHTML($content);
 
-        self::assertEquals($expected1, $dom->getElementsByTagName('p')->item(0)->textContent);
-        self::assertEquals($expected2, $dom->getElementsByTagName('p')->item(1)->textContent);
+        $xpath = new DOMXPath($dom);
+
+        $list = $xpath->query('//body/div/ul/li');
+
+        $item11 = $list->item(0);
+        $item12 = $list->item(1);
+        $item13 = $list->item(2);
+
+        self::assertEquals($expected11, $item11->childNodes->item(0)->textContent);
+        self::assertEquals('span', $item11->childNodes->item(1)->nodeName);
+        self::assertEquals($expected11InBold, $item11->childNodes->item(1)->textContent);
+
+        self::assertEquals($expected12, $item12->childNodes->item(0)->textContent);
+        self::assertEquals('ul', $item12->childNodes->item(1)->nodeName);
+
+        self::assertEquals($expected21, $item12->childNodes->item(1)->childNodes->item(0)->textContent);
+
+        $item22 = $item12->childNodes->item(1)->childNodes->item(1);
+
+        self::assertEquals($expected22, $item22->childNodes->item(0)->textContent);
+        self::assertEquals('ul', $item22->childNodes->item(1)->nodeName);
+
+        self::assertEquals($expected31, $item22->childNodes->item(1)->childNodes->item(0)->textContent);
+
+        self::assertEquals($expected13, $item13->childNodes->item(0)->textContent);
     }
 
     /**