Coverage Tweaks

Author: oleibman

src/PhpWord/Style/ListItem.php

@@ -123,11 +123,8 @@ public function getNumStyle()
     public function getNumbering()
     {
         $numStyleObject = Style::getStyle($this->numStyle);
-        if ($numStyleObject instanceof Numbering) {
-            return $numStyleObject;
-        }
 
-        return null;
+        return ($numStyleObject instanceof Numbering) ? $numStyleObject : null;
     }
 
     /**

src/PhpWord/Writer/RTF/Element/ListItem.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
+use PhpOffice\PhpWord\Element\ListItem as Li;
+
 /**
  * ListItem element RTF writer; extends from text.
  *
@@ -30,12 +32,16 @@ class ListItem extends Text
      */
     public function write()
     {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
         $element = $this->element;
-        if (!$element instanceof \PhpOffice\PhpWord\Element\ListItem) {
-            return '';
-        }
 
+        return ($element instanceof Li) ? $this->writeElement($element) : '';
+    }
+
+    /**
+     * @return string
+     */
+    private function writeElement(Li $element)
+    {
         $this->getStyles();
 
         $depth = (int) $element->getDepth();
@@ -58,7 +64,7 @@ public function write()
             $content .= '\li' . $levels[$depth]->getLeft();
             $content .= '\lin' . $levels[$depth]->getLeft();
         }
-        $content .= $this->writeFontStyle(); // Doesn't work. Don't know why. Probalby something to do with \PphOffice\PhpWord\Element\ListItem storing styles in a textObject type \PphOffice\PhpWord\Element\Text rather than within the Element itself
+        $content .= $this->writeFontStyle(); // Doesn't work. Don't know why. Probably something to do with \PhpOffice\PhpWord\Element\ListItem storing styles in a textObject type \PhpOffice\PhpWord\Element\Text rather than within the Element itself
         $content .= PHP_EOL;
         /* $content .= '{\listtext\f2 \\\'b7\tab }'; // Not sure if needed for listItemRun
         $content .= PHP_EOL; */

src/PhpWord/Writer/RTF/Element/ListItemRun.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
+use PhpOffice\PhpWord\Element\ListItemRun as Lir;
+
 /**
  * ListItem element HTML writer.
  *
@@ -33,10 +35,15 @@ class ListItemRun extends TextRun
     public function write()
     {
         $element = $this->element;
-        if (!$element instanceof \PhpOffice\PhpWord\Element\ListItemRun) {
-            return '';
-        }
 
+        return ($element instanceof Lir) ? $this->writeElement($element) : '';
+    }
+
+    /**
+     * @return string
+     */
+    private function writeElement(Lir $element)
+    {
         $writer = new Container($this->parentWriter, $element);
         $this->getStyles();
 

src/PhpWord/Writer/RTF/Style/Font.php

@@ -138,7 +138,8 @@ public function write()
 
         // noProof
         // This is also specified above as \\langnp{$langId}
-        // Not sure why, or if, both are needed.
+        // RTF spec suggests using this for backwards compatibility.
+        // So perhaps earlier can be omitted, but it seems harmless regardless.
         $content .= $this->getValueIf($style->isNoProof(), '\noproof\lang1024');
 
         // Background-Color

tests/PhpWordTests/Writer/RTF/Element/ListItemTest.php

@@ -50,4 +50,45 @@ public function testListItemBasic(): void
         $expected = implode("\n", $expectedArray);
         self::assertStringContainsString($expected, $content);
     }
+
+    public function testListItemSingleLevel(): void
+    {
+        $phpWord = new PhpWord();
+        $singlelevelNumberingStyleName = 'singleLevel';
+        $phpWord->addNumberingStyle(
+            $singlelevelNumberingStyleName,
+            [
+                'type' => 'singleLevel',
+                'levels' => [
+                    ['format' => 'decimal', 'text' => '%1.', 'left' => 360, 'hanging' => 360, 'tabPos' => 360, 'restart' => 1],
+                ],
+            ]
+        );
+        $section = $phpWord->addSection();
+        $section->addText('SingleLevel formatted list.');
+        $section->addListItem('List Item 1', 0, null, $singlelevelNumberingStyleName);
+        $section->addListItem('List Item 2', 0, null, $singlelevelNumberingStyleName);
+        $section->addListItem('List Item 3', 0, null, $singlelevelNumberingStyleName);
+        $writer = new RtfWriter($phpWord);
+        $content = $writer->getContent();
+        $content = str_replace("\r\n", "\n", $content);
+        $expectedArray = [
+            '\pard\nowidctlpar {SingleLevel formatted list.}\par',
+            '\ilvl0\ls1\tx360\fi-360\li360\lin360',
+            '{List Item 1}',
+            '\par',
+            '\ilvl0\ls1\tx360\fi-360\li360\lin360',
+            '{List Item 2}',
+            '\par',
+            '\ilvl0\ls1\tx360\fi-360\li360\lin360',
+            '{List Item 3}',
+            '\par',
+        ];
+        $expected = implode("\n", $expectedArray);
+        self::assertStringContainsString($expected, $content);
+        self::assertStringContainsString('\levelnorestart1', $content);
+        $table = $writer->getListTable();
+        self::assertCount(1, $table);
+        self::assertSame('singleLevel', $table[0]['type']);
+    }
 }