Add $nestedLevel to elements

Author: ivanlanin

src/PhpWord/Element/AbstractContainer.php

@@ -65,9 +65,18 @@ protected function addElement($elementName)
         $reflection = new \ReflectionClass($elementClass);
         $elementArgs = $args;
         array_shift($elementArgs); // Shift an element off the beginning of array: the $elementName
+
         /** @var \PhpOffice\PhpWord\Element\AbstractElement $element Type hint */
         $element = $reflection->newInstanceArgs($elementArgs);
 
+        // Set nested level
+        if ($this->container == 'Cell') {
+            $element->setNestedLevel($this->getNestedLevel() + 1);
+        } else {
+            $element->setNestedLevel($this->getNestedLevel());
+        }
+
+
         // Set relation Id for media collection
         $mediaContainer = $this->getMediaContainer();
         if (in_array($elementName, array('Link', 'Image', 'Object'))) {
@@ -143,32 +152,6 @@ public function addTextRun($paragraphStyle = null)
         return $this->addElement('TextRun', $paragraphStyle);
     }
 
-    /**
-     * Add field element
-     *
-     * @param string $type
-     * @param array $properties
-     * @param array $options
-     * @return \PhpOffice\PhpWord\Element\Field
-     */
-    public function addField($type = null, $properties = array(), $options = array())
-    {
-        return $this->addElement('Field', $type, $properties, $options);
-    }
-
-    /**
-     * Add line element
-     *
-     * @param mixed $lineStyle
-     * @return \PhpOffice\PhpWord\Element\Line
-     */
-    public function addLine($lineStyle = null)
-    {
-        return $this->addElement('Line', $lineStyle);
-    
-    }
-    
-    
     /**
      * Add link element
      *
@@ -323,6 +306,31 @@ public function addTextBox($style = null)
         return $this->addElement('TextBox', $style);
     }
 
+    /**
+     * Add field element
+     *
+     * @param string $type
+     * @param array $properties
+     * @param array $options
+     * @return \PhpOffice\PhpWord\Element\Field
+     */
+    public function addField($type = null, $properties = array(), $options = array())
+    {
+        return $this->addElement('Field', $type, $properties, $options);
+    }
+
+    /**
+     * Add line element
+     *
+     * @param mixed $lineStyle
+     * @return \PhpOffice\PhpWord\Element\Line
+     */
+    public function addLine($lineStyle = null)
+    {
+        return $this->addElement('Line', $lineStyle);
+
+    }
+
     /**
      * Check if a method is allowed for the current container
      *

src/PhpWord/Element/AbstractElement.php

@@ -84,6 +84,15 @@ abstract class AbstractElement
      */
     protected $relationId;
 
+    /**
+     * Depth of table container nested level; Primarily used for RTF writer/reader
+     *
+     * 0 = Not in a table; 1 = in a table; 2 = in a table inside another table, etc.
+     *
+     * @var int
+     */
+    private $nestedLevel = 0;
+
     /**
      * Get PhpWord
      *
@@ -197,11 +206,31 @@ public function getRelationId()
     /**
      * Set relation Id
      *
-     * @param int $rId
+     * @param int $value
+     */
+    public function setRelationId($value)
+    {
+        $this->relationId = $value;
+    }
+
+    /**
+     * Get nested level
+     *
+     * @return int
+     */
+    public function getNestedLevel()
+    {
+        return $this->nestedLevel;
+    }
+
+    /**
+     * Set nested level
+     *
+     * @param int $value
      */
-    public function setRelationId($rId)
+    public function setNestedLevel($value)
     {
-        $this->relationId = $rId;
+        $this->nestedLevel = $value;
     }
 
     /**

src/PhpWord/Element/Row.php

@@ -71,6 +71,7 @@ public function addCell($width = null, $style = null)
         $cell = new Cell($width, $style);
         $cell->setDocPart($this->getDocPart(), $this->getDocPartId());
         $cell->setPhpWord($this->phpWord);
+        $cell->setNestedLevel($this->getNestedLevel());
         $this->cells[] = $cell;
 
         return $cell;

src/PhpWord/Element/Table.php

@@ -45,7 +45,6 @@ class Table extends AbstractElement
      */
     private $width = null;
 
-
     /**
      * Create a new table
      *
@@ -68,6 +67,7 @@ public function addRow($height = null, $style = null)
         $row = new Row($height, $style);
         $row->setDocPart($this->getDocPart(), $this->getDocPartId());
         $row->setPhpWord($this->phpWord);
+        $row->setNestedLevel($this->getNestedLevel());
         $this->rows[] = $row;
 
         return $row;
@@ -110,23 +110,23 @@ public function getStyle()
     }
 
     /**
-     * Set table width
+     * Get table width
      *
-     * @param int $width
+     * @return int
      */
-    public function setWidth($width)
+    public function getWidth()
     {
-        $this->width = $width;
+        return $this->width;
     }
 
     /**
-     * Get table width
+     * Set table width
      *
-     * @return int
+     * @param int $width
      */
-    public function getWidth()
+    public function setWidth($width)
     {
-        return $this->width;
+        $this->width = $width;
     }
 
     /**