More Coverage Tweaks

Author: oleibman

src/PhpWord/Shared/XMLReader.php

@@ -91,12 +91,12 @@ public function getDomFromZip($zipFile, $xmlFile)
     public function getDomFromString($content)
     {
         if (\PHP_VERSION_ID < 80000) {
-            $originalLibXMLEntityValue = libxml_disable_entity_loader(true); //* @codeCoverageIgnore
+            $originalLibXMLEntityValue = libxml_disable_entity_loader(true); // @codeCoverageIgnore
         }
         $this->dom = new DOMDocument();
         $this->dom->loadXML($content);
         if (\PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader($originalLibXMLEntityValue); //* @codeCoverageIgnore
+            libxml_disable_entity_loader($originalLibXMLEntityValue); // @codeCoverageIgnore
         }
 
         return $this->dom;

src/PhpWord/TemplateProcessor.php

@@ -189,7 +189,7 @@ protected function readPartWithRels($fileName)
     protected function transformSingleXml($xml, $xsltProcessor)
     {
         if (\PHP_VERSION_ID < 80000) {
-            $orignalLibEntityLoader = libxml_disable_entity_loader(true); //* @codeCoverageIgnore
+            $orignalLibEntityLoader = libxml_disable_entity_loader(true); // @codeCoverageIgnore
         }
         $domDocument = new DOMDocument();
         if (false === $domDocument->loadXML($xml)) {
@@ -201,7 +201,7 @@ protected function transformSingleXml($xml, $xsltProcessor)
             throw new Exception('Could not transform the given XML document.');
         }
         if (\PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader($orignalLibEntityLoader); //* @codeCoverageIgnore
+            libxml_disable_entity_loader($orignalLibEntityLoader); // @codeCoverageIgnore
         }
 
         return $transformedXml;

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

@@ -58,12 +58,10 @@ public function write()
         // Alignment
         $alignment = $style->getAlignment();
         if ('' !== $alignment) {
-            if (array_key_exists($alignment, self::ALIGNMENT_MAP)) {
-                $textAlign = self::ALIGNMENT_MAP[$alignment];
-            } elseif (Jc::END === $alignment) {
+            if (Jc::END === $alignment) {
                 $textAlign = $style->isBidi() ? 'left' : 'right';
-            } else { //all others, including Jc::START
-                $textAlign = $style->isBidi() ? 'right' : 'left';
+            } else {
+                $textAlign = self::ALIGNMENT_MAP[$alignment] ?? ($style->isBidi() ? 'right' : 'left');
             }
 
             $css['text-align'] = $textAlign;

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

@@ -175,6 +175,9 @@ private function writeCellStyle(CellStyle $cell, ?TableStyle $table): string
         return $content;
     }
 
+    const MAP_BORDER_TYPE = [
+        Border::DOTTED => '\brdrdot',
+    ];
     private function writeCellBorder(string $prefix, ?string $borderStyle, int $borderSize, ?string $borderColor): string
     {
         if ($borderSize == 0) {
@@ -211,17 +214,7 @@ private function writeCellBorder(string $prefix, ?string $borderStyle, int $bord
          * \brdremboss 	Emboss border.
          * \brdrengrave 	Engrave border.
          */
-        switch ($borderStyle) {
-            case Border::DOTTED:
-                $content .= '\brdrdot';
-
-                break;
-            case Border::SINGLE:
-            default:
-                $content .= '\brdrs';
-
-                break;
-        }
+        $content = self::MAP_BORDER_TYPE[$borderStyle] ?? '\brdrs';
 
         // \brdrwN 	N is the width in twips (1/20 pt) of the pen used to draw the paragraph border line.
         //          N cannot be greater than 75.