Word2007 Reader : Support for table cell borders and margins

Author: kernusr

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improved TextDirection for styling a cell by @terryzwt in #2429
 - Word2007 Reader : Added option to disable loading images by @aelliott1485 in #2450
 - HTML Writer : Added border-spacing to default styles for table by @kernusr in #2451
+- Word2007 Reader : Support for table cell borders and margins by @kernusr in #2454
 
 ### Bug fixes
 

src/PhpWord/Reader/Word2007/AbstractPart.php

@@ -385,9 +385,8 @@ protected function readTable(XMLReader $xmlReader, DOMElement $domNode, $parent,
                     } elseif ('w:tc' == $rowNode->nodeName) { // Cell
                         $cellWidth = $xmlReader->getAttribute('w:w', $rowNode, 'w:tcPr/w:tcW');
                         $cellStyle = null;
-                        $cellStyleNode = $xmlReader->getElement('w:tcPr', $rowNode);
-                        if (null !== $cellStyleNode) {
-                            $cellStyle = $this->readCellStyle($xmlReader, $cellStyleNode);
+                        if ($xmlReader->elementExists('w:tcPr', $rowNode)) {
+                            $cellStyle = $this->readCellStyle($xmlReader, $rowNode);
                         }
 
                         $cell = $row->addCell($cellWidth, $cellStyle);
@@ -573,7 +572,7 @@ private function readTableIndent(XMLReader $xmlReader, DOMElement $domNode)
     /**
      * Read w:tcPr.
      *
-     * @return array
+     * @return null|array
      */
     private function readCellStyle(XMLReader $xmlReader, DOMElement $domNode)
     {
@@ -585,8 +584,30 @@ private function readCellStyle(XMLReader $xmlReader, DOMElement $domNode)
             'bgColor' => [self::READ_VALUE, 'w:shd', 'w:fill'],
             'noWrap' => [self::READ_VALUE, 'w:noWrap', null, null, true],
         ];
+        $style = null;
 
-        return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
+        if ($xmlReader->elementExists('w:tcPr', $domNode)) {
+            $styleNode = $xmlReader->getElement('w:tcPr', $domNode);
+
+            $margins = ['top', 'left', 'bottom', 'right'];
+            foreach ($margins as $side) {
+                $ucfSide = ucfirst($side);
+                $styleDefs['cellMargin' . $ucfSide] = [self::READ_VALUE, 'w:tcMar/w:' . $side, 'w:w'];
+            }
+
+            $borders = array_merge($margins, ['insideH', 'insideV']);
+            foreach ($borders as $side) {
+                $ucfSide = ucfirst($side);
+
+                $styleDefs['border' . $ucfSide . 'Size'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:sz'];
+                $styleDefs['border' . $ucfSide . 'Color'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:color'];
+                $styleDefs['border' . $ucfSide . 'Style'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:val'];
+            }
+
+            $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
+        }
+
+        return $style;
     }
 
     /**