Add Named Table Styles to Head

Reaction to Coveralls report.

Author: oleibman

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

@@ -51,7 +51,7 @@ public function write()
                 $rowCellCount = count($rowCells);
                 for ($j = 0; $j < $rowCellCount; $j++) {
                     $cellStyle = $rowCells[$j]->getStyle();
-                    $cellStyleCss = $this->getTableStyle($cellStyle);
+                    $cellStyleCss = self::getTableStyle($cellStyle);
                     $cellBgColor = $cellStyle->getBgColor();
                     $cellFgColor = null;
                     if ($cellBgColor) {
@@ -121,7 +121,7 @@ public function write()
      * @param string|\PhpOffice\PhpWord\Style\Table|\PhpOffice\PhpWord\Style\Cell|null $tableStyle
      * @return string
      */
-    private function getTableStyle($tableStyle = null)
+    private static function getTableStyle($tableStyle = null)
     {
         if ($tableStyle == null) {
             return '';
@@ -131,6 +131,23 @@ private function getTableStyle($tableStyle = null)
 
             return $style . '"';
         }
+
+        $style = self::getTableStyleString($tableStyle);
+        if ($style === '') {
+            return '';
+        }
+
+        return ' style="' . $style . '"';
+    }
+
+    /**
+     * Translates Table style in CSS equivalent
+     *
+     * @param string|\PhpOffice\PhpWord\Style\Table|\PhpOffice\PhpWord\Style\Cell $tableStyle
+     * @return string
+     */
+    public static function getTableStyleString($tableStyle)
+    {
         $style = '';
         if (method_exists($tableStyle, 'getLayout')) {
             if ($tableStyle->getLayout() == \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED) {
@@ -167,10 +184,6 @@ private function getTableStyle($tableStyle = null)
             }
         }
 
-        if ($style === '') {
-            return '';
-        }
-
-        return ' style="' . $style . '"';
+        return $style;
     }
 }

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

@@ -151,7 +151,12 @@ protected function writeClosing()
 
         if (!$this->withoutP) {
             if (Settings::isOutputEscapingEnabled()) {
-                $content .= $this->escaper->escapeHtml($this->closingText);
+                // Scrutinizer notes that escapeHTML does not exist on AbstractEscaper.
+                // Nevertheless, it does exist for HTML writer.
+                $escaper = $this->escaper;
+                /** @scrutinizer ignore-call */
+                $contenx = $escaper->escapeHtml($this->closingText);
+                $content .= $contenx;
             } else {
                 $content .= $this->closingText;
             }

src/PhpWord/Writer/HTML/Part/Head.php

@@ -21,6 +21,8 @@
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\Style\Table;
+use PhpOffice\PhpWord\Writer\HTML\Element\Table as TableStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Generic as GenericStyleWriter;
 use PhpOffice\PhpWord\Writer\HTML\Style\Paragraph as ParagraphStyleWriter;
@@ -143,6 +145,9 @@ private function writeStyles()
                     }
                     $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
                 }
+                if ($style instanceof Table) {
+                    $css .= ".{$name} {" . TableStyleWriter::getTableStyleString($style) . '}' . PHP_EOL;
+                }
             }
         }
         $secno = 0;

tests/PhpWord/Writer/HTML/StyleTest.php

@@ -109,6 +109,15 @@ public function testWriteTableBorders()
         $row2->addCell(null, $bstyle)->addText('Row 2 Cell 1');
         $row2->addCell(null, $bstyle)->addText('Row 2 Cell 2');
 
+        $phpWord->addTableStyle('tstyle', array('borderStyle' => 'solid', 'borderSize' => 5));
+        $table1 = $section->addTable('tstyle');
+        $row1 = $table1->addRow();
+        $row1->addCell(null, 'tstyle')->addText('Row 1 Cell 1');
+        $row1->addCell(null, 'tstyle')->addText('Row 1 Cell 2');
+        $row2 = $table1->addRow();
+        $row2->addCell(null, 'tstyle')->addText('Row 2 Cell 1');
+        $row2->addCell(null, 'tstyle')->addText('Row 2 Cell 2');
+
         $dom = $this->getAsHTML($phpWord);
         $xpath = new \DOMXPath($dom);
 
@@ -169,5 +178,11 @@ public function testWriteTableBorders()
         $this->assertEquals($cssnone, $xpath->query('/html/body/div/table[5]/tr[1]/td[2]')->item(0)->attributes->getNamedItem('style')->textContent);
         $this->assertEquals($cssnone, $xpath->query('/html/body/div/table[5]/tr[2]/td[1]')->item(0)->attributes->getNamedItem('style')->textContent);
         $this->assertEquals($cssnone, $xpath->query('/html/body/div/table[5]/tr[2]/td[2]')->item(0)->attributes->getNamedItem('style')->textContent);
+
+        $this->assertNull($xpath->query('/html/body/div/table[6]')->item(0)->attributes->getNamedItem('style'));
+        $this->assertEquals('tstyle', $xpath->query('/html/body/div/table[6]')->item(0)->attributes->getNamedItem('class')->textContent);
+        $style = $xpath->query('/html/head/style')->item(0)->textContent;
+        self::assertNotFalse(preg_match('/^[.]tstyle[^\\r\\n]*/m', $style, $matches));
+        self::assertEquals(".tstyle {table-layout: auto;$cssnone}", $matches[0]);
     }
 }

tests/PhpWord/Writer/PDF/MPDFTest.php

@@ -39,6 +39,11 @@ public function testConstruct()
         $section = $phpWord->addSection();
         $section->addText('Test 1');
         $section->addPageBreak();
+        $section->addText('Test 2');
+        $oSettings = new \PhpOffice\PhpWord\Style\Section();
+        $oSettings->setSettingValue('orientation', 'landscape');
+        $section = $phpWord->addSection($oSettings);
+        $section->addText('Section 2 - landscape');
 
         $rendererName = Settings::PDF_RENDERER_MPDF;
         $rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/mpdf/mpdf');