Updates based on scrutinizer results

Author: jschroed91

lib/Caxy/HtmlDiff/Table/AbstractTableElement.php

@@ -69,6 +69,16 @@ public function getAttribute($name)
         return $this->domNode->getAttribute($name);
     }
 
+    /**
+     * @param \DOMDocument $domDocument
+     *
+     * @return \DOMElement
+     */
+    public function cloneNode(\DOMDocument $domDocument)
+    {
+        return $domDocument->importNode($this->getDomNode()->cloneNode(false), false);
+    }
+
     /**
      * @param \DOMElement $node
      *

lib/Caxy/HtmlDiff/Table/Table.php

@@ -59,8 +59,8 @@ public function getRow($index)
     }
 
     /**
-     * @param array    $rows
-     * @param null|int $position
+     * @param TableRow[] $rows
+     * @param null|int   $position
      */
     public function insertRows($rows, $position = null)
     {

lib/Caxy/HtmlDiff/Table/TableCell.php

@@ -30,7 +30,7 @@ public function setRow(TableRow $row = null)
     {
         $this->row = $row;
 
-        if (!in_array($this, $row->getCells())) {
+        if (null !== $row && !in_array($this, $row->getCells())) {
             $row->addCell($this);
         }
 
@@ -42,14 +42,14 @@ public function setRow(TableRow $row = null)
      */
     public function getColspan()
     {
-        return $this->getAttribute('colspan') ?: 1;
+        return (int)$this->getAttribute('colspan') ?: 1;
     }
 
     /**
      * @return int
      */
     public function getRowspan()
     {
-        return $this->getAttribute('rowspan') ?: 1;
+        return (int)$this->getAttribute('rowspan') ?: 1;
     }
 }

lib/Caxy/HtmlDiff/Table/TableDiff.php

@@ -87,7 +87,7 @@ public function build()
     protected function diffTableContent()
     {
         $this->diffDom = new \DOMDocument();
-        $this->diffTable = $this->diffDom->importNode($this->newTable->getDomNode()->cloneNode(false), false);
+        $this->diffTable = $this->newTable->cloneNode($this->diffDom);
         $this->diffDom->appendChild($this->diffTable);
 
         $oldRows = $this->oldTable->getRows();
@@ -426,7 +426,7 @@ protected function diffRows($oldRow, $newRow, array &$appliedRowSpans, $forceExp
                     $row = $oldRow;
                     $targetRow = $diffRow;
                 }
-                if ($row && (!$type === 'old' || isset($oldCells[$position->getIndexInOld()]))) {
+                if ($row && $targetRow && (!$type === 'old' || isset($oldCells[$position->getIndexInOld()]))) {
                     $this->syncVirtualColumns($row, $position, $cellsWithMultipleRows, $targetRow, $type, true);
 
                     continue;

lib/Caxy/HtmlDiff/Table/TableRow.php

@@ -35,7 +35,7 @@ public function setTable(Table $table = null)
     {
         $this->table = $table;
 
-        if (!in_array($this, $table->getRows())) {
+        if ($table && !in_array($this, $table->getRows())) {
             $table->addRow($this);
         }
 
@@ -92,8 +92,8 @@ public function getCell($index)
     }
 
     /**
-     * @param array    $cells
-     * @param null|int $position
+     * @param TableCell[] $cells
+     * @param null|int    $position
      */
     public function insertCells($cells, $position = null)
     {