Improve Test Coverage

oleibman · Jan 31, 2025 · 3ace770 · 3ace770
1 parent f82eb47
commit 3ace770
Show file tree

Hide file tree

Showing 3 changed files with 145 additions and 10 deletions.
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -36,6 +36,7 @@
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 use PhpOffice\PhpWord\SimpleType\TextDirection;
 use PhpOffice\PhpWord\Style\Paragraph;
+use Throwable;
 
 /**
  * Common Html functions.
@@ -114,20 +115,20 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
 
         try {
-            $result = $dom->loadHTML($html, LIBXML_NOWARNING | LIBXML_NOERROR);
+            $result = @$dom->loadHTML($html);
             $exceptionMessage = 'DOM loadHTML failed';
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             $result = false;
             $exceptionMessage = $e->getMessage();
         }
         if ($result === false) {
-            throw new Exception($exceptionMessage); // @codeCoverageIgnore
+            throw new Exception($exceptionMessage);
         }
         self::removeAnnoyingWhitespaceTextNodes($dom);
         static::$xpath = new DOMXPath($dom);
         $node = $dom->getElementsByTagName('html');
         if (count($node) === 0 || $node->item(0) === null) {
-            $node = $dom->getElementsByTagName('body');
+            $node = $dom->getElementsByTagName('body'); // @codeCoverageIgnore
         }
 
         static::parseNode($node->item(0), $element);
@@ -1319,7 +1320,6 @@ protected static function mapListType($cssListType)
                 return NumberFormat::LOWER_ROMAN; // i, ii, iii, iv, ..
             case 'I':
                 return NumberFormat::UPPER_ROMAN; // I, II, III, IV, ..
-            case '1':
             default:
                 return NumberFormat::DECIMAL; // 1, 2, 3, ..
         }

diff --git a/src/PhpWord/Shared/HtmlColours.php b/src/PhpWord/Shared/HtmlColours.php
@@ -524,11 +524,6 @@ class HtmlColours
         'yellowgreen' => '9acd32',
     ];
 
-    public static function colourNameLookup(string $colorName): string
-    {
-        return self::COLOUR_MAP[$colorName] ?? '';
-    }
-
     public static function convertColour(string $colorName): string
     {
         $colorName = trim($colorName);

diff --git a/tests/PhpWordTests/Shared/Html2Test.php b/tests/PhpWordTests/Shared/Html2Test.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWordTests\Shared;
+
+use Exception;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Shared\Html;
+use PhpOffice\PhpWordTests\AbstractWebServerEmbedded;
+use PhpOffice\PhpWordTests\TestHelperDOCX;
+
+/**
+ * Test class for PhpOffice\PhpWord\Shared\Html.
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
+ */
+class Html2Test extends AbstractWebServerEmbedded
+{
+    /**
+     * Tear down after each test.
+     */
+    protected function tearDown(): void
+    {
+        TestHelperDOCX::clear();
+    }
+
+    public function testException(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('loadHTML');
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '');
+    }
+
+    public function testCssOnIdElement(): void
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<html>'
+            . '<head>'
+            . '<title>Id Test</title>'
+            . '<style>#bold1 {font-weight: bold; margin: 10px;}</style>'
+            . '</head><body>'
+            . '<p id="bold1">test1.</p>'
+            . '</body></html>';
+        Html::addHtml($section, $html);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $marginPath = '/w:document/w:body/w:p/w:pPr/w:spacing';
+        self::assertSame('150', $doc->getElement($marginPath)->getAttribute('w:before'));
+        self::assertSame('150', $doc->getElement($marginPath)->getAttribute('w:after'));
+        $path = '/w:document/w:body/w:p/w:r';
+        self::assertSame('test1.', $doc->getElement($path)->nodeValue);
+        $boldPath = $path . '/w:rPr/w:b';
+        self::assertSame('1', $doc->getElement($boldPath)->getAttribute('w:val'));
+    }
+
+    public function testListTypes(): void
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<ol type="1"><li>Decimal number first</li><li>second</li></ol>'
+            . '<ol type="a"><li>Lowercase first</li><li>second</li></ol>'
+            . '<ol type="A"><li>Uppercase first</li><li>second</li></ol>'
+            . '<ol type="i"><li>Lower roman first</li><li>second</li></ol>'
+            . '<ol type="I"><li>Upper roman first</li><li>second</li></ol>';
+        Html::addHtml($section, $html);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $item = 1;
+        $expected = '1';
+        $path = "/w:document/w:body/w:p[$item]";
+        self::assertSame('Decimal number first', $doc->getElement("$path/w:r")->nodeValue);
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+        ++$item;
+        $path = "/w:document/w:body/w:p[$item]";
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+
+        ++$item;
+        $expected = '2';
+        $path = "/w:document/w:body/w:p[$item]";
+        self::assertSame('Lowercase first', $doc->getElement("$path/w:r")->nodeValue);
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+        ++$item;
+        $path = "/w:document/w:body/w:p[$item]";
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+
+        ++$item;
+        $expected = '3';
+        $path = "/w:document/w:body/w:p[$item]";
+        self::assertSame('Uppercase first', $doc->getElement("$path/w:r")->nodeValue);
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+        ++$item;
+        $path = "/w:document/w:body/w:p[$item]";
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+
+        ++$item;
+        $expected = '4';
+        $path = "/w:document/w:body/w:p[$item]";
+        self::assertSame('Lower roman first', $doc->getElement("$path/w:r")->nodeValue);
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+        ++$item;
+        $path = "/w:document/w:body/w:p[$item]";
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+
+        ++$item;
+        $expected = '5';
+        $path = "/w:document/w:body/w:p[$item]";
+        self::assertSame('Upper roman first', $doc->getElement("$path/w:r")->nodeValue);
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+        ++$item;
+        $path = "/w:document/w:body/w:p[$item]";
+        $numIdPath = $path . '/w:pPr/w:numPr/w:numId';
+        self::assertSame($expected, $doc->getElement($numIdPath)->getAttribute('w:val'));
+    }
+}