Improve Coverage

Author: oleibman

src/PhpWord/Shared/Converter.php

@@ -340,6 +340,11 @@ public static function angleToDegree($angle = 1)
         Color::YELLOW => 'FFFF00',
     ];
 
+    public static function validStringColor(string $value): bool
+    {
+        return (self::STRING_TO_RGB[$value] ?? null) !== null;
+    }
+
     /**
      * Convert colorname as string to RGB.
      *

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

@@ -18,32 +18,13 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
-use PhpOffice\PhpWord\Style;
-use PhpOffice\PhpWord\Style\Font;
-use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\Writer\HTML;
-use PhpOffice\PhpWord\Writer\HTML\Style\Font as FontStyleWriter;
-use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph as ParagraphStyleWriter;
 
 /**
  * PreserveText element HTML writer. Issue 2188.
  */
-class PreserveText extends AbstractElement
+class PreserveText extends Text
 {
-    /**
-     * Opening tags.
-     *
-     * @var string
-     */
-    private $openingTags = '';
-
-    /**
-     * Closing tag.
-     *
-     * @var string
-     */
-    private $closingTags = '';
-
     /**
      * Write text.
      *
@@ -106,91 +87,4 @@ protected function writeClosing()
 
         return $content;
     }
-
-    /**
-     * Write paragraph style.
-     *
-     * @return string
-     */
-    private function getParagraphStyle()
-    {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
-        $element = $this->element;
-        $style = '';
-        if (!method_exists($element, 'getParagraphStyle')) {
-            return $style;
-        }
-
-        $paragraphStyle = $element->getParagraphStyle();
-        $pStyleIsObject = ($paragraphStyle instanceof Paragraph);
-        if ($pStyleIsObject) {
-            $styleWriter = new ParagraphStyleWriter($paragraphStyle);
-            $styleWriter->setParentWriter($this->parentWriter);
-            $style = $styleWriter->write();
-        } elseif (is_string($paragraphStyle)) {
-            $style = $paragraphStyle;
-        }
-        if ($style) {
-            $attribute = $pStyleIsObject ? 'style' : 'class';
-            $style = " {$attribute}=\"{$style}\"";
-        }
-
-        return $style;
-    }
-
-    /**
-     * Get font style.
-     */
-    private function processFontStyle(): void
-    {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
-        $element = $this->element;
-
-        $attributeStyle = $attributeLang = '';
-        $lang = null;
-
-        $fontStyle = $element->getFontStyle();
-        if ($fontStyle instanceof Font) {
-            // Attribute style
-            $styleWriter = new FontStyleWriter($fontStyle);
-            $fontCSS = $styleWriter->write();
-            if ($fontCSS) {
-                $attributeStyle = ' style="' . $fontCSS . '"';
-            } else {
-                $className = $fontStyle->getStyleName();
-                if ($className) {
-                    $attributeStyle = ' class="' . $className . '"';
-                }
-            }
-            // Attribute Lang
-            $lang = $fontStyle->getLang();
-        } elseif (!empty($fontStyle)) {
-            // Attribute class
-            $attributeStyle = ' class="' . $fontStyle . '"';
-            // Attribute Lang
-            /** @var Font $cssClassStyle */
-            $cssClassStyle = Style::getStyle($fontStyle);
-            if ($cssClassStyle !== null && method_exists($cssClassStyle, 'getLang')) {
-                $lang = $cssClassStyle->getLang();
-            }
-        }
-
-        if ($lang) {
-            $attributeLang = $lang->getLatin();
-            if (!$attributeLang) {
-                $attributeLang = $lang->getEastAsia();
-            }
-            if (!$attributeLang) {
-                $attributeLang = $lang->getBidirectional();
-            }
-            if ($attributeLang) {
-                $attributeLang = " lang='$attributeLang'";
-            }
-        }
-
-        if ($attributeStyle || $attributeLang) {
-            $this->openingTags = "<span$attributeLang$attributeStyle>";
-            $this->closingTags = '</span>';
-        }
-    }
 }

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

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
+use PhpOffice\PhpWord\Element\PreserveText as PreserveTextElement;
+use PhpOffice\PhpWord\Element\Text as TextElement;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
@@ -52,14 +54,14 @@ class Text extends AbstractElement
      *
      * @var string
      */
-    private $openingTags = '';
+    protected $openingTags = '';
 
     /**
      * Closing tag.
      *
      * @var string
      */
-    private $closingTags = '';
+    protected $closingTags = '';
 
     /**
      * Write text.
@@ -70,7 +72,7 @@ public function write()
     {
         $this->processFontStyle();
 
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
+        /** @var TextElement */
         $element = $this->element;
 
         $text = $this->parentWriter->escapeHTML($element->getText() ?? '');
@@ -213,9 +215,9 @@ private function writeTrackChangeClosing()
      *
      * @return string
      */
-    private function getParagraphStyle()
+    protected function getParagraphStyle()
     {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
+        /** @var PreserveTextElement|TextElement */
         $element = $this->element;
         $style = '';
         if (!method_exists($element, 'getParagraphStyle')) {
@@ -242,9 +244,9 @@ private function getParagraphStyle()
     /**
      * Get font style.
      */
-    private function processFontStyle(): void
+    protected function processFontStyle(): void
     {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
+        /** @var PreserveTextElement|TextElement */
         $element = $this->element;
 
         $attributeStyle = $attributeLang = '';

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

@@ -18,6 +18,7 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
+use PhpOffice\PhpWord\Shared\Converter;
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 
 /**
@@ -69,7 +70,9 @@ public function write()
 
         $css['font-family'] = $this->getValueIf(!empty($font), $font);
         $css['font-size'] = $this->getValueIf($size !== null, "{$size}pt");
-        $css['color'] = $this->getValueIf($color !== null, "#{$color}");
+        if ($color !== null) {
+            $css['color'] = Converter::validStringColor($color) ? $color : "#$color";
+        }
         $css['background'] = $this->getValueIf($fgColor != '', $fgColor);
         $css['font-weight'] = $this->getValueIf($style->isBold(), 'bold');
         $css['font-style'] = $this->getValueIf($style->isItalic(), 'italic');

tests/PhpWordTests/Writer/HTML/Element/PreserveTextTest.php

@@ -39,4 +39,25 @@ public function testPreserveText(): void
         $expected = "<p>$text2</p>";
         self::assertStringContainsString($expected, $content);
     }
+
+    public function testPreserveTextStyle(): void
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $text1 = 'This text is missing in the HTML output.';
+        $fontStyle = ['color' => 'red'];
+        $section->addPreserveText($text1, $fontStyle);
+        $paragraphStyle = ['align' => 'center'];
+        $text2 = 'Likewise page {PAGE} of {NUMPAGES}';
+        $section->addPreserveText($text2, null, $paragraphStyle);
+        $section->addPreserveText('');
+        $writer = new HTML($phpWord);
+        $content = $writer->getContent();
+        $expected = "<p><span style=\"color: red;\">$text1</span></p>";
+        self::assertStringContainsString($expected, $content);
+        $expected = "<p style=\"text-align: center;\">$text2</p>";
+        self::assertStringContainsString($expected, $content);
+        $expected = '<p>&nbsp;</p>';
+        self::assertStringContainsString($expected, $content);
+    }
 }