Improve HTMLConverter::convert new implementation

thephpleague · Jul 15, 2019 · 82b6ab5 · 82b6ab5
1 parent c89797b
commit 82b6ab5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/src/HTMLConverter.php b/src/HTMLConverter.php
@@ -64,27 +64,23 @@ public function __construct()
      */
     public function convert($records, array $header_record = [], array $footer_record = []): string
     {
+        $doc = new DOMDocument('1.0');
         if ([] === $header_record && [] === $footer_record) {
-            /** @var DOMDocument $doc */
-            $doc = $this->xml_converter->convert($records);
-
-            /** @var DOMElement $table */
-            $table = $doc->getElementsByTagName('table')->item(0);
+            $table = $this->xml_converter->import($records, $doc);
             $this->styleTableElement($table);
+            $doc->appendChild($table);
 
-            return $doc->saveHTML($table);
-        };
+            return $doc->saveHTML();
+        }
 
-        $doc = new DOMDocument('1.0');
         $table = $doc->createElement('table');
         $this->styleTableElement($table);
-        $this->appendTableHeader('thead', $header_record, $table);
-        $this->appendTableHeader('tfoot', $footer_record, $table);
-        $tbody = $this->xml_converter->rootElement('tbody')->import($records, $doc);
-        $table->appendChild($tbody);
+        $this->appendTableHeaderSection('thead', $header_record, $table);
+        $this->appendTableHeaderSection('tfoot', $footer_record, $table);
+        $table->appendChild($this->xml_converter->rootElement('tbody')->import($records, $doc));
         $doc->appendChild($table);
 
-        return $doc->saveHTML($table);
+        return $doc->saveHTML();
     }
 
     /**
@@ -129,13 +125,13 @@ public function td(string $fieldname_attribute_name): self
     /**
      * Create a DOMElement representing a single record of data.
      */
-    private function appendTableHeader(string $node_name, array $record, DOMElement $table)
+    private function appendTableHeaderSection(string $node_name, array $record, DOMElement $table)
     {
         if ([] === $record) {
             return;
         }
 
-        $node = (new XMLConverter())
+        $node = $this->xml_converter
             ->rootElement($node_name)
             ->recordElement('tr')
             ->fieldElement('th')
@@ -153,9 +149,9 @@ private function appendTableHeader(string $node_name, array $record, DOMElement
     /**
      * Style the table dom element.
      */
-    private function styleTableElement(DOMElement $table_element)
+    private function styleTableElement(DOMElement $node)
     {
-        $table_element->setAttribute('class', $this->class_name);
-        $table_element->setAttribute('id', $this->id_value);
+        $node->setAttribute('class', $this->class_name);
+        $node->setAttribute('id', $this->id_value);
     }
 }
diff --git a/tests/HTMLConverterTest.php b/tests/HTMLConverterTest.php
@@ -61,7 +61,7 @@ public function testToHTML()
 
     /**
      * @covers ::convert
-     * @covers ::appendTableHeader
+     * @covers ::appendTableHeaderSection
      * @covers ::styleTableElement
      */
     public function testToHTMLWithTHeadTableSection()
@@ -97,7 +97,7 @@ public function testToHTMLWithTHeadTableSection()
 
     /**
      * @covers ::convert
-     * @covers ::appendTableHeader
+     * @covers ::appendTableHeaderSection
      * @covers ::styleTableElement
      */
     public function testToHTMLWithTFootTableSection()
@@ -133,7 +133,7 @@ public function testToHTMLWithTFootTableSection()
 
     /**
      * @covers ::convert
-     * @covers ::appendTableHeader
+     * @covers ::appendTableHeaderSection
      * @covers ::styleTableElement
      */
     public function testToHTMLWithBothTableHeaderSection()